summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <emil.velikov@collabora.com>2015-12-29 21:02:55 +1100
committerTimothy Arceri <timothy.arceri@collabora.com>2015-12-30 11:51:58 +1100
commit2c1a215409e6d5b3bc95854e17da2412a978e0c9 (patch)
treed244d15ea5438f50a0e84a15d4cf90d36b7a72ec
parentc704b89fe49dd3f80ff0028bece93ea45b651987 (diff)
downloadexternal_mesa3d-2c1a215409e6d5b3bc95854e17da2412a978e0c9.zip
external_mesa3d-2c1a215409e6d5b3bc95854e17da2412a978e0c9.tar.gz
external_mesa3d-2c1a215409e6d5b3bc95854e17da2412a978e0c9.tar.bz2
glsl/linker: annotate static functions as such
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com> Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
-rw-r--r--src/glsl/link_uniform_block_active_visitor.cpp4
-rw-r--r--src/glsl/link_uniform_blocks.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/glsl/link_uniform_block_active_visitor.cpp b/src/glsl/link_uniform_block_active_visitor.cpp
index 422739a..54fea70 100644
--- a/src/glsl/link_uniform_block_active_visitor.cpp
+++ b/src/glsl/link_uniform_block_active_visitor.cpp
@@ -24,7 +24,7 @@
#include "link_uniform_block_active_visitor.h"
#include "program.h"
-link_uniform_block_active *
+static link_uniform_block_active *
process_block(void *mem_ctx, struct hash_table *ht, ir_variable *var)
{
const hash_entry *const existing_block =
@@ -92,7 +92,7 @@ process_block(void *mem_ctx, struct hash_table *ht, ir_variable *var)
* and not over complicating the code we will end up with a count of 8.
* Here each dimension has 2 different indices counted so we end up with 2*2*2
*/
-struct uniform_block_array_elements **
+static struct uniform_block_array_elements **
process_arrays(void *mem_ctx, ir_dereference_array *ir,
struct link_uniform_block_active *block)
{
diff --git a/src/glsl/link_uniform_blocks.cpp b/src/glsl/link_uniform_blocks.cpp
index d5d30bb..7d75576 100644
--- a/src/glsl/link_uniform_blocks.cpp
+++ b/src/glsl/link_uniform_blocks.cpp
@@ -266,7 +266,7 @@ process_block_array(struct uniform_block_array_elements *ub_array, char **name,
/* This function resizes the array types of the block so that later we can use
* this new size to correctly calculate the offest for indirect indexing.
*/
-const glsl_type *
+static const glsl_type *
resize_block_array(const glsl_type *type,
struct uniform_block_array_elements *ub_array)
{