summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2013-11-06 10:39:22 -0800
committerWladimir J. van der Laan <laanwj@gmail.com>2013-11-06 10:39:22 -0800
commit610025b85ba0465595a2a467cf66a419047d142c (patch)
tree7eb26a36b6ee55f7a9c883b5147e98ece37eb3fc /src/lib
parent2765fa2376327c4c8b2f0388cd8e15e4e91a449e (diff)
parent33d3141a288b5f30c32f3f7f0da6d6cb358ec3b4 (diff)
Merge pull request #19 from austriancoder/master
gc2000: fix RS_PIPE_OFFSET and RS_WINDOW_SIZE
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/fbdemos.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/fbdemos.c b/src/lib/fbdemos.c
index 8763ef4..ed2a384 100644
--- a/src/lib/fbdemos.c
+++ b/src/lib/fbdemos.c
@@ -280,6 +280,7 @@ int fb_close(struct fb_info *fb)
int etna_fb_bind_resource(struct fb_info *fb, struct pipe_resource *rt_resource_)
{
struct etna_resource *rt_resource = etna_resource(rt_resource_);
+ struct etna_pipe_context *ectx = rt_resource->last_ctx;
fb->resource = rt_resource;
assert(rt_resource->base.width0 <= fb->fb_var.xres && rt_resource->base.height0 <= fb->fb_var.yres);
int msaa_xscale=1, msaa_yscale=1;
@@ -288,7 +289,7 @@ int etna_fb_bind_resource(struct fb_info *fb, struct pipe_resource *rt_resource_
for(int bi=0; bi<ETNA_FB_MAX_BUFFERS; ++bi)
{
- etna_compile_rs_state(&fb->copy_to_screen[bi], &(struct rs_state){
+ etna_compile_rs_state(ectx->ctx, &fb->copy_to_screen[bi], &(struct rs_state){
.source_format = translate_rt_format(rt_resource->base.format, false),
.source_tiling = rt_resource->layout,
.source_addr = etna_bo_gpu_address(rt_resource->bo) + rt_resource->levels[0].offset,