From 69cfc16cb670804b272e88abac5ed3856bb70fa8 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Tue, 22 Feb 2011 22:07:03 +0000 Subject: [PATCH] i915g: Disable LIS7 state updates for now --- src/gallium/drivers/i915/TODO | 2 ++ src/gallium/drivers/i915/i915_state_immediate.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/i915/TODO b/src/gallium/drivers/i915/TODO index fc644fe7f93..f4e1423fa59 100644 --- a/src/gallium/drivers/i915/TODO +++ b/src/gallium/drivers/i915/TODO @@ -6,6 +6,8 @@ Random list of problems with i915g: - Add support for PIPE_CAP_POINT_SPRITE either via the draw module or directly via the hardware, look at the classic driver, more advanced. +- What does this button do? Figure out LIS7 with regards to depth offset. + - Dies with BadDrawable on GLXFBconfig changes/destruction. Makes piglit totally unusable :( Upgrading xserver helped here, it doesn't crash anymore. Still broken, it doesn't update the viewport/get new buffers. diff --git a/src/gallium/drivers/i915/i915_state_immediate.c b/src/gallium/drivers/i915/i915_state_immediate.c index 00dcf9cb2d0..3dd227f6045 100644 --- a/src/gallium/drivers/i915/i915_state_immediate.c +++ b/src/gallium/drivers/i915/i915_state_immediate.c @@ -130,7 +130,7 @@ static void upload_S5(struct i915_context *i915) #if 0 /* I915_NEW_RASTERIZER */ - if (i915->state.Polygon->OffsetFill) { + if (i915->rasterizer->LIS7) { LIS5 |= S5_GLOBAL_DEPTH_OFFSET_ENABLE; } #endif @@ -192,10 +192,12 @@ static void upload_S7(struct i915_context *i915) */ LIS7 = i915->rasterizer->LIS7; +#if 0 if (LIS7 != i915->current.immediate[I915_IMMEDIATE_S7]) { i915->current.immediate[I915_IMMEDIATE_S7] = LIS7; i915->hardware_dirty |= I915_HW_IMMEDIATE; } +#endif } const struct i915_tracked_state i915_upload_S7 = { -- 2.30.2