diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-22 07:57:44 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-02-22 07:57:44 +0100 |
| commit | 35e3d6f80acd729b4b69014f90eb2d3bbc39e99e (patch) | |
| tree | fed71ecef432dabf50bafe136ae6ec26659b593f | |
| parent | 463f1e1e591f34c4bf16f5480c30fc1c3ced3190 (diff) | |
| parent | d6716b9379fda8823ad1c81436c7bce815b86fcb (diff) | |
| download | etna_viv-35e3d6f80acd729b4b69014f90eb2d3bbc39e99e.tar.gz etna_viv-35e3d6f80acd729b4b69014f90eb2d3bbc39e99e.tar.xz | |
Merge pull request #24 from austriancoder/master
mesatest_gles fixes
| -rw-r--r-- | src/driver/etna_clear_blit.c | 2 | ||||
| -rw-r--r-- | src/driver/etna_resource.c | 2 | ||||
| -rw-r--r-- | src/lib/fbdemos.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/driver/etna_clear_blit.c b/src/driver/etna_clear_blit.c index 1b3b8f8..3e28c60 100644 --- a/src/driver/etna_clear_blit.c +++ b/src/driver/etna_clear_blit.c @@ -81,7 +81,7 @@ void etna_rs_gen_clear_surface(struct etna_ctx *ctx, struct compiled_rs_state *r etna_compile_rs_state(ctx, rs_state, &(struct rs_state){ .source_format = format, .dest_format = format, - .dest_addr = etna_bo_gpu_address(dest_bo) + surf->surf.offset, + .dest_addr[0] = etna_bo_gpu_address(dest_bo) + surf->surf.offset, .dest_stride = surf->surf.stride, .dest_tiling = tiled_clear ? surf->layout : ETNA_LAYOUT_LINEAR, .dither = {0xffffffff, 0xffffffff}, diff --git a/src/driver/etna_resource.c b/src/driver/etna_resource.c index 4389a2f..1cee86f 100644 --- a/src/driver/etna_resource.c +++ b/src/driver/etna_resource.c @@ -148,7 +148,7 @@ static struct pipe_resource * etna_screen_resource_create(struct pipe_screen *sc } /* multi tiled formats */ - if (priv->dev->chip.pixel_pipes > 1) + if ((priv->dev->chip.pixel_pipes > 1) && !(templat->bind & PIPE_BIND_SAMPLER_VIEW)) { if (layout == ETNA_LAYOUT_TILED) layout = ETNA_LAYOUT_MULTI_TILED; diff --git a/src/lib/fbdemos.c b/src/lib/fbdemos.c index c8a9128..1c25c9d 100644 --- a/src/lib/fbdemos.c +++ b/src/lib/fbdemos.c @@ -297,7 +297,7 @@ int etna_fb_bind_resource(struct fbdemos_scaffold *fbs, struct pipe_resource *rt .source_stride = rt_resource->levels[0].stride, .dest_format = fb->rs_format, .dest_tiling = ETNA_LAYOUT_LINEAR, - .dest_addr = etna_bo_gpu_address(fb->buffer[bi]), + .dest_addr[0] = etna_bo_gpu_address(fb->buffer[bi]), .dest_stride = fb->fb_fix.line_length, .downsample_x = msaa_xscale > 1, .downsample_y = msaa_yscale > 1, |