Re: [Mesa-dev] [PATCH 23/64] isl/state: Only set cube face enables if usage includes CUBE_BIT

2016-06-17 Thread Chad Versace
Patches 22 and 23 are
Reviewed-by: Chad Versace 
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH 23/64] isl/state: Only set cube face enables if usage includes CUBE_BIT

2016-06-11 Thread Jason Ekstrand
It seems safe to set it all the time, but this reduces the diff between
the way i965 does it and what ISL does.
---
 src/intel/isl/isl_surface_state.c | 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/intel/isl/isl_surface_state.c 
b/src/intel/isl/isl_surface_state.c
index 2d36881..0d26619 100644
--- a/src/intel/isl/isl_surface_state.c
+++ b/src/intel/isl/isl_surface_state.c
@@ -315,16 +315,18 @@ isl_genX(surf_fill_state_s)(const struct isl_device *dev, 
void *state,
s.RenderCacheReadWriteMode = 0;
 #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;
+  s.CubeFaceEnablePositiveZ = 1;
+  s.CubeFaceEnableNegativeZ = 1;
+  s.CubeFaceEnablePositiveY = 1;
+  s.CubeFaceEnableNegativeY = 1;
+  s.CubeFaceEnablePositiveX = 1;
+  s.CubeFaceEnableNegativeX = 1;
 #else
-   s.CubeFaceEnables = 0x3f;
+  s.CubeFaceEnables = 0x3f;
 #endif
+   }
 
s.MultisampledSurfaceStorageFormat =
   isl_to_gen_multisample_layout[info->surf->msaa_layout];
-- 
2.5.0.400.gff86faf

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev