diff options
| author | Stéphane Marchesin <marcheu@chromium.org> | 2012-02-07 14:33:12 -0800 |
|---|---|---|
| committer | Stéphane Marchesin <marcheu@chromium.org> | 2012-02-12 16:32:14 -0800 |
| commit | be6a02266d1a934c6eff9aaf12fc618588b2d586 (patch) | |
| tree | 9f8eb08e5bfa579f362f5655e2e079853e363dab | |
| parent | 3cff45fdb182a1327f6b89fdc4e0ddc5d680372a (diff) | |
i915g: Remove unused poly stipple state.
| -rw-r--r-- | src/gallium/drivers/i915/i915_context.h | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/i915/i915_state_dynamic.c | 53 |
2 files changed, 0 insertions, 54 deletions
diff --git a/src/gallium/drivers/i915/i915_context.h b/src/gallium/drivers/i915/i915_context.h index b019c9f342a..5790a2d0d26 100644 --- a/src/gallium/drivers/i915/i915_context.h +++ b/src/gallium/drivers/i915/i915_context.h @@ -239,7 +239,6 @@ struct i915_context { struct pipe_clip_state clip; struct pipe_resource *constants[PIPE_SHADER_TYPES]; struct pipe_framebuffer_state framebuffer; - struct pipe_poly_stipple poly_stipple; struct pipe_scissor_state scissor; struct pipe_sampler_view *fragment_sampler_views[PIPE_MAX_SAMPLERS]; struct pipe_sampler_view *vertex_sampler_views[PIPE_MAX_SAMPLERS]; diff --git a/src/gallium/drivers/i915/i915_state_dynamic.c b/src/gallium/drivers/i915/i915_state_dynamic.c index 1a21433eb9e..7e175978658 100644 --- a/src/gallium/drivers/i915/i915_state_dynamic.c +++ b/src/gallium/drivers/i915/i915_state_dynamic.c @@ -194,58 +194,6 @@ const struct i915_tracked_state i915_upload_DEPTHSCALE = { /*********************************************************************** - * Polygon stipple - * - * The i915 supports a 4x4 stipple natively, GL wants 32x32. - * Fortunately stipple is usually a repeating pattern. - * - * XXX: does stipple pattern need to be adjusted according to - * the window position? - * - * XXX: possibly need workaround for conform paths test. - */ -static void upload_STIPPLE(struct i915_context *i915) -{ - unsigned st[2]; - - st[0] = _3DSTATE_STIPPLE; - st[1] = 0; - - /* I915_NEW_RASTERIZER - */ - st[1] |= i915->rasterizer->st; - - /* I915_NEW_STIPPLE - */ - { - const ubyte *mask = (const ubyte *)i915->poly_stipple.stipple; - ubyte p[4]; - - p[0] = mask[12] & 0xf; - p[1] = mask[8] & 0xf; - p[2] = mask[4] & 0xf; - p[3] = mask[0] & 0xf; - - /* Not sure what to do about fallbacks, so for now just dont: - */ - st[1] |= ((p[0] << 0) | - (p[1] << 4) | - (p[2] << 8) | - (p[3] << 12)); - } - - set_dynamic_array(i915, I915_DYNAMIC_STP_0, st, 2); -} - -const struct i915_tracked_state i915_upload_STIPPLE = { - "STIPPLE", - upload_STIPPLE, - I915_NEW_RASTERIZER | I915_NEW_STIPPLE -}; - - - -/*********************************************************************** * Scissor enable */ static void upload_SCISSOR_ENABLE( struct i915_context *i915 ) @@ -295,7 +243,6 @@ static const struct i915_tracked_state *atoms[] = { &i915_upload_BLENDCOLOR, &i915_upload_IAB, &i915_upload_DEPTHSCALE, - &i915_upload_STIPPLE, &i915_upload_SCISSOR_ENABLE, &i915_upload_SCISSOR_RECT }; |