diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-01-01 20:53:12 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-01-02 11:52:58 +0000 |
| commit | 8582c6f0bbe1bf01324b46933ff2f50c65f2a82d (patch) | |
| tree | bb6dc504e253e61ba090be1a58750d22fa9d853b /src | |
| parent | 24264af2912f9abae5aff2a6fb5a50383d9e33be (diff) | |
sna/gen6+: Remove vestigial CC viewport state
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sna/gen6_render.c | 13 | ||||
| -rw-r--r-- | src/sna/gen7_render.c | 15 | ||||
| -rw-r--r-- | src/sna/sna_render.h | 2 |
3 files changed, 3 insertions, 27 deletions
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c index c152fa4b..142fc049 100644 --- a/src/sna/gen6_render.c +++ b/src/sna/gen6_render.c @@ -434,7 +434,7 @@ gen6_emit_viewports(struct sna *sna) (4 - 2)); OUT_BATCH(0); OUT_BATCH(0); - OUT_BATCH(sna->render_state.gen6.cc_vp); + OUT_BATCH(0); } static void @@ -1033,16 +1033,6 @@ sampler_fill_init(struct gen6_sampler_state *ss) sampler_state_init(ss+1, SAMPLER_FILTER_NEAREST, SAMPLER_EXTEND_NONE); } -static uint32_t gen6_create_cc_viewport(struct sna_static_stream *stream) -{ - struct gen6_cc_viewport vp; - - vp.min_depth = -1.e35; - vp.max_depth = 1.e35; - - return sna_static_stream_add(stream, &vp, sizeof(vp), 32); -} - static uint32_t gen6_tiling_bits(uint32_t tiling) { @@ -3669,7 +3659,6 @@ static bool gen6_render_setup(struct sna *sna) } } - state->cc_vp = gen6_create_cc_viewport(&general); state->cc_blend = gen6_composite_create_blend_state(&general); state->general_bo = sna_static_stream_fini(sna, &general); diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c index 0cbbf80e..ca688d4e 100644 --- a/src/sna/gen7_render.c +++ b/src/sna/gen7_render.c @@ -624,9 +624,9 @@ gen7_emit_cc_invariant(struct sna *sna) OUT_BATCH(0); #endif - assert(is_aligned(sna->render_state.gen7.cc_vp, 32)); + /* XXX clear to be safe */ OUT_BATCH(GEN7_3DSTATE_VIEWPORT_STATE_POINTERS_CC | (2 - 2)); - OUT_BATCH(sna->render_state.gen7.cc_vp); + OUT_BATCH(0); } static void @@ -1165,16 +1165,6 @@ sampler_fill_init(struct gen7_sampler_state *ss) sampler_state_init(ss+1, SAMPLER_FILTER_NEAREST, SAMPLER_EXTEND_NONE); } -static uint32_t gen7_create_cc_viewport(struct sna_static_stream *stream) -{ - struct gen7_cc_viewport vp; - - vp.min_depth = -1.e35; - vp.max_depth = 1.e35; - - return sna_static_stream_add(stream, &vp, sizeof(vp), 32); -} - static uint32_t gen7_tiling_bits(uint32_t tiling) { @@ -3753,7 +3743,6 @@ static bool gen7_render_setup(struct sna *sna) } } - state->cc_vp = gen7_create_cc_viewport(&general); state->cc_blend = gen7_composite_create_blend_state(&general); state->general_bo = sna_static_stream_fini(sna, &general); diff --git a/src/sna/sna_render.h b/src/sna/sna_render.h index b957a9f5..55e38069 100644 --- a/src/sna/sna_render.h +++ b/src/sna/sna_render.h @@ -403,7 +403,6 @@ struct gen6_render_state { uint32_t wm_state; uint32_t wm_kernel[GEN6_KERNEL_COUNT][3]; - uint32_t cc_vp; uint32_t cc_blend; uint32_t drawrect_offset; @@ -453,7 +452,6 @@ struct gen7_render_state { uint32_t wm_state; uint32_t wm_kernel[GEN7_WM_KERNEL_COUNT][3]; - uint32_t cc_vp; uint32_t cc_blend; uint32_t drawrect_offset; |