Mesa (master): glsl: create a new link_and_validate_uniforms() helper
Timothy Arceri
tarceri at kemper.freedesktop.org
Thu Jan 19 04:55:13 UTC 2017
Module: Mesa
Branch: master
Commit: c054bbf0d40350bce931bccfce59d0c4ebca6fd1
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c054bbf0d40350bce931bccfce59d0c4ebca6fd1
Author: Timothy Arceri <timothy.arceri at collabora.com>
Date: Sun Dec 4 21:42:14 2016 +1100
glsl: create a new link_and_validate_uniforms() helper
Currently this just breaks up the linking code a bit but in the
future i965 will call this from the backend via Driver.LinkShader()
so that we can do NIR optimisations before assigning uniform
locations.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/compiler/glsl/linker.cpp | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index 61360df..4db3ad1 100644
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -4531,6 +4531,22 @@ disable_varying_optimizations_for_sso(struct gl_shader_program *prog)
}
}
+static void
+link_and_validate_uniforms(struct gl_context *ctx,
+ struct gl_shader_program *prog,
+ unsigned num_explicit_uniform_locs)
+{
+ update_array_sizes(prog);
+ link_assign_uniform_locations(prog, ctx, num_explicit_uniform_locs);
+
+ link_assign_atomic_counter_resources(ctx, prog);
+ link_calculate_subroutine_compat(prog);
+ check_resources(ctx, prog);
+ check_subroutine_resources(prog);
+ check_image_resources(ctx, prog);
+ link_check_atomic_counter_resources(ctx, prog);
+}
+
static bool
link_varyings_and_uniforms(unsigned first, unsigned last,
unsigned num_explicit_uniform_locs,
@@ -4579,15 +4595,7 @@ link_varyings_and_uniforms(unsigned first, unsigned last,
if (!link_varyings(prog, first, last, ctx, mem_ctx))
return false;
- update_array_sizes(prog);
- link_assign_uniform_locations(prog, ctx, num_explicit_uniform_locs);
- link_assign_atomic_counter_resources(ctx, prog);
-
- link_calculate_subroutine_compat(prog);
- check_resources(ctx, prog);
- check_subroutine_resources(prog);
- check_image_resources(ctx, prog);
- link_check_atomic_counter_resources(ctx, prog);
+ link_and_validate_uniforms(ctx, prog, num_explicit_uniform_locs);
if (!prog->data->LinkStatus)
return false;
More information about the mesa-commit
mailing list