diff options
| author | Timothy Arceri <[email protected]> | 2020-01-07 10:15:23 +1100 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2020-01-10 00:41:20 +0000 |
| commit | b85985dd5163365a068557497c987005934e2521 (patch) | |
| tree | 480681e2eec33b948fd5fdb44d4ec4baac017154 | |
| parent | a6fd1c7752787a42aef72f93ce4168c3e73808b7 (diff) | |
glsl: call check_subroutine_resources() from the nir linker
Reviewed-by: Tapani Pälli <[email protected]>
| -rw-r--r-- | src/compiler/glsl/gl_nir_linker.c | 1 | ||||
| -rw-r--r-- | src/compiler/glsl/linker.cpp | 2 |
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 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); |