diff options
| author | Anuj Phogat <anuj.phogat@gmail.com> | 2021-03-04 15:09:42 -0800 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-03-16 16:40:12 +0000 |
| commit | 97d6ceaf04d6e2fe2c6764f0a6a415f07c956851 (patch) | |
| tree | 67939d8660270d4b8671b660c6951df27d475901 /src/mesa/drivers/dri/i965/genX_pipe_control.c | |
| parent | 739486de2f5b7854e5cc9f47888d9d9059fc19d4 (diff) | |
intel: Remove GEN_IS_HASWELL macro
Use GEN_VERSIONx10 == 75 check in place of GEN_IS_HASWELL macro.
GEN_GEN and GEN_VERSIONx10 macros provide a consistent way to do platform
version checks. We can avoid platform specific macros.
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9608>
Diffstat (limited to 'src/mesa/drivers/dri/i965/genX_pipe_control.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/genX_pipe_control.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/genX_pipe_control.c b/src/mesa/drivers/dri/i965/genX_pipe_control.c index 3582df4d66d..a6308012b73 100644 --- a/src/mesa/drivers/dri/i965/genX_pipe_control.c +++ b/src/mesa/drivers/dri/i965/genX_pipe_control.c @@ -230,7 +230,7 @@ genX(emit_raw_pipe_control)(struct brw_context *brw, uint32_t flags, flags |= PIPE_CONTROL_CS_STALL; } - if (GEN_IS_HASWELL) { + if (GEN_VERSIONx10 == 75) { /* From the PIPE_CONTROL page itself: * * "HSW - Programming Note: PIPECONTROL with RO Cache Invalidation: @@ -407,7 +407,7 @@ genX(emit_raw_pipe_control)(struct brw_context *brw, uint32_t flags, * don't skip the ones with only read-cache-invalidate bits set. This * may or may not be a problem... */ - if (GEN_GEN == 7 && !GEN_IS_HASWELL) { + if (GEN_GEN == 7 && GEN_VERSIONx10 != 75) { if (flags & PIPE_CONTROL_CS_STALL) { /* If we're doing a CS stall, reset the counter and carry on. */ brw->pipe_controls_since_last_cs_stall = 0; |