genX/state: Set CubeSurfaceControlMode to OVERRIDE

This makes it act like the address mode is set to TEXCOORDMODE_CUBE
whenever this sampler is combined with a cube surface.  This *should* be
what we need for Vulkan.  Interestingly, the PRM contains a programming
note for this field that says simply, "This field must be set to
CUBECTRLMODE_PROGRAMMED".  However, emprical evidence suggests that it does
what the PRM says it does and OVERRIDE is just fine.

diff --git a/src/vulkan/gen7_state.c b/src/vulkan/gen7_state.c
index 1f829be912189c451ae7d85b954bb99756862f40..eff5dd20eb740c9d5a51cedd2d6ad4f75aa3d62e 100644 (file)
--- a/src/vulkan/gen7_state.c
+++ b/src/vulkan/gen7_state.c
@@ -100,7 +100,7 @@ VkResult genX(CreateSampler)(
       .ChromaKeyIndex = 0,
       .ChromaKeyMode = 0,
       .ShadowFunction = vk_to_gen_compare_op[pCreateInfo->compareOp],
-      .CubeSurfaceControlMode = 0,
+      .CubeSurfaceControlMode = OVERRIDE,
 
       .BorderColorPointer =
          device->border_colors.offset +

diff --git a/src/vulkan/gen8_state.c b/src/vulkan/gen8_state.c
index 3c9d15257a38feef3364706348896b6f5ca3bcc5..9d56ecd18450de85f0939853199c91fb93f97046 100644 (file)
--- a/src/vulkan/gen8_state.c
+++ b/src/vulkan/gen8_state.c
@@ -357,7 +357,7 @@ VkResult genX(CreateSampler)(
       .ChromaKeyIndex = 0,
       .ChromaKeyMode = 0,
       .ShadowFunction = vk_to_gen_compare_op[pCreateInfo->compareOp],
-      .CubeSurfaceControlMode = 0,
+      .CubeSurfaceControlMode = OVERRIDE,
 
       .IndirectStatePointer = border_color_offset >> 6,