glsl: make uniform values helper available for use elsewhere

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/compiler/glsl/link_uniforms.cpp b/src/compiler/glsl/link_uniforms.cpp
index e9a20530b57bace3e227248c53ed163733e18c4c..2b277930f36409f4ee29c6dc9bfdd8b220bf1172 100644 (file)
--- a/src/compiler/glsl/link_uniforms.cpp
+++ b/src/compiler/glsl/link_uniforms.cpp
@@ -45,7 +45,7 @@
 /**
  * Count the backing storage requirements for a type
  */
 /**
  * Count the backing storage requirements for a type
  */

-static unsigned
+unsigned

 values_for_type(const glsl_type *type)
 {
    if (type->is_sampler()) {
 values_for_type(const glsl_type *type)
 {
    if (type->is_sampler()) {

diff --git a/src/compiler/glsl/linker.h b/src/compiler/glsl/linker.h
index 9841ef019e53e7b1b63fe2403da3f7a2ee9a0213..abcfdb15971f265e3a4ffc0ad908c6be69a5e7cf 100644 (file)
--- a/src/compiler/glsl/linker.h
+++ b/src/compiler/glsl/linker.h
@@ -76,6 +76,9 @@ void
 validate_interstage_uniform_blocks(struct gl_shader_program *prog,
                                    gl_linked_shader **stages);
 
 validate_interstage_uniform_blocks(struct gl_shader_program *prog,
                                    gl_linked_shader **stages);
 

+unsigned
+values_for_type(const glsl_type *type);
+

 extern void
 link_assign_atomic_counter_resources(struct gl_context *ctx,
                                      struct gl_shader_program *prog);
 extern void
 link_assign_atomic_counter_resources(struct gl_context *ctx,
                                      struct gl_shader_program *prog);