From b85985dd5163365a068557497c987005934e2521 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Tue, 7 Jan 2020 10:15:23 +1100 Subject: glsl: call check_subroutine_resources() from the nir linker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Tapani Pälli --- 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 ad26507bcc6..945a3922bb0 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_subroutine_resources(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 f2ea266c9d6..62b308bb708 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -4521,9 +4521,9 @@ link_and_validate_uniforms(struct gl_context *ctx, link_calculate_subroutine_compat(prog); check_resources(ctx, prog); - link_util_check_subroutine_resources(prog); if (!ctx->Const.UseNIRGLSLLinker) { + link_util_check_subroutine_resources(prog); check_image_resources(ctx, prog); link_assign_atomic_counter_resources(ctx, prog); link_check_atomic_counter_resources(ctx, prog); -- cgit v1.2.3