summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2017-11-10 13:38:06 -0800
committerJason Ekstrand <[email protected]>2017-11-10 14:36:57 -0800
commit292701431369b49fdab14ef38840f4e66c6c0680 (patch)
tree09f65b188601f5b60778bc3f81b04af67c6611ec /src/mesa
parentb8d42cccd053e32ca048645ea7e6f901366e286d (diff)
i965/gen10: Use the correct form of | for the RCPFE workaround
Found by inspection Fixes: d3d0fe4572f62474b86ef3a68405046c68b54062 Reviewed-by: Rafael Antognolli <[email protected]> Reviewed-by: Anuj Phogat <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/brw_pipe_control.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_pipe_control.c b/src/mesa/drivers/dri/i965/brw_pipe_control.c
index f5a991539e2..bae4ba7c003 100644
--- a/src/mesa/drivers/dri/i965/brw_pipe_control.c
+++ b/src/mesa/drivers/dri/i965/brw_pipe_control.c
@@ -102,8 +102,8 @@ gen10_add_rcpfe_workaround_bits(uint32_t *flags)
if (*flags & PIPE_CONTROL_RENDER_TARGET_FLUSH) {
*flags = *flags | PIPE_CONTROL_STALL_AT_SCOREBOARD;
} else if (*flags &
- (PIPE_CONTROL_WRITE_IMMEDIATE ||
- PIPE_CONTROL_WRITE_DEPTH_COUNT ||
+ (PIPE_CONTROL_WRITE_IMMEDIATE |
+ PIPE_CONTROL_WRITE_DEPTH_COUNT |
PIPE_CONTROL_WRITE_TIMESTAMP)) {
*flags = *flags | PIPE_CONTROL_DEPTH_STALL;
}