Mesa (master): xa: let ddx handle flush
Rob Clark
robclark at kemper.freedesktop.org
Thu Jul 25 18:04:09 UTC 2013
Module: Mesa
Branch: master
Commit: d156c032c97d2c7a6ef2ec87212a4ef74dd9cb6e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d156c032c97d2c7a6ef2ec87212a4ef74dd9cb6e
Author: Jerome Glisse <jglisse at redhat.com>
Date: Wed Mar 6 17:39:29 2013 -0500
xa: let ddx handle flush
Signed-off-by: Jerome Glisse <jglisse at redhat.com>
---
src/gallium/state_trackers/xa/xa_composite.c | 1 -
src/gallium/state_trackers/xa/xa_context.c | 10 ++--------
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/gallium/state_trackers/xa/xa_composite.c b/src/gallium/state_trackers/xa/xa_composite.c
index a6bfa11..abe5be2 100644
--- a/src/gallium/state_trackers/xa/xa_composite.c
+++ b/src/gallium/state_trackers/xa/xa_composite.c
@@ -527,7 +527,6 @@ XA_EXPORT void
xa_composite_done(struct xa_context *ctx)
{
renderer_draw_flush(ctx);
- xa_context_flush(ctx);
ctx->comp = NULL;
ctx->has_solid_color = FALSE;
diff --git a/src/gallium/state_trackers/xa/xa_context.c b/src/gallium/state_trackers/xa/xa_context.c
index badd47c..50ef469 100644
--- a/src/gallium/state_trackers/xa/xa_context.c
+++ b/src/gallium/state_trackers/xa/xa_context.c
@@ -123,8 +123,6 @@ xa_surface_dma(struct xa_context *ctx,
0);
}
pipe->transfer_unmap(pipe, transfer);
- if (to_surface)
- xa_context_flush(ctx);
}
return XA_ERR_NONE;
}
@@ -248,10 +246,8 @@ XA_EXPORT void
xa_copy_done(struct xa_context *ctx)
{
if (!ctx->simple_copy) {
- renderer_draw_flush(ctx);
- xa_context_flush(ctx);
- } else
- xa_context_flush(ctx);
+ renderer_draw_flush(ctx);
+ }
}
static void
@@ -330,8 +326,6 @@ XA_EXPORT void
xa_solid_done(struct xa_context *ctx)
{
renderer_draw_flush(ctx);
- xa_context_flush(ctx);
-
ctx->comp = NULL;
ctx->has_solid_color = FALSE;
ctx->num_bound_samplers = 0;
More information about the mesa-commit
mailing list