Mesa (master): st/mesa: propagate gl_PatchVerticesIn from TCS to TES before linking for NIR

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 8567e06046c477e4a69eb9f50abbe50a69dd40c9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8567e06046c477e4a69eb9f50abbe50a69dd40c9

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue Nov 12 23:48:02 2019 -0500

st/mesa: propagate gl_PatchVerticesIn from TCS to TES before linking for NIR

Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>

---

 src/mesa/state_tracker/st_glsl_to_nir.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index f8f1ee3fce2..a157e886397 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -690,6 +690,8 @@ st_link_nir(struct gl_context *ctx,
       }
    }
 
+   st_lower_patch_vertices_in(shader_program);
+
    /* For SPIR-V, we have to perform the NIR linking before applying
     * st_nir_preprocess.
     */
@@ -782,8 +784,6 @@ st_link_nir(struct gl_context *ctx,
       prev = i;
    }
 
-   st_lower_patch_vertices_in(shader_program);
-
    for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) {
       struct gl_linked_shader *shader = shader_program->_LinkedShaders[i];
       if (shader == NULL)