summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/r300
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2011-03-08 00:57:48 +0100
committerMarek Olšák <maraeo@gmail.com>2011-03-11 21:39:31 +0100
commit7e02303497237cde958c28608477d0c355a8038b (patch)
tree6c9355b9016fae7c30440feaf9a68bb4ba03ad17 /src/gallium/drivers/r300
parente968975cb57eb854769292f7c6ff773c64a386c3 (diff)
gallium: remove flags from the flush function
The drivers have been changed so that they behave as if all of the flags were set. This is already implicit in most hardware drivers and required for multiple contexts. Some state trackers were also abusing the PIPE_FLUSH_RENDER_CACHE flag to decide whether flush_frontbuffer should be called. New flag ST_FLUSH_FRONT has been added to st_api.h as a replacement.
Diffstat (limited to 'src/gallium/drivers/r300')
-rw-r--r--src/gallium/drivers/r300/r300_flush.c2
-rw-r--r--src/gallium/drivers/r300/r300_transfer.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_flush.c b/src/gallium/drivers/r300/r300_flush.c
index fa0926868b..b3d0d344ec 100644
--- a/src/gallium/drivers/r300/r300_flush.c
+++ b/src/gallium/drivers/r300/r300_flush.c
@@ -94,10 +94,8 @@ void r300_flush(struct pipe_context *pipe,
}
static void r300_flush_wrapped(struct pipe_context *pipe,
- unsigned flags,
struct pipe_fence_handle **fence)
{
- /* don't use the flags param, it means something else */
r300_flush(pipe, 0, fence);
}
diff --git a/src/gallium/drivers/r300/r300_transfer.c b/src/gallium/drivers/r300/r300_transfer.c
index 928c86be0c..65c5095be6 100644
--- a/src/gallium/drivers/r300/r300_transfer.c
+++ b/src/gallium/drivers/r300/r300_transfer.c
@@ -73,7 +73,7 @@ static void r300_copy_into_tiled_texture(struct pipe_context *ctx,
&r300transfer->linear_texture->b.b.b, 0, &src_box);
/* XXX remove this. */
- ctx->flush(ctx, 0, NULL);
+ r300_flush(ctx, 0, NULL);
}
struct pipe_transfer*