aboutsummaryrefslogtreecommitdiffstats
path: root/src/compiler/glsl/linker.cpp
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2020-01-07 10:08:15 +1100
committerTimothy Arceri <[email protected]>2020-01-10 00:41:20 +0000
commita6fd1c7752787a42aef72f93ce4168c3e73808b7 (patch)
treed96c2dd5403f0191214006fb761060457fe35c76 /src/compiler/glsl/linker.cpp
parent3dec68e6823ae74c71ce0a24f15cd33df3e08f9c (diff)
glsl: move check_subroutine_resources() into the shared util code
We will make use of this in the nir linker in the following patch. Reviewed-by: Tapani Pälli <[email protected]>
Diffstat (limited to 'src/compiler/glsl/linker.cpp')
-rw-r--r--src/compiler/glsl/linker.cpp16
1 files changed, 1 insertions, 15 deletions
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index bf41337e479..f2ea266c9d6 100644
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -3436,20 +3436,6 @@ link_calculate_subroutine_compat(struct gl_shader_program *prog)
}
}
-static void
-check_subroutine_resources(struct gl_shader_program *prog)
-{
- unsigned mask = prog->data->linked_stages;
- while (mask) {
- const int i = u_bit_scan(&mask);
- struct gl_program *p = prog->_LinkedShaders[i]->Program;
-
- if (p->sh.NumSubroutineUniformRemapTable > MAX_SUBROUTINE_UNIFORM_LOCATIONS) {
- linker_error(prog, "Too many %s shader subroutine uniforms\n",
- _mesa_shader_stage_to_string(i));
- }
- }
-}
/**
* Validate shader image resources.
*/
@@ -4535,7 +4521,7 @@ link_and_validate_uniforms(struct gl_context *ctx,
link_calculate_subroutine_compat(prog);
check_resources(ctx, prog);
- check_subroutine_resources(prog);
+ link_util_check_subroutine_resources(prog);
if (!ctx->Const.UseNIRGLSLLinker) {
check_image_resources(ctx, prog);