commit beb07aadee86553aaa279d1ae5269ab104f64700
author Chia-I Wu <olv@lunarg.com> Sat Nov 22 02:58:40 2014 +0800
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Nov 26 10:03:12 2014 -0700
tree fa85454166162f2c78e7aeae11a4e68ec08eed9c
parent 926bfb0c7bfb595033c9531a81a39824f0983ff8

intel: fix INTEL_DEBUG=nocache for the first draw

Move the flush to after "cmd->bind.draw_count++".  Otherwise the flush is
skipped for the first draw because cmd_batch_flush() believes there is no draw
call.

icd/intel/cmd_pipeline.c

diff --git a/icd/intel/cmd_pipeline.c b/icd/intel/cmd_pipeline.c
index e57af1b..dfe26c5 100644
--- a/icd/intel/cmd_pipeline.c
+++ b/icd/intel/cmd_pipeline.c
@@ -2876,12 +2876,12 @@
                 vertex_start, instance_count, instance_start, vertex_base);
     }
 
-    if (intel_debug & INTEL_DEBUG_NOCACHE)
-        cmd_batch_flush_all(cmd);
-
     cmd->bind.draw_count++;
     /* need to re-emit all workarounds */
     cmd->bind.wa_flags = 0;
+
+    if (intel_debug & INTEL_DEBUG_NOCACHE)
+        cmd_batch_flush_all(cmd);
 }
 
 void cmd_draw_meta(struct intel_cmd *cmd, const struct intel_cmd_meta *meta)
@@ -2917,14 +2917,14 @@
         gen6_3DPRIMITIVE(cmd, GEN6_3DPRIM_RECTLIST, false, 3, 0, 1, 0, 0);
     }
 
-    if (intel_debug & INTEL_DEBUG_NOCACHE)
-        cmd_batch_flush_all(cmd);
-
     cmd->bind.draw_count++;
     /* need to re-emit all workarounds */
     cmd->bind.wa_flags = 0;
 
     cmd->bind.meta = NULL;
+
+    if (intel_debug & INTEL_DEBUG_NOCACHE)
+        cmd_batch_flush_all(cmd);
 }
 
 XGL_VOID XGLAPI intelCmdBindPipeline(