Module: Mesa Branch: 17.3 Commit: 9b44ef94b4ed3960d9220a156b21b261e4cc320c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9b44ef94b4ed3960d9220a156b21b261e4cc320c
Author: Dave Airlie <airl...@redhat.com> Date: Fri May 26 11:24:59 2017 +1000 i915g: make gears run again. We need to validate some structs exist before we dirty the states, and avoid the problem in some other places. Fixes: e027935a7 ("st/mesa: don't update unrelated states in non-draw calls such as Clear") (cherry picked from commit cc69f2385ee5405cd1bef746d3e9006fc5430545) --- src/gallium/drivers/i915/i915_state_derived.c | 17 +++++++++++++++++ src/gallium/drivers/i915/i915_state_dynamic.c | 3 ++- src/gallium/drivers/i915/i915_state_immediate.c | 6 ++++-- src/gallium/drivers/i915/i915_state_static.c | 2 +- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/i915/i915_state_derived.c b/src/gallium/drivers/i915/i915_state_derived.c index dbfbc84c9e..7809010d94 100644 --- a/src/gallium/drivers/i915/i915_state_derived.c +++ b/src/gallium/drivers/i915/i915_state_derived.c @@ -216,6 +216,23 @@ void i915_update_derived(struct i915_context *i915) if (I915_DBG_ON(DBG_ATOMS)) i915_dump_dirty(i915, __FUNCTION__); + if (!i915->fs) { + i915->dirty &= ~(I915_NEW_FS_CONSTANTS | I915_NEW_FS); + i915->hardware_dirty &= ~(I915_HW_PROGRAM | I915_HW_CONSTANTS); + } + + if (!i915->vs) + i915->dirty &= ~I915_NEW_VS; + + if (!i915->blend) + i915->dirty &= ~I915_NEW_BLEND; + + if (!i915->rasterizer) + i915->dirty &= ~I915_NEW_RASTERIZER; + + if (!i915->depth_stencil) + i915->dirty &= ~I915_NEW_DEPTH_STENCIL; + for (i = 0; atoms[i]; i++) if (atoms[i]->dirty & i915->dirty) atoms[i]->update(i915); diff --git a/src/gallium/drivers/i915/i915_state_dynamic.c b/src/gallium/drivers/i915/i915_state_dynamic.c index 85b2721567..434b09d4e0 100644 --- a/src/gallium/drivers/i915/i915_state_dynamic.c +++ b/src/gallium/drivers/i915/i915_state_dynamic.c @@ -213,7 +213,8 @@ static void upload_STIPPLE(struct i915_context *i915) /* I915_NEW_RASTERIZER */ - st[1] |= i915->rasterizer->st; + if (i915->rasterizer) + st[1] |= i915->rasterizer->st; /* I915_NEW_STIPPLE */ diff --git a/src/gallium/drivers/i915/i915_state_immediate.c b/src/gallium/drivers/i915/i915_state_immediate.c index b6007acdd1..14566a4bec 100644 --- a/src/gallium/drivers/i915/i915_state_immediate.c +++ b/src/gallium/drivers/i915/i915_state_immediate.c @@ -168,11 +168,13 @@ static void upload_S6(struct i915_context *i915) /* I915_NEW_BLEND */ - LIS6 |= i915->blend->LIS6; + if (i915->blend) + LIS6 |= i915->blend->LIS6; /* I915_NEW_DEPTH */ - LIS6 |= i915->depth_stencil->depth_LIS6; + if (i915->depth_stencil) + LIS6 |= i915->depth_stencil->depth_LIS6; set_immediate(i915, I915_IMMEDIATE_S6, LIS6); } diff --git a/src/gallium/drivers/i915/i915_state_static.c b/src/gallium/drivers/i915/i915_state_static.c index 9a7ea227ec..88b418b1ac 100644 --- a/src/gallium/drivers/i915/i915_state_static.c +++ b/src/gallium/drivers/i915/i915_state_static.c @@ -216,7 +216,7 @@ static void update_dst_buf_vars(struct i915_context *i915) zformat = translate_depth_format(depth_surface->format); if (is->is_i945 && tex->tiling != I915_TILE_NONE - && !i915->fs->info.writes_z) + && (i915->fs && !i915->fs->info.writes_z)) early_z = CLASSIC_EARLY_DEPTH; } else zformat = 0; _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit