From 45cf049ba610f90476ddf2febff0634809ba0e1b Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 28 Sep 2017 14:51:53 -0700 Subject: [PATCH] intel: Make Cube Face Enable fields consistent across generations. I decided to use the one-boolean-per-cube-face approach because it's clearer which bits correspond to which cube face. Reviewed-by: Matt Turner Reviewed-by: Jason Ekstrand --- src/intel/genxml/gen4.xml | 7 ++++++- src/intel/genxml/gen45.xml | 7 ++++++- src/intel/genxml/gen5.xml | 7 ++++++- src/intel/genxml/gen6.xml | 7 ++++++- src/intel/genxml/gen7.xml | 7 ++++++- src/intel/genxml/gen75.xml | 7 ++++++- src/intel/isl/isl_surface_state.c | 4 ---- 7 files changed, 36 insertions(+), 10 deletions(-) diff --git a/src/intel/genxml/gen4.xml b/src/intel/genxml/gen4.xml index 6499346..fc24329 100644 --- a/src/intel/genxml/gen4.xml +++ b/src/intel/genxml/gen4.xml @@ -526,7 +526,12 @@ - + + + + + + diff --git a/src/intel/genxml/gen45.xml b/src/intel/genxml/gen45.xml index 0f90575..c910858 100644 --- a/src/intel/genxml/gen45.xml +++ b/src/intel/genxml/gen45.xml @@ -531,7 +531,12 @@ - + + + + + + diff --git a/src/intel/genxml/gen5.xml b/src/intel/genxml/gen5.xml index 70f5007..93e687a 100644 --- a/src/intel/genxml/gen5.xml +++ b/src/intel/genxml/gen5.xml @@ -636,7 +636,12 @@ - + + + + + + diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml index 8aa0335..96f4be7 100644 --- a/src/intel/genxml/gen6.xml +++ b/src/intel/genxml/gen6.xml @@ -574,7 +574,12 @@ - + + + + + + diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml index 993d102..cc17018 100644 --- a/src/intel/genxml/gen7.xml +++ b/src/intel/genxml/gen7.xml @@ -638,7 +638,12 @@ - + + + + + + diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml index 105effa..cb408a2 100644 --- a/src/intel/genxml/gen75.xml +++ b/src/intel/genxml/gen75.xml @@ -657,7 +657,12 @@ - + + + + + + diff --git a/src/intel/isl/isl_surface_state.c b/src/intel/isl/isl_surface_state.c index c6a55ce..323cf20 100644 --- a/src/intel/isl/isl_surface_state.c +++ b/src/intel/isl/isl_surface_state.c @@ -453,16 +453,12 @@ isl_genX(surf_fill_state_s)(const struct isl_device *dev, void *state, #endif if (info->view->usage & ISL_SURF_USAGE_CUBE_BIT) { -#if GEN_GEN >= 8 s.CubeFaceEnablePositiveZ = 1; s.CubeFaceEnableNegativeZ = 1; s.CubeFaceEnablePositiveY = 1; s.CubeFaceEnableNegativeY = 1; s.CubeFaceEnablePositiveX = 1; s.CubeFaceEnableNegativeX = 1; -#else - s.CubeFaceEnables = 0x3f; -#endif } #if GEN_GEN >= 6 -- 2.7.4