From 12aec78993edface7f530eede9e018b5fa1897b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 17 Jul 2016 20:54:51 +0200 Subject: [PATCH] mesa: remove dd_function_table::UseProgram MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit finally unused Reviewed-by: Nicolai Hähnle --- src/mesa/main/dd.h | 1 - src/mesa/main/pipelineobj.c | 3 --- src/mesa/main/shaderapi.c | 6 ------ 3 files changed, 10 deletions(-) diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h index 114cbd2b151..a3dc191b444 100644 --- a/src/mesa/main/dd.h +++ b/src/mesa/main/dd.h @@ -785,7 +785,6 @@ struct dd_function_table { */ /*@{*/ struct gl_linked_shader *(*NewShader)(gl_shader_stage stage); - void (*UseProgram)(struct gl_context *ctx, struct gl_shader_program *shProg); /*@}*/ /** diff --git a/src/mesa/main/pipelineobj.c b/src/mesa/main/pipelineobj.c index 84837525083..cd8b0a775b6 100644 --- a/src/mesa/main/pipelineobj.c +++ b/src/mesa/main/pipelineobj.c @@ -470,9 +470,6 @@ _mesa_bind_pipeline(struct gl_context *ctx, for (i = 0; i < MESA_SHADER_STAGES; i++) _mesa_shader_program_init_subroutine_defaults(ctx->_Shader->CurrentProgram[i]); - - if (ctx->Driver.UseProgram) - ctx->Driver.UseProgram(ctx, NULL); } } diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 41c3202148e..4f29cd974d0 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -1253,9 +1253,6 @@ _mesa_use_program(struct gl_context *ctx, struct gl_shader_program *shProg) for (i = 0; i < MESA_SHADER_STAGES; i++) use_shader_program(ctx, i, shProg, &ctx->Shader); _mesa_active_program(ctx, shProg, "glUseProgram"); - - if (ctx->Driver.UseProgram) - ctx->Driver.UseProgram(ctx, shProg); } @@ -2145,9 +2142,6 @@ _mesa_use_shader_program(struct gl_context *ctx, GLenum type, { gl_shader_stage stage = _mesa_shader_enum_to_shader_stage(type); use_shader_program(ctx, stage, shProg, shTarget); - - if (ctx->Driver.UseProgram) - ctx->Driver.UseProgram(ctx, shProg); } -- 2.30.2