isl/state: Only set cube face enables if usage includes CUBE_BIT

It seems safe to set it all the time, but this reduces the diff between
the way i965 does it and what ISL does.

Reviewed-by: Chad Versace <chad.versace@intel.com>
Cc: "12.0" <mesa-stable@lists.freedesktop.org>
This commit is contained in:
Jason Ekstrand 2016-06-06 18:21:17 -07:00
parent 5d24e9cfa1
commit 14d7c16e50
1 changed files with 9 additions and 7 deletions

View File

@ -330,16 +330,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];