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_context.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_context.c')
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_context.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c index 3ab7d682ee..b342503772 100644 --- a/src/mesa/drivers/dri/i915/i915_context.c +++ b/src/mesa/drivers/dri/i915/i915_context.c @@ -40,6 +40,7 @@ #include "utils.h" #include "i915_reg.h" +#include "i915_program.h" #include "intel_regions.h" #include "intel_batchbuffer.h" @@ -80,6 +81,8 @@ i915InvalidateState(GLcontext * ctx, GLuint new_state) i915_update_stencil(ctx); if (new_state & (_NEW_LIGHT)) i915_update_provoking_vertex(ctx); + if (new_state & (_NEW_PROGRAM | _NEW_PROGRAM_CONSTANTS)) + i915_update_program(ctx); } |