From: Eric Anholt <eric@anholt.net>
Date: Thu, 31 Jul 2014 18:19:41 +0000 (-0700)
Subject: vc4: Move bin command list ending commands to vc4_flush()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fbaac8407a2397d40cb86ca9c352dfdcec38da7f;p=mesa.git

vc4: Move bin command list ending commands to vc4_flush()
---

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,