i915: remove BindProgram

The same thing is done in i915_update_program called by i915InvalidateState.
Why do it twice.

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák 2017-03-23 23:51:35 +01:00
parent 96a1c2406d
commit bbb5561007

View file

@ -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;