glsl/main: remove unused params and make function static

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>

diff --git a/src/compiler/glsl/builtin_functions.cpp b/src/compiler/glsl/builtin_functions.cpp
index ae4e8f2c455226251f71785c86f8271b5f43baf7..941ea1242bba412575382c77e5ebcf538baf5265 100644 (file)
--- a/src/compiler/glsl/builtin_functions.cpp
+++ b/src/compiler/glsl/builtin_functions.cpp
@@ -956,7 +956,7 @@ builtin_builder::create_shader()
     * GLSL utility code that could be linked against any stage, so just
     * arbitrarily pick GL_VERTEX_SHADER.
     */
-   shader = _mesa_new_shader(NULL, 0, MESA_SHADER_VERTEX);
+   shader = _mesa_new_shader(0, MESA_SHADER_VERTEX);
    shader->symbols = new(mem_ctx) glsl_symbol_table;
 
    gl_ModelViewProjectionMatrix =

diff --git a/src/compiler/glsl/standalone_scaffolding.cpp b/src/compiler/glsl/standalone_scaffolding.cpp
index b5dc5231ee845a2094145690f634938ad29f7b18..53729af3921b04ed28ecb53d00a1023503250975 100644 (file)
--- a/src/compiler/glsl/standalone_scaffolding.cpp
+++ b/src/compiler/glsl/standalone_scaffolding.cpp
@@ -68,12 +68,10 @@ _mesa_shader_debug(struct gl_context *, GLenum, GLuint *,
 }
 
 struct gl_shader *
-_mesa_new_shader(struct gl_context *ctx, GLuint name, gl_shader_stage stage)
+_mesa_new_shader(GLuint name, gl_shader_stage stage)
 {
    struct gl_shader *shader;
 
-   (void) ctx;
-
    assert(stage == MESA_SHADER_FRAGMENT || stage == MESA_SHADER_VERTEX);
    shader = rzalloc(NULL, struct gl_shader);
    if (shader) {

diff --git a/src/compiler/glsl/standalone_scaffolding.h b/src/compiler/glsl/standalone_scaffolding.h
index c6666c9c73d7d5b865f2d8bd4e0237ced8fcc858..a19eae28de62cd700140e0f6a485fa2eab3ff447 100644 (file)
--- a/src/compiler/glsl/standalone_scaffolding.h
+++ b/src/compiler/glsl/standalone_scaffolding.h
@@ -42,7 +42,7 @@ _mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,
                        struct gl_shader *sh);
 
 extern "C" struct gl_shader *
-_mesa_new_shader(struct gl_context *ctx, GLuint name, gl_shader_stage stage);
+_mesa_new_shader(GLuint name, gl_shader_stage stage);
 
 extern "C" struct gl_linked_shader *
 _mesa_new_linked_shader(gl_shader_stage stage);

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index df57c87fa3fb9bd7ca89603c0519fd117adfb23c..fdc4748602f62d934382300092266a775ff011cf 100644 (file)
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -129,7 +129,7 @@ meta_compile_shader_with_debug(struct gl_context *ctx, gl_shader_stage stage,
    const GLuint name = ~0;
    struct gl_shader *sh;
 
-   sh = _mesa_new_shader(ctx, name, stage);
+   sh = _mesa_new_shader(name, stage);
    sh->Source = strdup(source);
    sh->CompileStatus = false;
    _mesa_compile_shader(ctx, sh);

diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp
index f90d31ae7e952cd3d2cd90140f1cf514cc28579b..83881e9ccf1307398f905b4ec36c73f14c3f5561 100644 (file)
--- a/src/mesa/main/ff_fragment_shader.cpp
+++ b/src/mesa/main/ff_fragment_shader.cpp
@@ -1203,7 +1203,7 @@ create_new_program(struct gl_context *ctx, struct state_key *key)
    _mesa_glsl_parse_state *state;
 
    p.mem_ctx = ralloc_context(NULL);
-   p.shader = _mesa_new_shader(ctx, 0, MESA_SHADER_FRAGMENT);
+   p.shader = _mesa_new_shader(0, MESA_SHADER_FRAGMENT);
    p.shader->ir = new(p.shader) exec_list;
    state = new(p.shader) _mesa_glsl_parse_state(ctx, MESA_SHADER_FRAGMENT,
                                                p.shader);

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index 962b42e62ae3fa61bae88836b266597310d5f617..fdfe1e7c6c44e0a34530021a7b89f4294f258d26 100644 (file)
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -334,7 +334,7 @@ create_shader(struct gl_context *ctx, GLenum type)
 
    _mesa_HashLockMutex(ctx->Shared->ShaderObjects);
    name = _mesa_HashFindFreeKeyBlock(ctx->Shared->ShaderObjects, 1);
-   sh = _mesa_new_shader(ctx, name, _mesa_shader_enum_to_shader_stage(type));
+   sh = _mesa_new_shader(name, _mesa_shader_enum_to_shader_stage(type));
    sh->Type = type;
    _mesa_HashInsertLocked(ctx->Shared->ShaderObjects, name, sh);
    _mesa_HashUnlockMutex(ctx->Shared->ShaderObjects);

diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c
index 93fdc669f2f6d0db9829806a03a41c31b9179f2a..131d6824df03c8e9f2d053edf5ce9b1665f10eae 100644 (file)
--- a/src/mesa/main/shaderobj.c
+++ b/src/mesa/main/shaderobj.c
@@ -88,8 +88,8 @@ _mesa_reference_shader(struct gl_context *ctx, struct gl_shader **ptr,
    }
 }
 
-void
-_mesa_init_shader(struct gl_context *ctx, struct gl_shader *shader)
+static void
+_mesa_init_shader(struct gl_shader *shader)
 {
    shader->RefCount = 1;
    shader->Geom.VerticesOut = -1;
@@ -101,14 +101,14 @@ _mesa_init_shader(struct gl_context *ctx, struct gl_shader *shader)
  * Allocate a new gl_shader object, initialize it.
  */
 struct gl_shader *
-_mesa_new_shader(struct gl_context *ctx, GLuint name, gl_shader_stage stage)
+_mesa_new_shader(GLuint name, gl_shader_stage stage)
 {
    struct gl_shader *shader;
    shader = rzalloc(NULL, struct gl_shader);
    if (shader) {
       shader->Stage = stage;
       shader->Name = name;
-      _mesa_init_shader(ctx, shader);
+      _mesa_init_shader(shader);
    }
    return shader;
 }

diff --git a/src/mesa/main/shaderobj.h b/src/mesa/main/shaderobj.h
index f331db11664839f0e4d13496d05af76189715125..814a7f11552e8f18b67a315c7a826763eb46accd 100644 (file)
--- a/src/mesa/main/shaderobj.h
+++ b/src/mesa/main/shaderobj.h
@@ -75,12 +75,8 @@ _mesa_reference_shader_program(struct gl_context *ctx,
       _mesa_reference_shader_program_(ctx, ptr, shProg);
 }
 
-
-extern void
-_mesa_init_shader(struct gl_context *ctx, struct gl_shader *shader);
-
 extern struct gl_shader *
-_mesa_new_shader(struct gl_context *ctx, GLuint name, gl_shader_stage type);
+_mesa_new_shader(GLuint name, gl_shader_stage type);
 
 extern struct gl_linked_shader *
 _mesa_new_linked_shader(gl_shader_stage type);