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

intel: Remove GEN_IS_G4X 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>
This commit is contained in:
Anuj Phogat 2021-03-04 15:30:41 -08:00 committed by Marge Bot
parent 1d0295ea2c
commit e66e8a0109
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/intel/genxml/gen_macros.h
View File

@ -57,7 +57,6 @@
#endif
#define GEN_GEN ((GEN_VERSIONx10) / 10)
#define GEN_IS_G4X ((GEN_VERSIONx10) == 45)
/* Prefixing macros */
#if (GEN_VERSIONx10 == 40)

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;
#endif
#if GEN_GEN > 4 || GEN_IS_G4X
#if GEN_GEN > 4 || GEN_VERSIONx10 == 45
if (info->x_offset_sa != 0 || info->y_offset_sa != 0) {
/* There are fairly strict rules about when the offsets can be used.
* These are mostly taken from the Sky Lake PRM documentation for

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

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

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

@ -1332,7 +1332,7 @@ genX(upload_clip_state)(struct brw_context *brw)
ctx->Transform.DepthClampFar);
/* _NEW_TRANSFORM */
if (GEN_GEN == 5 || GEN_IS_G4X) {
if (GEN_GEN == 5 || GEN_VERSIONx10 == 45) {
clip.UserClipDistanceClipTestEnableBitmask =
ctx->Transform.ClipPlanesEnabled;
} else {
@ -1352,7 +1352,7 @@ genX(upload_clip_state)(struct brw_context *brw)
clip.ClipMode = brw->clip.prog_data->clip_mode;
#if GEN_IS_G4X
#if GEN_VERSIONx10 == 45
clip.NegativeWClipTestEnable = true;
#endif
}
@ -1679,7 +1679,7 @@ genX(upload_sf)(struct brw_context *brw)
sf.SmoothPointEnable = false;
#endif
#if GEN_IS_G4X || GEN_GEN >= 5
#if GEN_VERSIONx10 == 45 || GEN_GEN >= 5
sf.AALineDistanceMode = AALINEDISTANCE_TRUE;
#endif