From 99e8a3973f71d161eb4e9f51b038a5799945d2db Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Mon, 20 Oct 2014 15:24:05 -0700 Subject: [PATCH] mesa: Remove context parameter from dd_function_table::NewShaderProgram This fixes some unused parameter warnings introduced by the previous commit. Signed-off-by: Ian Romanick Reviewed-by: Brian Paul Reviewed-by: Matt Turner Reviewed-by: Kenneth Graunke --- src/mesa/main/dd.h | 3 +-- src/mesa/main/ff_fragment_shader.cpp | 2 +- src/mesa/main/shaderapi.c | 2 +- src/mesa/main/shaderobj.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index c07e83ad911..2f40915d91f 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -758,8 +758,7 @@ struct dd_function_table { struct gl_shader *(*NewShader)(struct gl_context *ctx, GLuint name, GLenum type); void (*DeleteShader)(struct gl_context *ctx, struct gl_shader *shader); - struct gl_shader_program *(*NewShaderProgram)(struct gl_context *ctx, - GLuint name); + struct gl_shader_program *(*NewShaderProgram)(GLuint name); void (*DeleteShaderProgram)(struct gl_context *ctx, struct gl_shader_program *shProg); void (*UseProgram)(struct gl_context *ctx, struct gl_shader_program *shProg); diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp index e31a14516c4..5591d57df11 100644 --- a/src/mesa/main/ff_fragment_shader.cpp +++ b/src/mesa/main/ff_fragment_shader.cpp @@ -1212,7 +1212,7 @@ create_new_program(struct gl_context *ctx, struct state_key *key) p.top_instructions = p.shader->ir; p.instructions = p.shader->ir; p.state = key; - p.shader_program = ctx->Driver.NewShaderProgram(ctx, 0); + p.shader_program = ctx->Driver.NewShaderProgram(0); /* Tell the linker to ignore the fact that we're building a * separate shader, in case we're in a GLES2 context that would diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 3e6f61067c2..2be9092c10d 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -316,7 +316,7 @@ create_shader_program(struct gl_context *ctx) name = _mesa_HashFindFreeKeyBlock(ctx->Shared->ShaderObjects, 1); - shProg = ctx->Driver.NewShaderProgram(ctx, name); + shProg = ctx->Driver.NewShaderProgram(name); _mesa_HashInsert(ctx->Shared->ShaderObjects, name, shProg); diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c index ce9aa098734..81bd7829d36 100644 --- a/src/mesa/main/shaderobj.c +++ b/src/mesa/main/shaderobj.c @@ -261,7 +261,7 @@ init_shader_program(struct gl_shader_program *prog) * Called via ctx->Driver.NewShaderProgram() */ static struct gl_shader_program * -_mesa_new_shader_program(struct gl_context *ctx, GLuint name) +_mesa_new_shader_program(GLuint name) { struct gl_shader_program *shProg; shProg = rzalloc(NULL, struct gl_shader_program); -- 2.30.2