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 f59179f07116f12537c11e7d4968c3dc73db41c7..4473f76a0a29af6274bb5a663bcc40c895c7674a 100644 (file)
--- a/src/gallium/drivers/swr/swr_clear.cpp
+++ b/src/gallium/drivers/swr/swr_clear.cpp
@@ -35,7 +35,7 @@ swr_clear(struct pipe_context *pipe,
    struct pipe_framebuffer_state *fb = &ctx->framebuffer;
 
    UINT clearMask = 0;
-   int layers = 0;
+   unsigned layers = 0;
 
    if (!swr_check_render_cond(pipe))
       return;
@@ -47,20 +47,20 @@ swr_clear(struct pipe_context *pipe,
          if (fb->cbufs[i] && (buffers & (PIPE_CLEAR_COLOR0 << i))) {
             clearMask |= (SWR_ATTACHMENT_COLOR0_BIT << i);
             layers = std::max(layers, fb->cbufs[i]->u.tex.last_layer -
-                                      fb->cbufs[i]->u.tex.first_layer + 1);
+                                      fb->cbufs[i]->u.tex.first_layer + 1u);
          }
    }
 
    if (buffers & PIPE_CLEAR_DEPTH && fb->zsbuf) {
       clearMask |= SWR_ATTACHMENT_DEPTH_BIT;
       layers = std::max(layers, fb->zsbuf->u.tex.last_layer -
-                                fb->zsbuf->u.tex.first_layer + 1);
+                                fb->zsbuf->u.tex.first_layer + 1u);
    }
 
    if (buffers & PIPE_CLEAR_STENCIL && fb->zsbuf) {
       clearMask |= SWR_ATTACHMENT_STENCIL_BIT;
       layers = std::max(layers, fb->zsbuf->u.tex.last_layer -
-                                fb->zsbuf->u.tex.first_layer + 1);
+                                fb->zsbuf->u.tex.first_layer + 1u);
    }
 
 #if 0 // XXX HACK, override clear color alpha. On ubuntu, clears are
@@ -68,83 +68,32 @@ swr_clear(struct pipe_context *pipe,
    ((union pipe_color_union *)color)->f[3] = 1.0; /* cast off your const'd-ness */
 #endif
 
-   for (int i = 0; i < layers; ++i) {
+   /* 
+    * 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,
-                           ctx->swr_scissor);
+      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 &&
-          fb->zsbuf->u.tex.last_layer - fb->zsbuf->u.tex.first_layer <= i)
+          (fb->zsbuf->u.tex.last_layer <= fb->zsbuf->u.tex.first_layer + i))
          clearMask &= ~(SWR_ATTACHMENT_DEPTH_BIT | SWR_ATTACHMENT_STENCIL_BIT);
       for (unsigned c = 0; c < fb->nr_cbufs; ++c) {
          const struct pipe_surface *sf = fb->cbufs[c];
-         if (sf && sf->u.tex.last_layer - sf->u.tex.first_layer <= i)
+         if (sf && (sf->u.tex.last_layer <= sf->u.tex.first_layer + i))
             clearMask &= ~(SWR_ATTACHMENT_COLOR0_BIT << c);
       }
    }
 }
 
-
-#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
 }