diff options
author | Eric Anholt <eric@anholt.net> | 2009-07-29 23:37:04 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-10-01 14:31:03 -0700 |
commit | 61b512c47c9888f3ff117faf3aceccfb52d59c3a (patch) | |
tree | d9e56d7c4e02e868864b4178da10bc719deaca35 /src/mesa/drivers/dri/i915/i915_program.c | |
parent | d6fbf87575a59e24c5d47b8b6b8700ee4583709b (diff) |
i915: Update and translate the fragment program along with state updates.
Previously, we were doing it in the midst of the pipeline run, which gave
an opportunity to enable/disable fallbacks, which is certainly the wrong
time to be doing so. This manifested itself in a NULL dereference for PutRow
after transitioning out of a fallback during a run_pipeline in glean glsl1.
Diffstat (limited to 'src/mesa/drivers/dri/i915/i915_program.c')
-rw-r--r-- | src/mesa/drivers/dri/i915/i915_program.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_program.c b/src/mesa/drivers/dri/i915/i915_program.c index 6ccc9eea3e..fd3019b234 100644 --- a/src/mesa/drivers/dri/i915/i915_program.c +++ b/src/mesa/drivers/dri/i915/i915_program.c @@ -530,8 +530,6 @@ i915_upload_program(struct i915_context *i915, GLuint program_size = p->csr - p->program; GLuint decl_size = p->decl - p->declarations; - FALLBACK(&i915->intel, I915_FALLBACK_PROGRAM, p->error); - /* Could just go straight to the batchbuffer from here: */ if (i915->state.ProgramSize != (program_size + decl_size) || |