u_blitter: don't save/set/restore clip state

src/gallium/auxiliary/util/u_blitter.c

@@ -104,9 +104,6 @@ struct blitter_context_priv
    /* Viewport state. */
    struct pipe_viewport_state viewport;
 
-   /* Clip state. */
-   struct pipe_clip_state clip;
-
    /* Destination surface dimensions. */
    unsigned dst_width;
    unsigned dst_height;
@@ -193,7 +190,6 @@ struct blitter_context *util_blitter_create(struct pipe_context *pipe)
    ctx->dsa_write_depth_stencil =
       pipe->create_depth_stencil_alpha_state(pipe, &dsa);
 
-
    dsa.depth.enabled = 0;
    dsa.depth.writemask = 0;
    ctx->dsa_keep_depth_write_stencil =
@@ -440,7 +436,6 @@ static void blitter_restore_fragment_states(struct blitter_context_priv *ctx)
     * (depending on the operation) */
    pipe->set_stencil_ref(pipe, &ctx->base.saved_stencil_ref);
    pipe->set_viewport_state(pipe, &ctx->base.saved_viewport);
-   pipe->set_clip_state(pipe, &ctx->base.saved_clip);
 }
 
 static void blitter_check_saved_fb_state(struct blitter_context_priv *ctx)
@@ -517,9 +512,6 @@ static void blitter_set_rectangle(struct blitter_context_priv *ctx,
    ctx->viewport.translate[2] = 0.0f;
    ctx->viewport.translate[3] = 0.0f;
    ctx->base.pipe->set_viewport_state(ctx->base.pipe, &ctx->viewport);
-
-   /* clip */
-   ctx->base.pipe->set_clip_state(ctx->base.pipe, &ctx->clip);
 }
 
 static void blitter_set_clear_color(struct blitter_context_priv *ctx,

src/gallium/auxiliary/util/u_blitter.h

@@ -94,7 +94,6 @@ struct blitter_context
    struct pipe_framebuffer_state saved_fb_state;  /**< framebuffer state */
    struct pipe_stencil_ref saved_stencil_ref;     /**< stencil ref */
    struct pipe_viewport_state saved_viewport;
-   struct pipe_clip_state saved_clip;
 
    int saved_num_sampler_states;
    void *saved_sampler_states[PIPE_MAX_SAMPLERS];
@@ -346,13 +345,6 @@ void util_blitter_save_viewport(struct blitter_context *blitter,
    blitter->saved_viewport = *state;
 }
 
-static INLINE
-void util_blitter_save_clip(struct blitter_context *blitter,
-                            struct pipe_clip_state *state)
-{
-   blitter->saved_clip = *state;
-}
-
 static INLINE
 void util_blitter_save_fragment_sampler_states(
                   struct blitter_context *blitter,

src/gallium/drivers/i915/i915_surface.c

@@ -66,7 +66,6 @@ i915_surface_copy_render(struct pipe_context *pipe,
    util_blitter_save_fragment_shader(i915->blitter, i915->saved_fs);
    util_blitter_save_vertex_shader(i915->blitter, i915->saved_vs);
    util_blitter_save_viewport(i915->blitter, &i915->viewport);
-   util_blitter_save_clip(i915->blitter, &i915->saved_clip);
    util_blitter_save_vertex_elements(i915->blitter, i915->saved_velems);
    util_blitter_save_vertex_buffers(i915->blitter, i915->saved_nr_vertex_buffers,
                                     i915->saved_vertex_buffers);

src/gallium/drivers/nvfx/nvfx_surface.c

@@ -187,7 +187,6 @@ nvfx_get_blitter(struct pipe_context* pipe, int copy)
 	util_blitter_save_vertex_shader(blitter, nvfx->vertprog);
 	util_blitter_save_viewport(blitter, &nvfx->viewport);
 	util_blitter_save_framebuffer(blitter, &nvfx->framebuffer);
-	util_blitter_save_clip(blitter, &nvfx->clip);
 	util_blitter_save_vertex_elements(blitter, nvfx->vtxelt);
 	util_blitter_save_vertex_buffers(blitter, nvfx->vtxbuf_nr, nvfx->vtxbuf);
 

src/gallium/drivers/r300/r300_blit.c

@@ -62,7 +62,6 @@ static void r300_blitter_begin(struct r300_context* r300, enum r300_blitter_op o
     util_blitter_save_fragment_shader(r300->blitter, r300->fs.state);
     util_blitter_save_vertex_shader(r300->blitter, r300->vs_state.state);
     util_blitter_save_viewport(r300->blitter, &r300->viewport);
-    util_blitter_save_clip(r300->blitter, (struct pipe_clip_state*)r300->clip_state.state);
     util_blitter_save_vertex_elements(r300->blitter, r300->velems);
     util_blitter_save_vertex_buffers(r300->blitter, r300->vbuf_mgr->nr_vertex_buffers,
                                      r300->vbuf_mgr->vertex_buffer);

src/gallium/drivers/r600/r600_blit.c

@@ -59,9 +59,6 @@ static void r600_blitter_begin(struct pipe_context *ctx, enum r600_blitter_op op
 	if (rctx->states[R600_PIPE_STATE_VIEWPORT]) {
 		util_blitter_save_viewport(rctx->blitter, &rctx->viewport);
 	}
-	if (rctx->states[R600_PIPE_STATE_CLIP]) {
-		util_blitter_save_clip(rctx->blitter, &rctx->clip);
-	}
 	util_blitter_save_vertex_buffers(rctx->blitter,
 					 rctx->vbuf_mgr->nr_vertex_buffers,
 					 rctx->vbuf_mgr->vertex_buffer);