[Mesa-dev] [PATCH 11/15] mesa: Make _mesa_init_shader_program static

Ian Romanick idr at freedesktop.org
Thu Oct 23 09:35:26 PDT 2014


From: Ian Romanick <ian.d.romanick at intel.com>

Since a couple commits ago, there is only one caller, and that caller is
in the same file.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
 src/mesa/main/shaderobj.c | 6 +++---
 src/mesa/main/shaderobj.h | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c
index e703d42..ce9aa09 100644
--- a/src/mesa/main/shaderobj.c
+++ b/src/mesa/main/shaderobj.c
@@ -235,8 +235,8 @@ _mesa_reference_shader_program(struct gl_context *ctx,
    }
 }
 
-void
-_mesa_init_shader_program(struct gl_shader_program *prog)
+static void
+init_shader_program(struct gl_shader_program *prog)
 {
    prog->Type = GL_SHADER_PROGRAM_MESA;
    prog->RefCount = 1;
@@ -267,7 +267,7 @@ _mesa_new_shader_program(struct gl_context *ctx, GLuint name)
    shProg = rzalloc(NULL, struct gl_shader_program);
    if (shProg) {
       shProg->Name = name;
-      _mesa_init_shader_program(shProg);
+      init_shader_program(shProg);
    }
    return shProg;
 }
diff --git a/src/mesa/main/shaderobj.h b/src/mesa/main/shaderobj.h
index 6285941..05ddfeb 100644
--- a/src/mesa/main/shaderobj.h
+++ b/src/mesa/main/shaderobj.h
@@ -71,9 +71,6 @@ _mesa_init_shader(struct gl_context *ctx, struct gl_shader *shader);
 extern struct gl_shader *
 _mesa_new_shader(struct gl_context *ctx, GLuint name, GLenum type);
 
-extern void
-_mesa_init_shader_program(struct gl_shader_program *prog);
-
 extern struct gl_shader_program *
 _mesa_lookup_shader_program(struct gl_context *ctx, GLuint name);
 
-- 
1.8.1.4



More information about the mesa-dev mailing list