summaryrefslogtreecommitdiffstats
path: root/src/compiler
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2020-01-03 15:12:59 +1100
committerTimothy Arceri <[email protected]>2020-01-07 09:53:51 +1100
commit3bd4bcd4187d27b78b5a4d2bba70f13925028079 (patch)
treebdcbbc9f97e2452c3fc291357a5856cb8bc8d2e3 /src/compiler
parentfeffd1fa65d36e34499f29b39f8b18655c2b979f (diff)
glsl: use nir version of check_image_resources() for nir linker
Reviewed-by: Alejandro PiƱeiro <[email protected]>
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/glsl/gl_nir_linker.c1
-rw-r--r--src/compiler/glsl/linker.cpp2
2 files changed, 2 insertions, 1 deletions
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);
}