Mesa (master): mesa: remove dd_function_table::UseProgram

Marek Olšák mareko at kemper.freedesktop.org
Sat Jul 30 13:04:04 UTC 2016


Module: Mesa
Branch: master
Commit: 12aec78993edface7f530eede9e018b5fa1897b7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=12aec78993edface7f530eede9e018b5fa1897b7

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sun Jul 17 20:54:51 2016 +0200

mesa: remove dd_function_table::UseProgram

finally unused

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 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 114cbd2..a3dc191 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 8483752..cd8b0a7 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 41c3202..4f29cd9 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);
 }
 
 




More information about the mesa-commit mailing list