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 4b02dd1fb12bf02aef5315b393b8368c446cc008..4473f76a0a29af6274bb5a663bcc40c895c7674a 100644 (file)
--- a/src/gallium/drivers/swr/swr_clear.cpp
+++ b/src/gallium/drivers/swr/swr_clear.cpp
@@ -35,110 +35,65 @@ swr_clear(struct pipe_context *pipe,
    struct pipe_framebuffer_state *fb = &ctx->framebuffer;
 
    UINT clearMask = 0;
+   unsigned layers = 0;
 
    if (!swr_check_render_cond(pipe))
       return;
 
-   if (ctx->dirty)
-      swr_update_derived(pipe);
+   swr_update_derived(pipe);
 
-/* Update clearMask/targetMask */
-#if 0 /* XXX SWR currently only clears SWR_ATTACHMENT_COLOR0, don't bother   \
-         checking others yet. */
    if (buffers & PIPE_CLEAR_COLOR && fb->nr_cbufs) {
-      UINT i;
-      for (i = 0; i < fb->nr_cbufs; ++i)
-         if (fb->cbufs[i])
-            clearMask |= (SWR_CLEAR_COLOR0 << i);
+      for (unsigned i = 0; i < fb->nr_cbufs; ++i)
+         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 + 1u);
+         }
    }
-#else
-   if (buffers & PIPE_CLEAR_COLOR && fb->cbufs[0])
-      clearMask |= SWR_CLEAR_COLOR;
-#endif
 
-   if (buffers & PIPE_CLEAR_DEPTH && fb->zsbuf)
-      clearMask |= SWR_CLEAR_DEPTH;
+   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 + 1u);
+   }
 
-   if (buffers & PIPE_CLEAR_STENCIL && fb->zsbuf)
-      clearMask |= SWR_CLEAR_STENCIL;
+   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 + 1u);
+   }
 
 #if 0 // XXX HACK, override clear color alpha. On ubuntu, clears are
       // transparent.
    ((union pipe_color_union *)color)->f[3] = 1.0; /* cast off your const'd-ness */
 #endif
 
-   /* Reset viewport to full framebuffer width/height before clear, then
-    * restore it  */
-   /* Scissor affects clear, viewport should not */
-   ctx->dirty |= SWR_NEW_VIEWPORT;
-   SWR_VIEWPORT vp = {0};
-   vp.width = ctx->framebuffer.width;
-   vp.height = ctx->framebuffer.height;
-   SwrSetViewports(ctx->swrContext, 1, &vp, NULL);
-
-   swr_update_draw_context(ctx);
-   SwrClearRenderTarget(ctx->swrContext, clearMask, color->f, depth, stencil);
-}
-
-
-#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;
+   /* 
+    * 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);
+      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))
+         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))
+            clearMask &= ~(SWR_ATTACHMENT_COLOR0_BIT << c);
+      }
+   }
 }
-#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
 }