KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

intel: Simplify few version checks involving G4X 

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>
This commit is contained in:
Anuj Phogat 2021-03-15 11:58:07 -07:00 committed by Marge Bot
parent e66e8a0109
commit b505db3864
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/intel/isl/isl_surface_state.c
View File

@ -547,7 +547,7 @@ isl_genX(surf_fill_state_s)(const struct isl_device *dev, void *state,
s.MOCS = info->mocs; s.MOCS = info->mocs;
#endif #endif
#if GEN_GEN > 4 || GEN_VERSIONx10 == 45 #if GEN_VERSIONx10 >= 45
if (info->x_offset_sa != 0 || info->y_offset_sa != 0) { if (info->x_offset_sa != 0 || info->y_offset_sa != 0) {
/* There are fairly strict rules about when the offsets can be used. /* There are fairly strict rules about when the offsets can be used.
* These are mostly taken from the Sky Lake PRM documentation for * These are mostly taken from the Sky Lake PRM documentation for

2
src/mesa/drivers/dri/i965/genX_pipe_control.c
View File

@ -492,7 +492,7 @@ genX(emit_raw_pipe_control)(struct brw_context *brw, uint32_t flags,
pc.InstructionCacheInvalidateEnable = pc.InstructionCacheInvalidateEnable =
flags & PIPE_CONTROL_INSTRUCTION_INVALIDATE; flags & PIPE_CONTROL_INSTRUCTION_INVALIDATE;
pc.NotifyEnable = flags & PIPE_CONTROL_NOTIFY_ENABLE; pc.NotifyEnable = flags & PIPE_CONTROL_NOTIFY_ENABLE;
#if GEN_GEN >= 5 || GEN_VERSIONx10 == 45 #if GEN_GEN >= 45
pc.IndirectStatePointersDisable = pc.IndirectStatePointersDisable =
flags & PIPE_CONTROL_INDIRECT_STATE_POINTERS_DISABLE; flags & PIPE_CONTROL_INDIRECT_STATE_POINTERS_DISABLE;
#endif #endif

2
src/mesa/drivers/dri/i965/genX_state_upload.c
View File

@ -1679,7 +1679,7 @@ genX(upload_sf)(struct brw_context *brw)
sf.SmoothPointEnable = false; sf.SmoothPointEnable = false;
#endif #endif
#if GEN_VERSIONx10 == 45 || GEN_GEN >= 5 #if GEN_VERSIONx10 >= 45
sf.AALineDistanceMode = AALINEDISTANCE_TRUE; sf.AALineDistanceMode = AALINEDISTANCE_TRUE;
#endif #endif