summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2013-10-10 16:40:47 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2013-10-11 10:04:42 +0200
commita713d5919aefa28b12d3b1c5ae644ab86adf9385 (patch)
tree459d95ee7850a4d456cd727f389f0d8e3d33af65
parenta448856dcc3c9fe47698707432fc4328f6bb8eab (diff)
driver: get rid of want_fence
-rw-r--r--src/driver/etna_screen.c5
-rw-r--r--src/driver/etna_screen.h1
2 files changed, 1 insertions, 5 deletions
diff --git a/src/driver/etna_screen.c b/src/driver/etna_screen.c
index 9ba297b..2636e00 100644
--- a/src/driver/etna_screen.c
+++ b/src/driver/etna_screen.c
@@ -437,15 +437,12 @@ static void etna_screen_flush_frontbuffer( struct pipe_screen *screen,
struct etna_rs_target *drawable = (struct etna_rs_target *)winsys_drawable_handle;
struct etna_resource *rt_resource = etna_resource(resource);
struct etna_pipe_context *ectx = rt_resource->last_ctx;
- struct pipe_fence_handle **fence = 0;
assert(level <= resource->last_level && layer < resource->array_size);
assert(ectx);
struct etna_ctx *ctx = ectx->ctx;
/* release previous fence, make reference to fence if we need one */
screen->fence_reference(screen, &drawable->fence, NULL);
- if(drawable->want_fence)
- fence = &drawable->fence;
etna_set_state(ctx, VIVS_GL_FLUSH_CACHE, VIVS_GL_FLUSH_CACHE_COLOR);
etna_stall(ctx, SYNC_RECIPIENT_RA, SYNC_RECIPIENT_PE);
@@ -497,7 +494,7 @@ static void etna_screen_flush_frontbuffer( struct pipe_screen *screen,
rt_resource->levels[0].address,
drawable->addr, drawable->stride,
drawable->width, drawable->height, ctx);
- ectx->base.flush(&ectx->base, fence, 0);
+ ectx->base.flush(&ectx->base, &drawable->fence, 0);
}
struct pipe_screen *
diff --git a/src/driver/etna_screen.h b/src/driver/etna_screen.h
index 880e55d..074f0ff 100644
--- a/src/driver/etna_screen.h
+++ b/src/driver/etna_screen.h
@@ -50,7 +50,6 @@ struct etna_rs_target
unsigned width, height;
size_t addr; /* GPU address */
size_t stride;
- bool want_fence; /* should flush_frontbuffer return a fence? */
struct pipe_fence_handle *fence;
};