i965/gen10: Use the correct form of | for the RCPFE workaround
authorJason Ekstrand <jason.ekstrand@intel.com>
Fri, 10 Nov 2017 21:38:06 +0000 (13:38 -0800)
committerJason Ekstrand <jason.ekstrand@intel.com>
Fri, 10 Nov 2017 22:36:57 +0000 (14:36 -0800)
Found by inspection

Fixes: d3d0fe4572f62474b86ef3a68405046c68b54062
Reviewed-by: Rafael Antognolli <rafael.antognolli@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
src/mesa/drivers/dri/i965/brw_pipe_control.c

index f5a991539e287c4ad8fc35b65ffdae6be16ee47a..bae4ba7c00388c0fd21a911da6240d26430758c1 100644 (file)
@@ -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;
    }