From bbb55610072166cf3a578ce2a7e9560f1678b27b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Thu, 23 Mar 2017 23:51:35 +0100 Subject: [PATCH] i915: remove BindProgram MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The same thing is done in i915_update_program called by i915InvalidateState. Why do it twice. Reviewed-by: Edward O'Callaghan Reviewed-by: Timothy Arceri Reviewed-by: Nicolai Hähnle --- src/mesa/drivers/dri/i915/i915_fragprog.c | 25 ----------------------- 1 file changed, 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; -- 2.30.2