summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2017-03-23 23:51:35 +0100
committerMarek Olšák <[email protected]>2017-03-29 15:44:00 +0200
commitbbb55610072166cf3a578ce2a7e9560f1678b27b (patch)
tree7b20f20f5d371b068920afe0fbef3450ac2e4662 /src/mesa/drivers/dri
parent96a1c2406db4ac79335a7f6e6d61d80d985df76e (diff)
i915: remove BindProgram
The same thing is done in i915_update_program called by i915InvalidateState. Why do it twice. Reviewed-by: Edward O'Callaghan <[email protected]> Reviewed-by: Timothy Arceri <[email protected]> Reviewed-by: Nicolai Hähnle <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/i915/i915_fragprog.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_fragprog.c b/src/mesa/drivers/dri/i915/i915_fragprog.c
index fce649d44e3..0fad2c34c34 100644
--- a/src/mesa/drivers/dri/i915/i915_fragprog.c
+++ b/src/mesa/drivers/dri/i915/i915_fragprog.c
@@ -1119,30 +1119,6 @@ track_params(struct i915_fragment_program *p)
p->on_hardware = 0; /* overkill */
}
-
-static void
-i915BindProgram(struct gl_context * ctx, GLenum target, struct gl_program *prog)
-{
- if (target == GL_FRAGMENT_PROGRAM_ARB) {
- struct i915_context *i915 = I915_CONTEXT(ctx);
- struct i915_fragment_program *p = (struct i915_fragment_program *) prog;
-
- if (i915->current_program == p)
- return;
-
- if (i915->current_program) {
- i915->current_program->on_hardware = 0;
- i915->current_program->params_uptodate = 0;
- }
-
- i915->current_program = p;
-
- assert(p->on_hardware == 0);
- assert(p->params_uptodate == 0);
-
- }
-}
-
static struct gl_program *
i915NewProgram(struct gl_context * ctx, GLenum target, GLuint id,
bool is_arb_asm)
@@ -1372,7 +1348,6 @@ i915ValidateFragmentProgram(struct i915_context *i915)
void
i915InitFragProgFuncs(struct dd_function_table *functions)
{
- functions->BindProgram = i915BindProgram;
functions->NewProgram = i915NewProgram;
functions->DeleteProgram = i915DeleteProgram;
functions->IsProgramNative = i915IsProgramNative;