diff --git a/src/gallium/drivers/iris/iris_state.c b/src/gallium/drivers/iris/iris_state.c
index a8dc9642364..3e2eddb98d2 100644
--- a/src/gallium/drivers/iris/iris_state.c
+++ b/src/gallium/drivers/iris/iris_state.c
@@ -237,14 +237,14 @@ translate_shadow_func(enum pipe_compare_func pipe_func)
* So we need to flip the operator and also negate.
*/
static const unsigned map[] = {
- [PIPE_FUNC_NEVER] = PREFILTEROPALWAYS,
- [PIPE_FUNC_LESS] = PREFILTEROPLEQUAL,
- [PIPE_FUNC_EQUAL] = PREFILTEROPNOTEQUAL,
- [PIPE_FUNC_LEQUAL] = PREFILTEROPLESS,
- [PIPE_FUNC_GREATER] = PREFILTEROPGEQUAL,
- [PIPE_FUNC_NOTEQUAL] = PREFILTEROPEQUAL,
- [PIPE_FUNC_GEQUAL] = PREFILTEROPGREATER,
- [PIPE_FUNC_ALWAYS] = PREFILTEROPNEVER,
+ [PIPE_FUNC_NEVER] = PREFILTEROP_ALWAYS,
+ [PIPE_FUNC_LESS] = PREFILTEROP_LEQUAL,
+ [PIPE_FUNC_EQUAL] = PREFILTEROP_NOTEQUAL,
+ [PIPE_FUNC_LEQUAL] = PREFILTEROP_LESS,
+ [PIPE_FUNC_GREATER] = PREFILTEROP_GEQUAL,
+ [PIPE_FUNC_NOTEQUAL] = PREFILTEROP_EQUAL,
+ [PIPE_FUNC_GEQUAL] = PREFILTEROP_GREATER,
+ [PIPE_FUNC_ALWAYS] = PREFILTEROP_NEVER,
};
return map[pipe_func];
}
diff --git a/src/intel/genxml/gen11.xml b/src/intel/genxml/gen11.xml
index 0c43c17f6ae..3f48fe76747 100644
--- a/src/intel/genxml/gen11.xml
+++ b/src/intel/genxml/gen11.xml
@@ -871,15 +871,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/intel/genxml/gen12.xml b/src/intel/genxml/gen12.xml
index bfad1a2adad..d05cfdf525a 100644
--- a/src/intel/genxml/gen12.xml
+++ b/src/intel/genxml/gen12.xml
@@ -910,15 +910,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/intel/genxml/gen125.xml b/src/intel/genxml/gen125.xml
index cec491479d3..90c8fba5fc2 100644
--- a/src/intel/genxml/gen125.xml
+++ b/src/intel/genxml/gen125.xml
@@ -925,15 +925,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/intel/genxml/gen4.xml b/src/intel/genxml/gen4.xml
index 929d551ac84..7ef84fa9355 100644
--- a/src/intel/genxml/gen4.xml
+++ b/src/intel/genxml/gen4.xml
@@ -330,15 +330,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/intel/genxml/gen45.xml b/src/intel/genxml/gen45.xml
index 2d58a792f72..4ccb4664b62 100644
--- a/src/intel/genxml/gen45.xml
+++ b/src/intel/genxml/gen45.xml
@@ -337,15 +337,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/intel/genxml/gen5.xml b/src/intel/genxml/gen5.xml
index 089d12b59e8..97d3d7cd2dd 100644
--- a/src/intel/genxml/gen5.xml
+++ b/src/intel/genxml/gen5.xml
@@ -368,15 +368,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml
index 3940dc01d15..40b2baf7d13 100644
--- a/src/intel/genxml/gen6.xml
+++ b/src/intel/genxml/gen6.xml
@@ -360,15 +360,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index bb59c87a880..cb09a052265 100644
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -473,15 +473,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
index cffb21af811..e682d397ebf 100644
--- a/src/intel/genxml/gen75.xml
+++ b/src/intel/genxml/gen75.xml
@@ -577,15 +577,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
index 45462b7effe..9abde2ca2b4 100644
--- a/src/intel/genxml/gen8.xml
+++ b/src/intel/genxml/gen8.xml
@@ -625,15 +625,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index 3c9c42e6e21..44cfecc3b24 100644
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -787,15 +787,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c
index f499af3204c..2022163cb54 100644
--- a/src/intel/vulkan/genX_pipeline.c
+++ b/src/intel/vulkan/genX_pipeline.c
@@ -903,14 +903,14 @@ static const uint32_t vk_to_intel_blend_op[] = {
};
const uint32_t genX(vk_to_intel_compare_op)[] = {
- [VK_COMPARE_OP_NEVER] = PREFILTEROPNEVER,
- [VK_COMPARE_OP_LESS] = PREFILTEROPLESS,
- [VK_COMPARE_OP_EQUAL] = PREFILTEROPEQUAL,
- [VK_COMPARE_OP_LESS_OR_EQUAL] = PREFILTEROPLEQUAL,
- [VK_COMPARE_OP_GREATER] = PREFILTEROPGREATER,
- [VK_COMPARE_OP_NOT_EQUAL] = PREFILTEROPNOTEQUAL,
- [VK_COMPARE_OP_GREATER_OR_EQUAL] = PREFILTEROPGEQUAL,
- [VK_COMPARE_OP_ALWAYS] = PREFILTEROPALWAYS,
+ [VK_COMPARE_OP_NEVER] = PREFILTEROP_NEVER,
+ [VK_COMPARE_OP_LESS] = PREFILTEROP_LESS,
+ [VK_COMPARE_OP_EQUAL] = PREFILTEROP_EQUAL,
+ [VK_COMPARE_OP_LESS_OR_EQUAL] = PREFILTEROP_LEQUAL,
+ [VK_COMPARE_OP_GREATER] = PREFILTEROP_GREATER,
+ [VK_COMPARE_OP_NOT_EQUAL] = PREFILTEROP_NOTEQUAL,
+ [VK_COMPARE_OP_GREATER_OR_EQUAL] = PREFILTEROP_GEQUAL,
+ [VK_COMPARE_OP_ALWAYS] = PREFILTEROP_ALWAYS,
};
const uint32_t genX(vk_to_intel_stencil_op)[] = {
diff --git a/src/intel/vulkan/genX_state.c b/src/intel/vulkan/genX_state.c
index d677f22c1fb..73c8382d6a0 100644
--- a/src/intel/vulkan/genX_state.c
+++ b/src/intel/vulkan/genX_state.c
@@ -661,14 +661,14 @@ static const uint32_t vk_to_intel_tex_address[] = {
* and swapping of the arguments involved.
*/
static const uint32_t vk_to_intel_shadow_compare_op[] = {
- [VK_COMPARE_OP_NEVER] = PREFILTEROPALWAYS,
- [VK_COMPARE_OP_LESS] = PREFILTEROPLEQUAL,
- [VK_COMPARE_OP_EQUAL] = PREFILTEROPNOTEQUAL,
- [VK_COMPARE_OP_LESS_OR_EQUAL] = PREFILTEROPLESS,
- [VK_COMPARE_OP_GREATER] = PREFILTEROPGEQUAL,
- [VK_COMPARE_OP_NOT_EQUAL] = PREFILTEROPEQUAL,
- [VK_COMPARE_OP_GREATER_OR_EQUAL] = PREFILTEROPGREATER,
- [VK_COMPARE_OP_ALWAYS] = PREFILTEROPNEVER,
+ [VK_COMPARE_OP_NEVER] = PREFILTEROP_ALWAYS,
+ [VK_COMPARE_OP_LESS] = PREFILTEROP_LEQUAL,
+ [VK_COMPARE_OP_EQUAL] = PREFILTEROP_NOTEQUAL,
+ [VK_COMPARE_OP_LESS_OR_EQUAL] = PREFILTEROP_LESS,
+ [VK_COMPARE_OP_GREATER] = PREFILTEROP_GEQUAL,
+ [VK_COMPARE_OP_NOT_EQUAL] = PREFILTEROP_EQUAL,
+ [VK_COMPARE_OP_GREATER_OR_EQUAL] = PREFILTEROP_GREATER,
+ [VK_COMPARE_OP_ALWAYS] = PREFILTEROP_NEVER,
};
#if GFX_VER >= 9