diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-11-13 03:14:51 -0800 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-11-13 03:14:51 -0800 |
| commit | 24ab6f51f93c2873c048f4eaa261c44d01440d67 (patch) | |
| tree | fb1e2ce10a9f46386b3ffc047ce0a88a09ff7e86 /src/lib | |
| parent | 610025b85ba0465595a2a467cf66a419047d142c (diff) | |
| parent | 1d81454ea351dbbf7d9475918e2833424efa2b85 (diff) | |
Merge pull request #20 from austriancoder/master
small steps to get gc2000 up and running
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/fbdemos.c | 6 | ||||
| -rw-r--r-- | src/lib/fbdemos.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/fbdemos.c b/src/lib/fbdemos.c index ed2a384..3d3d55b 100644 --- a/src/lib/fbdemos.c +++ b/src/lib/fbdemos.c @@ -277,10 +277,10 @@ int fb_close(struct fb_info *fb) } -int etna_fb_bind_resource(struct fb_info *fb, struct pipe_resource *rt_resource_) +int etna_fb_bind_resource(struct fbdemos_scaffold *fbs, struct pipe_resource *rt_resource_) { + struct fb_info *fb = &fbs->fb; 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; @@ -289,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(ectx->ctx, &fb->copy_to_screen[bi], &(struct rs_state){ + etna_compile_rs_state(fbs->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, diff --git a/src/lib/fbdemos.h b/src/lib/fbdemos.h index e39285e..f3604df 100644 --- a/src/lib/fbdemos.h +++ b/src/lib/fbdemos.h @@ -86,7 +86,7 @@ int fb_set_buffer(struct fb_info *fb, int buffer); int fb_close(struct fb_info *fb); /* Bind framebuffer to render target resource */ -int etna_fb_bind_resource(struct fb_info *fb, struct pipe_resource *rt_resource); +int etna_fb_bind_resource(struct fbdemos_scaffold *fbs, struct pipe_resource *rt_resource); /* Copy framebuffer from bound render target resource */ int etna_fb_copy_buffer(struct fb_info *fb, struct etna_ctx *ctx, int buffer); |