X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fsvga%2Fsvga_pipe_misc.c;h=04707f61d2a6b39447b615f646455f5f36b98ef8;hb=5d8359ff4d8c379fdf1a78758f405bb4cdf69459;hp=af9356d7c755744bef816037d0631ab7389f25a2;hpb=32a6e081c3c301d0d02cb0f3e4f848a143bfa220;p=mesa.git

diff --git a/src/gallium/drivers/svga/svga_pipe_misc.c b/src/gallium/drivers/svga/svga_pipe_misc.c
index af9356d7c75..04707f61d2a 100644
--- a/src/gallium/drivers/svga/svga_pipe_misc.c
+++ b/src/gallium/drivers/svga/svga_pipe_misc.c
@@ -23,26 +23,26 @@
  *
  **********************************************************/
 
-#include "svga_cmd.h"
-
 #include "util/u_framebuffer.h"
 #include "util/u_inlines.h"
 #include "util/u_pstipple.h"
 
+#include "svga_cmd.h"
 #include "svga_context.h"
 #include "svga_screen.h"
 #include "svga_surface.h"
 #include "svga_resource_texture.h"
 
 
-static void svga_set_scissor_states( struct pipe_context *pipe,
-                                     unsigned start_slot,
-                                     unsigned num_scissors,
-                                     const struct pipe_scissor_state *scissors )
+static void
+svga_set_scissor_states(struct pipe_context *pipe,
+                        unsigned start_slot,
+                        unsigned num_scissors,
+                        const struct pipe_scissor_state *scissors)
 {
    struct svga_context *svga = svga_context(pipe);
 
-   memcpy( &svga->curr.scissor, scissors, sizeof(*scissors) );
+   memcpy(&svga->curr.scissor, scissors, sizeof(*scissors));
    svga->dirty |= SVGA_NEW_SCISSOR;
 }
 
@@ -81,7 +81,8 @@ svga_set_polygon_stipple(struct pipe_context *pipe,
 }
 
 
-void svga_cleanup_framebuffer(struct svga_context *svga)
+void
+svga_cleanup_framebuffer(struct svga_context *svga)
 {
    struct svga_screen *svgascreen = svga_screen(svga->pipe.screen);
    struct pipe_framebuffer_state *curr = &svga->curr.framebuffer;
@@ -103,12 +104,12 @@ void svga_cleanup_framebuffer(struct svga_context *svga)
 #define DEPTH_BIAS_SCALE_FACTOR_D32    ((float)(1<<31))
 
 
-static void svga_set_framebuffer_state(struct pipe_context *pipe,
-				       const struct pipe_framebuffer_state *fb)
+static void
+svga_set_framebuffer_state(struct pipe_context *pipe,
+                           const struct pipe_framebuffer_state *fb)
 {
    struct svga_context *svga = svga_context(pipe);
    struct pipe_framebuffer_state *dst = &svga->curr.framebuffer;
-   boolean propagate = FALSE;
    unsigned i;
 
    /* make sure any pending drawing calls are flushed before changing
@@ -120,25 +121,6 @@ static void svga_set_framebuffer_state(struct pipe_context *pipe,
    dst->height = fb->height;
    dst->nr_cbufs = fb->nr_cbufs;
 
-   /* check if we need to propagate any of the target surfaces */
-   for (i = 0; i < dst->nr_cbufs; i++) {
-      struct pipe_surface *s = i < fb->nr_cbufs ? fb->cbufs[i] : NULL;
-      if (dst->cbufs[i] && dst->cbufs[i] != s) {
-         if (svga_surface_needs_propagation(dst->cbufs[i])) {
-            propagate = TRUE;
-            break;
-         }
-      }
-   }
-
-   if (propagate) {
-      for (i = 0; i < dst->nr_cbufs; i++) {
-         struct pipe_surface *s = i < fb->nr_cbufs ? fb->cbufs[i] : NULL;
-         if (dst->cbufs[i] && dst->cbufs[i] != s)
-            svga_propagate_surface(svga, dst->cbufs[i]);
-      }
-   }
-
    /* Check that all surfaces are the same size.
     * Actually, the virtual hardware may support rendertargets with
     * different size, depending on the host API and driver,
@@ -168,17 +150,7 @@ static void svga_set_framebuffer_state(struct pipe_context *pipe,
 
    util_copy_framebuffer_state(dst, fb);
 
-   /* Set the rendered-to flags */
-   for (i = 0; i < dst->nr_cbufs; i++) {
-      struct pipe_surface *s = dst->cbufs[i];
-      if (s) {
-         struct svga_texture *t = svga_texture(s->texture);
-         svga_set_texture_rendered_to(t, s->u.tex.first_layer, s->u.tex.level);
-      }
-   }
-
-   if (svga->curr.framebuffer.zsbuf)
-   {
+   if (svga->curr.framebuffer.zsbuf) {
       switch (svga->curr.framebuffer.zsbuf->format) {
       case PIPE_FORMAT_Z16_UNORM:
          svga->curr.depthscale = 1.0f / DEPTH_BIAS_SCALE_FACTOR_D16;
@@ -199,13 +171,6 @@ static void svga_set_framebuffer_state(struct pipe_context *pipe,
          svga->curr.depthscale = 0.0f;
          break;
       }
-
-      /* Set rendered-to flag */
-      {
-         struct pipe_surface *s = dst->zsbuf;
-         struct svga_texture *t = svga_texture(s->texture);
-         svga_set_texture_rendered_to(t, s->u.tex.first_layer, s->u.tex.level);
-      }
    }
    else {
       svga->curr.depthscale = 0.0f;
@@ -215,9 +180,9 @@ static void svga_set_framebuffer_state(struct pipe_context *pipe,
 }
 
 
-
-static void svga_set_clip_state( struct pipe_context *pipe,
-                                 const struct pipe_clip_state *clip )
+static void
+svga_set_clip_state(struct pipe_context *pipe,
+                    const struct pipe_clip_state *clip)
 {
    struct svga_context *svga = svga_context(pipe);
 
@@ -227,14 +192,11 @@ static void svga_set_clip_state( struct pipe_context *pipe,
 }
 
 
-
-/* Called when driver state tracker notices changes to the viewport
- * matrix:
- */
-static void svga_set_viewport_states( struct pipe_context *pipe,
-                                      unsigned start_slot,
-                                      unsigned num_viewports,
-                                      const struct pipe_viewport_state *viewports )
+static void
+svga_set_viewport_states(struct pipe_context *pipe,
+                         unsigned start_slot,
+                         unsigned num_viewports,
+                         const struct pipe_viewport_state *viewports)
 {
    struct svga_context *svga = svga_context(pipe);
 
@@ -254,14 +216,18 @@ svga_set_debug_callback(struct pipe_context *pipe,
 {
    struct svga_context *svga = svga_context(pipe);
 
-   if (cb)
+   if (cb) {
       svga->debug.callback = *cb;
-   else
+      svga->swc->debug_callback = &svga->debug.callback;
+   } else {
       memset(&svga->debug.callback, 0, sizeof(svga->debug.callback));
+      svga->swc->debug_callback = NULL;
+   }
 }
 
 
-void svga_init_misc_functions( struct svga_context *svga )
+void
+svga_init_misc_functions(struct svga_context *svga)
 {
    svga->pipe.set_scissor_states = svga_set_scissor_states;
    svga->pipe.set_polygon_stipple = svga_set_polygon_stipple;
@@ -270,5 +236,3 @@ void svga_init_misc_functions( struct svga_context *svga )
    svga->pipe.set_viewport_states = svga_set_viewport_states;
    svga->pipe.set_debug_callback = svga_set_debug_callback;
 }
-
-