spirv: Flip the tessellation winding order

It's not SPIR-V that's backwards from GLSL, it's Vulkan that's backwards
from GL.  Let's make NIR consistent with the source language and do the
flipping inside the Vulkan driver instead.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 91577402a2ccf0f4d88538d1505bd403776e80de..ee2a2979aaf1cd301aa7f09ea11be8bedb3927d7 100644 (file)
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -262,6 +262,7 @@ radv_tess_pipeline_compile(struct radv_pipeline *pipeline,
        if (tcs_nir == NULL)
                return;
 
+       tes_nir->info.tess.ccw = !tes_nir->info.tess.ccw;
        nir_lower_tes_patch_vertices(tes_nir,
                                     tcs_nir->info.tess.tcs_vertices_out);
 

diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index 86536856b6f8dc3ef6412b232cd3b2433bb46a60..6ce9d1ada3495fffdf7c3e4e761facd931addd3f 100644 (file)
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -2951,17 +2951,12 @@ vtn_handle_execution_mode(struct vtn_builder *b, struct vtn_value *entry_point,
    case SpvExecutionModeVertexOrderCw:
       assert(b->shader->stage == MESA_SHADER_TESS_CTRL ||
              b->shader->stage == MESA_SHADER_TESS_EVAL);
-      /* Vulkan's notion of CCW seems to match the hardware backends,
-       * but be the opposite of OpenGL.  Currently NIR follows GL semantics,
-       * so we set it backwards here.
-       */
-      b->shader->info.tess.ccw = true;
+      b->shader->info.tess.ccw = false;
       break;
    case SpvExecutionModeVertexOrderCcw:
       assert(b->shader->stage == MESA_SHADER_TESS_CTRL ||
              b->shader->stage == MESA_SHADER_TESS_EVAL);
-      /* Backwards; see above */
-      b->shader->info.tess.ccw = false;
+      b->shader->info.tess.ccw = true;
       break;
    case SpvExecutionModePointMode:
       assert(b->shader->stage == MESA_SHADER_TESS_CTRL ||

diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c
index 6dfa49b873768d738b98a96043d4488fbd81caff..844c11803c2950f4ac41e5a870e5571f04c1f55b 100644 (file)
--- a/src/intel/vulkan/genX_pipeline.c
+++ b/src/intel/vulkan/genX_pipeline.c
@@ -1217,7 +1217,18 @@ emit_3dstate_hs_te_ds(struct anv_pipeline *pipeline)
 
    anv_batch_emit(&pipeline->batch, GENX(3DSTATE_TE), te) {
       te.Partitioning = tes_prog_data->partitioning;
-      te.OutputTopology = tes_prog_data->output_topology;
+
+      /* Vulkan has its winding order backwards from GL so TRI_CCW becomes
+       * TRI_CW and vice versa.
+       */
+      if (tes_prog_data->output_topology == OUTPUT_TRI_CCW) {
+         te.OutputTopology = OUTPUT_TRI_CW;
+      } else if (tes_prog_data->output_topology == OUTPUT_TRI_CW) {
+         te.OutputTopology = OUTPUT_TRI_CCW;
+      } else {
+         te.OutputTopology = tes_prog_data->output_topology;
+      }
+
       te.TEDomain = tes_prog_data->domain;
       te.TEEnable = true;
       te.MaximumTessellationFactorOdd = 63.0;