diff options
| author | Timothy Arceri <timothy.arceri@collabora.com> | 2016-09-25 22:50:24 +1000 |
|---|---|---|
| committer | Timothy Arceri <timothy.arceri@collabora.com> | 2016-09-27 11:29:05 +1000 |
| commit | ab67b6afdfb423200cb03a711eda89abe4e80fb2 (patch) | |
| tree | 04ea97a5dfb9194d7b1a2fe6719cfdcef77c117f /src/compiler/glsl/linker.cpp | |
| parent | 856e0bd707d2ead26eb3a04be08885487850be38 (diff) | |
| download | external_mesa3d-ab67b6afdfb423200cb03a711eda89abe4e80fb2.zip external_mesa3d-ab67b6afdfb423200cb03a711eda89abe4e80fb2.tar.gz external_mesa3d-ab67b6afdfb423200cb03a711eda89abe4e80fb2.tar.bz2 | |
glsl: move some uniform linking code to new link_setup_uniform_remap_tables()
This makes link_assign_uniform_locations() easier to follow.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/compiler/glsl/linker.cpp')
| -rw-r--r-- | src/compiler/glsl/linker.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 8c28d24..290811f 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -4560,9 +4560,7 @@ link_varyings_and_uniforms(unsigned first, unsigned last, return false; update_array_sizes(prog); - link_assign_uniform_locations(prog, ctx->Const.UniformBooleanTrue, - num_explicit_uniform_locs, - ctx->Const.MaxUserAssignableUniformLocations); + link_assign_uniform_locations(prog, ctx, num_explicit_uniform_locs); link_assign_atomic_counter_resources(ctx, prog); link_calculate_subroutine_compat(prog); |