gallium/swr: Fix glClear when it's used with glEnable/glDisable GL_SCISSOR_TEST

[mesa.git] / src / gallium / drivers / swr / swr_clear.cpp

diff --git a/src/gallium/drivers/swr/swr_clear.cpp b/src/gallium/drivers/swr/swr_clear.cpp
index 3a35805a7acccefdd9cd051c0afe5890fd8b7d8f..4473f76a0a29af6274bb5a663bcc40c895c7674a 100644 (file)
--- a/src/gallium/drivers/swr/swr_clear.cpp
+++ b/src/gallium/drivers/swr/swr_clear.cpp
@@ -68,19 +68,17 @@ swr_clear(struct pipe_context *pipe,
    ((union pipe_color_union *)color)->f[3] = 1.0; /* cast off your const'd-ness */
 #endif
 
-   SWR_RECT clear_rect;
-   /* If enabled, clear to scissor; otherwise clear full surface */
-   if (ctx->rasterizer && ctx->rasterizer->scissor) {
-      clear_rect = ctx->swr_scissor;
-   } else {
-      clear_rect = {0, 0, (int32_t)fb->width, (int32_t)fb->height};
-   }
+   /* 
+    * Always clear full surface. When GL_SCISSOR_TEST is enabled
+    * glClear is handled by state tracker and there is no need to do this here
+    */
+   SWR_RECT clear_rect = {0, 0, (int32_t)fb->width, (int32_t)fb->height};
 
    for (unsigned i = 0; i < layers; ++i) {
       swr_update_draw_context(ctx);
-      SwrClearRenderTarget(ctx->swrContext, clearMask, i,
-                           color->f, depth, stencil,
-                           clear_rect);
+      ctx->api.pfnSwrClearRenderTarget(ctx->swrContext, clearMask, i,
+                                       color->f, depth, stencil,
+                                       clear_rect);
 
       // Mask out the attachments that are out of layers.
       if (fb->zsbuf &&
@@ -94,65 +92,8 @@ swr_clear(struct pipe_context *pipe,
    }
 }
 
-
-#if 0 // XXX, these don't get called. how to get these called?  Do we need
-      // them?  Docs?
-static void
-swr_clear_render_target(struct pipe_context *pipe, struct pipe_surface *ps,
-                        const union pipe_color_union *color,
-                        unsigned x, unsigned y, unsigned w, unsigned h,
-                        bool render_condition_enabled)
-{
-   struct swr_context *ctx = swr_context(pipe);
-   fprintf(stderr, "SWR swr_clear_render_target!\n");
-
-   ctx->dirty |= SWR_NEW_FRAMEBUFFER | SWR_NEW_SCISSOR;
-}
-
-static void
-swr_clear_depth_stencil(struct pipe_context *pipe, struct pipe_surface *ps,
-                        unsigned buffers, double depth, unsigned stencil,
-                        unsigned x, unsigned y, unsigned w, unsigned h,
-                        bool render_condition_enabled)
-{
-   struct swr_context *ctx = swr_context(pipe);
-   fprintf(stderr, "SWR swr_clear_depth_stencil!\n");
-
-   ctx->dirty |= SWR_NEW_FRAMEBUFFER | SWR_NEW_SCISSOR;
-}
-
-static void
-swr_clear_buffer(struct pipe_context *pipe,
-                 struct pipe_resource *res,
-                 unsigned offset, unsigned size,
-                 const void *data, int data_size)
-{
-   fprintf(stderr, "SWR swr_clear_buffer!\n");
-   struct swr_context *ctx = swr_context(pipe);
-   struct swr_resource *buf = swr_resource(res);
-   union pipe_color_union color;
-   enum pipe_format dst_fmt;
-   unsigned width, height, elements;
-
-   assert(res->target == PIPE_BUFFER);
-   assert(buf);
-   assert(size % data_size == 0);
-
-   SWR_SURFACE_STATE &swr_buffer = buf->swr;
-
-   ctx->dirty |= SWR_NEW_FRAMEBUFFER | SWR_NEW_SCISSOR;
-}
-#endif
-
-
 void
 swr_clear_init(struct pipe_context *pipe)
 {
    pipe->clear = swr_clear;
-#if 0 // XXX, these don't get called. how to get these called?  Do we need
-      // them?  Docs?
-   pipe->clear_render_target = swr_clear_render_target;
-   pipe->clear_depth_stencil = swr_clear_depth_stencil;
-   pipe->clear_buffer = swr_clear_buffer;
-#endif
 }