[Mesa-dev] [PATCH] glsl: mark link_uniform_blocks_are_compatible() as static

Timothy Arceri timothy.arceri at collabora.com
Sat Jul 2 03:36:09 UTC 2016


Missed this when doing 6d1a59d15b.
---
 src/compiler/glsl/link_uniform_blocks.cpp | 2 +-
 src/compiler/glsl/linker.h                | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/compiler/glsl/link_uniform_blocks.cpp b/src/compiler/glsl/link_uniform_blocks.cpp
index 1ccd0df..5b0dff6 100644
--- a/src/compiler/glsl/link_uniform_blocks.cpp
+++ b/src/compiler/glsl/link_uniform_blocks.cpp
@@ -469,7 +469,7 @@ link_uniform_blocks(void *mem_ctx,
    _mesa_hash_table_destroy(block_hash, NULL);
 }
 
-bool
+static bool
 link_uniform_blocks_are_compatible(const gl_uniform_block *a,
                                    const gl_uniform_block *b)
 {
diff --git a/src/compiler/glsl/linker.h b/src/compiler/glsl/linker.h
index 6687b14..4e36d0b 100644
--- a/src/compiler/glsl/linker.h
+++ b/src/compiler/glsl/linker.h
@@ -50,10 +50,6 @@ link_cross_validate_uniform_block(void *mem_ctx,
 				  unsigned int *num_linked_blocks,
 				  struct gl_uniform_block *new_block);
 
-extern bool
-link_uniform_blocks_are_compatible(const gl_uniform_block *a,
-				   const gl_uniform_block *b);
-
 extern void
 link_uniform_blocks(void *mem_ctx,
                     struct gl_context *ctx,
-- 
2.7.4



More information about the mesa-dev mailing list