diff options
author | Marek Olšák <[email protected]> | 2012-12-21 17:03:22 +0100 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2013-01-04 13:18:33 +0100 |
commit | 598cc1f74d7ae924e84dee801b456ab7b0b22f84 (patch) | |
tree | 5dcbab29d7ed274768892a9890fd1dec5f964a6d /src/gallium/tests/graw | |
parent | 4ad5ebaefa3c5918001a40ed6099521aa0142c95 (diff) |
gallium: extend pipe_context::flush for it to accept an END_OF_FRAME flag
Usage with pipe_context:
pipe->flush(pipe, NULL, PIPE_FLUSH_END_OF_FRAME);
Usage with st_context_iface:
st->flush(st, ST_FLUSH_END_OF_FRAME, NULL);
The flag is only a hint for drivers. Radeon will use it for buffer eviction
heuristics in the kernel (e.g. for queries like how many frames have passed
since a buffer was used).
The flag is currently only generated by st/dri on SwapBuffers.
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Stéphane Marchesin <[email protected]>
Diffstat (limited to 'src/gallium/tests/graw')
-rw-r--r-- | src/gallium/tests/graw/clear.c | 2 | ||||
-rw-r--r-- | src/gallium/tests/graw/fs-fragcoord.c | 2 | ||||
-rw-r--r-- | src/gallium/tests/graw/fs-frontface.c | 2 | ||||
-rw-r--r-- | src/gallium/tests/graw/fs-test.c | 2 | ||||
-rw-r--r-- | src/gallium/tests/graw/fs-write-z.c | 2 | ||||
-rw-r--r-- | src/gallium/tests/graw/gs-test.c | 2 | ||||
-rw-r--r-- | src/gallium/tests/graw/occlusion-query.c | 2 | ||||
-rw-r--r-- | src/gallium/tests/graw/quad-sample.c | 2 | ||||
-rw-r--r-- | src/gallium/tests/graw/quad-tex.c | 2 | ||||
-rw-r--r-- | src/gallium/tests/graw/shader-leak.c | 2 | ||||
-rw-r--r-- | src/gallium/tests/graw/tex-srgb.c | 2 | ||||
-rw-r--r-- | src/gallium/tests/graw/tex-swizzle.c | 2 | ||||
-rw-r--r-- | src/gallium/tests/graw/tri-gs.c | 2 | ||||
-rw-r--r-- | src/gallium/tests/graw/tri-instanced.c | 2 | ||||
-rw-r--r-- | src/gallium/tests/graw/tri.c | 2 | ||||
-rw-r--r-- | src/gallium/tests/graw/vs-test.c | 2 |
16 files changed, 16 insertions, 16 deletions
diff --git a/src/gallium/tests/graw/clear.c b/src/gallium/tests/graw/clear.c index 0b78be80a8c..6afdf40aa3a 100644 --- a/src/gallium/tests/graw/clear.c +++ b/src/gallium/tests/graw/clear.c @@ -29,7 +29,7 @@ static void draw( void ) union pipe_color_union clear_color = { {1, 0, 1, 1} }; ctx->clear(ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0); - ctx->flush(ctx, NULL); + ctx->flush(ctx, NULL, 0); graw_save_surface_to_file(ctx, surf, NULL); diff --git a/src/gallium/tests/graw/fs-fragcoord.c b/src/gallium/tests/graw/fs-fragcoord.c index fc4e6b6d4e7..75225b6e858 100644 --- a/src/gallium/tests/graw/fs-fragcoord.c +++ b/src/gallium/tests/graw/fs-fragcoord.c @@ -185,7 +185,7 @@ draw(void) PIPE_CLEAR_COLOR | PIPE_CLEAR_DEPTHSTENCIL, &clear_color, 1.0, 0); util_draw_arrays(info.ctx, PIPE_PRIM_QUADS, 0, NUM_VERTS); - info.ctx->flush(info.ctx, NULL); + info.ctx->flush(info.ctx, NULL, 0); #if 0 /* At the moment, libgraw leaks out/makes available some of the diff --git a/src/gallium/tests/graw/fs-frontface.c b/src/gallium/tests/graw/fs-frontface.c index b9598f562bb..faa43f335c9 100644 --- a/src/gallium/tests/graw/fs-frontface.c +++ b/src/gallium/tests/graw/fs-frontface.c @@ -159,7 +159,7 @@ draw(void) PIPE_CLEAR_COLOR | PIPE_CLEAR_DEPTHSTENCIL, &clear_color, 1.0, 0); util_draw_arrays(info.ctx, PIPE_PRIM_QUADS, 0, NUM_VERTS); - info.ctx->flush(info.ctx, NULL); + info.ctx->flush(info.ctx, NULL, 0); graw_util_flush_front(&info); } diff --git a/src/gallium/tests/graw/fs-test.c b/src/gallium/tests/graw/fs-test.c index 2c02f4f1297..0d6e5d3f01c 100644 --- a/src/gallium/tests/graw/fs-test.c +++ b/src/gallium/tests/graw/fs-test.c @@ -236,7 +236,7 @@ static void draw( void ) ctx->clear(ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0); util_draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3); - ctx->flush(ctx, NULL); + ctx->flush(ctx, NULL, 0); graw_save_surface_to_file(ctx, surf, NULL); diff --git a/src/gallium/tests/graw/fs-write-z.c b/src/gallium/tests/graw/fs-write-z.c index a196cbbe54a..74ab2f475ba 100644 --- a/src/gallium/tests/graw/fs-write-z.c +++ b/src/gallium/tests/graw/fs-write-z.c @@ -164,7 +164,7 @@ draw(void) PIPE_CLEAR_COLOR | PIPE_CLEAR_DEPTHSTENCIL, &clear_color, 1.0, 0); util_draw_arrays(info.ctx, PIPE_PRIM_QUADS, 0, NUM_VERTS); - info.ctx->flush(info.ctx, NULL); + info.ctx->flush(info.ctx, NULL, 0); #if 0 /* At the moment, libgraw leaks out/makes available some of the diff --git a/src/gallium/tests/graw/gs-test.c b/src/gallium/tests/graw/gs-test.c index 0bd5e29fdd5..8af0c379c16 100644 --- a/src/gallium/tests/graw/gs-test.c +++ b/src/gallium/tests/graw/gs-test.c @@ -343,7 +343,7 @@ static void draw( void ) else util_draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3); - ctx->flush(ctx, NULL); + ctx->flush(ctx, NULL, 0); graw_save_surface_to_file(ctx, surf, NULL); diff --git a/src/gallium/tests/graw/occlusion-query.c b/src/gallium/tests/graw/occlusion-query.c index d522bce038c..51d6326c2ba 100644 --- a/src/gallium/tests/graw/occlusion-query.c +++ b/src/gallium/tests/graw/occlusion-query.c @@ -193,7 +193,7 @@ draw(void) if (res2.u64 < expected2_min || res2.u64 > expected2_max) printf(" Failure: result2 should be near %d\n", expected2); - info.ctx->flush(info.ctx, NULL); + info.ctx->flush(info.ctx, NULL, 0); graw_util_flush_front(&info); diff --git a/src/gallium/tests/graw/quad-sample.c b/src/gallium/tests/graw/quad-sample.c index c9e7646e8e2..2722dd5fbb0 100644 --- a/src/gallium/tests/graw/quad-sample.c +++ b/src/gallium/tests/graw/quad-sample.c @@ -152,7 +152,7 @@ static void draw( void ) ctx->clear(ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0); util_draw_arrays(ctx, PIPE_PRIM_QUADS, 0, 4); - ctx->flush(ctx, NULL); + ctx->flush(ctx, NULL, 0); graw_save_surface_to_file(ctx, surf, NULL); diff --git a/src/gallium/tests/graw/quad-tex.c b/src/gallium/tests/graw/quad-tex.c index 7eb9104a574..46f8be0c446 100644 --- a/src/gallium/tests/graw/quad-tex.c +++ b/src/gallium/tests/graw/quad-tex.c @@ -107,7 +107,7 @@ static void draw( void ) info.ctx->clear(info.ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0); util_draw_arrays(info.ctx, PIPE_PRIM_QUADS, 0, 4); - info.ctx->flush(info.ctx, NULL); + info.ctx->flush(info.ctx, NULL, 0); graw_save_surface_to_file(info.ctx, info.color_surf[0], NULL); diff --git a/src/gallium/tests/graw/shader-leak.c b/src/gallium/tests/graw/shader-leak.c index b685fb98494..e612e62c82a 100644 --- a/src/gallium/tests/graw/shader-leak.c +++ b/src/gallium/tests/graw/shader-leak.c @@ -152,7 +152,7 @@ static void draw( void ) ctx->clear(ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0); util_draw_arrays(ctx, PIPE_PRIM_POINTS, 0, 1); - ctx->flush(ctx, NULL); + ctx->flush(ctx, NULL, 0); ctx->bind_fs_state(ctx, NULL); ctx->delete_fs_state(ctx, fs); diff --git a/src/gallium/tests/graw/tex-srgb.c b/src/gallium/tests/graw/tex-srgb.c index 5442f94f722..296d22afc54 100644 --- a/src/gallium/tests/graw/tex-srgb.c +++ b/src/gallium/tests/graw/tex-srgb.c @@ -136,7 +136,7 @@ static void draw( void ) set_vertices(vertices2, 4); util_draw_arrays(info.ctx, PIPE_PRIM_QUADS, 0, 4); - info.ctx->flush(info.ctx, NULL); + info.ctx->flush(info.ctx, NULL, 0); graw_util_flush_front(&info); } diff --git a/src/gallium/tests/graw/tex-swizzle.c b/src/gallium/tests/graw/tex-swizzle.c index 7807b0b80a2..4ee79ee7a24 100644 --- a/src/gallium/tests/graw/tex-swizzle.c +++ b/src/gallium/tests/graw/tex-swizzle.c @@ -108,7 +108,7 @@ static void draw(void) info.ctx->clear(info.ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0); util_draw_arrays(info.ctx, PIPE_PRIM_QUADS, 0, 4); - info.ctx->flush(info.ctx, NULL); + info.ctx->flush(info.ctx, NULL, 0); graw_util_flush_front(&info); } diff --git a/src/gallium/tests/graw/tri-gs.c b/src/gallium/tests/graw/tri-gs.c index 8fdc28d58da..73793401c9d 100644 --- a/src/gallium/tests/graw/tri-gs.c +++ b/src/gallium/tests/graw/tri-gs.c @@ -166,7 +166,7 @@ static void draw( void ) ctx->clear(ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0); util_draw_arrays(ctx, PIPE_PRIM_TRIANGLES, 0, 3); - ctx->flush(ctx, NULL); + ctx->flush(ctx, NULL, 0); screen->flush_frontbuffer(screen, tex, 0, 0, window); } diff --git a/src/gallium/tests/graw/tri-instanced.c b/src/gallium/tests/graw/tri-instanced.c index 651518a14ed..3f29c9bdead 100644 --- a/src/gallium/tests/graw/tri-instanced.c +++ b/src/gallium/tests/graw/tri-instanced.c @@ -215,7 +215,7 @@ static void draw( void ) ctx->draw_vbo(ctx, &info); - ctx->flush(ctx, NULL); + ctx->flush(ctx, NULL, 0); graw_save_surface_to_file(ctx, surf, NULL); diff --git a/src/gallium/tests/graw/tri.c b/src/gallium/tests/graw/tri.c index 71dd51afd87..22b3de8803a 100644 --- a/src/gallium/tests/graw/tri.c +++ b/src/gallium/tests/graw/tri.c @@ -105,7 +105,7 @@ static void draw( void ) info.ctx->clear(info.ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0); util_draw_arrays(info.ctx, PIPE_PRIM_TRIANGLES, 0, 3); - info.ctx->flush(info.ctx, NULL); + info.ctx->flush(info.ctx, NULL, 0); graw_save_surface_to_file(info.ctx, info.color_surf[0], NULL); diff --git a/src/gallium/tests/graw/vs-test.c b/src/gallium/tests/graw/vs-test.c index e0358e6868f..0274ee0b542 100644 --- a/src/gallium/tests/graw/vs-test.c +++ b/src/gallium/tests/graw/vs-test.c @@ -230,7 +230,7 @@ static void draw( void ) ctx->clear(ctx, PIPE_CLEAR_COLOR, &clear_color, 0, 0); util_draw_arrays(ctx, PIPE_PRIM_POINTS, 0, Elements(vertices)); - ctx->flush(ctx, NULL); + ctx->flush(ctx, NULL, 0); graw_save_surface_to_file(ctx, surf, NULL); |