summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2014-07-31 11:19:41 -0700
committerEric Anholt <[email protected]>2014-08-11 14:45:29 -0700
commitfbaac8407a2397d40cb86ca9c352dfdcec38da7f (patch)
tree955400892b623f887d4024bc14e5749fb8bf7665
parent5e062cb2b4a44af7eb4ba38a8a8c3c506b22f0e2 (diff)
vc4: Move bin command list ending commands to vc4_flush()
-rw-r--r--src/gallium/drivers/vc4/vc4_context.c4
-rw-r--r--src/gallium/drivers/vc4/vc4_draw.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/vc4/vc4_context.c b/src/gallium/drivers/vc4/vc4_context.c
index c9129e7b457..c75cea2fcb4 100644
--- a/src/gallium/drivers/vc4/vc4_context.c
+++ b/src/gallium/drivers/vc4/vc4_context.c
@@ -92,6 +92,10 @@ vc4_flush(struct pipe_context *pctx)
if (!vc4->needs_flush)
return;
+ cl_u8(&vc4->bcl, VC4_PACKET_FLUSH_ALL);
+ cl_u8(&vc4->bcl, VC4_PACKET_NOP);
+ cl_u8(&vc4->bcl, VC4_PACKET_HALT);
+
struct vc4_surface *csurf = vc4_surface(vc4->framebuffer.cbufs[0]);
struct vc4_resource *ctex = vc4_resource(csurf->base.texture);
struct drm_vc4_submit_cl submit;
diff --git a/src/gallium/drivers/vc4/vc4_draw.c b/src/gallium/drivers/vc4/vc4_draw.c
index 8559bf3b2fe..d4382c6a415 100644
--- a/src/gallium/drivers/vc4/vc4_draw.c
+++ b/src/gallium/drivers/vc4/vc4_draw.c
@@ -156,10 +156,6 @@ vc4_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info)
cl_u32(&vc4->bcl, info->start);
}
- cl_u8(&vc4->bcl, VC4_PACKET_FLUSH_ALL);
- cl_u8(&vc4->bcl, VC4_PACKET_NOP);
- cl_u8(&vc4->bcl, VC4_PACKET_HALT);
-
// Shader Record
vc4_write_uniforms(vc4, vc4->prog.fs,