Mesa (master): glsl: call uniform resource checks from the nir linker

[GitLab Mirror]

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

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Tue Jan  7 10:30:17 2020 +1100

glsl: call uniform resource checks from the nir linker

Reviewed-by: Tapani Pälli <tapani.palli at intel.com>

---

 src/compiler/glsl/gl_nir_linker.c | 1 +
 src/compiler/glsl/linker.cpp      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/compiler/glsl/gl_nir_linker.c b/src/compiler/glsl/gl_nir_linker.c
index 945a3922bb0..59ef963a860 100644
--- a/src/compiler/glsl/gl_nir_linker.c
+++ b/src/compiler/glsl/gl_nir_linker.c
@@ -623,6 +623,7 @@ check_image_resources(struct gl_context *ctx, struct gl_shader_program *prog)
 bool
 gl_nir_link_glsl(struct gl_context *ctx, struct gl_shader_program *prog)
 {
+   link_util_check_uniform_resources(ctx, prog);
    link_util_check_subroutine_resources(prog);
    check_image_resources(ctx, prog);
    gl_nir_link_assign_atomic_counter_resources(ctx, prog);
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index 2c4c0051fc6..ce0ab7ac322 100644
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -4441,9 +4441,9 @@ link_and_validate_uniforms(struct gl_context *ctx,
       return;
 
    link_calculate_subroutine_compat(prog);
-   link_util_check_uniform_resources(ctx, prog);
 
    if (!ctx->Const.UseNIRGLSLLinker) {
+      link_util_check_uniform_resources(ctx, prog);
       link_util_check_subroutine_resources(prog);
       check_image_resources(ctx, prog);
       link_assign_atomic_counter_resources(ctx, prog);