Mesa (master): glsl: use nir version of check_image_resources() for nir linker

[GitLab Mirror]

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

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Fri Jan  3 15:12:59 2020 +1100

glsl: use nir version of check_image_resources() for nir linker

Reviewed-by: Alejandro Piñeiro <apinheiro at igalia.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 b3832e5629f..ad26507bcc6 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)
 {
+   check_image_resources(ctx, prog);
    gl_nir_link_assign_atomic_counter_resources(ctx, prog);
    gl_nir_link_check_atomic_counter_resources(ctx, prog);
 
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index cc770c4d7b1..bf41337e479 100644
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -4536,9 +4536,9 @@ link_and_validate_uniforms(struct gl_context *ctx,
    link_calculate_subroutine_compat(prog);
    check_resources(ctx, prog);
    check_subroutine_resources(prog);
-   check_image_resources(ctx, prog);
 
    if (!ctx->Const.UseNIRGLSLLinker) {
+      check_image_resources(ctx, prog);
       link_assign_atomic_counter_resources(ctx, prog);
       link_check_atomic_counter_resources(ctx, prog);
    }