Module: Mesa Branch: master Commit: 292701431369b49fdab14ef38840f4e66c6c0680 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=292701431369b49fdab14ef38840f4e66c6c0680
Author: Jason Ekstrand <[email protected]> Date: Fri Nov 10 13:38:06 2017 -0800 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]> --- src/mesa/drivers/dri/i965/brw_pipe_control.c | 4 ++-- 1 file 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 f5a991539e..bae4ba7c00 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; } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
