summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2017-08-02 17:39:56 -0700
committerKenneth Graunke <[email protected]>2017-08-04 10:26:37 -0700
commit12a77f391f80e2c35fd4676a9c9f882003221712 (patch)
treeefa13061a2c32d2292f84abb5ff9c206867d2a55
parentcf412f3afe798b42c4f4d648c6c36cfc86555d4b (diff)
i965: Initialize flags to 0 and |= in new flags.
This makes it a bit easier to add new unconditional flags.
-rw-r--r--src/mesa/drivers/dri/i965/intel_batchbuffer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_batchbuffer.c b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
index 666ea6afe3e..58482ecac9f 100644
--- a/src/mesa/drivers/dri/i965/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/i965/intel_batchbuffer.c
@@ -637,12 +637,12 @@ do_flush_locked(struct brw_context *brw, int in_fence_fd, int *out_fence_fd)
}
if (!brw->screen->no_hw) {
- int flags;
+ int flags = 0;
if (brw->gen >= 6 && batch->ring == BLT_RING) {
- flags = I915_EXEC_BLT;
+ flags |= I915_EXEC_BLT;
} else {
- flags = I915_EXEC_RENDER;
+ flags |= I915_EXEC_RENDER;
}
if (batch->needs_sol_reset)
flags |= I915_EXEC_GEN7_SOL_RESET;