Merge branch '7.8'

[mesa.git] / src / gallium / drivers / llvmpipe / lp_state_surface.c

diff --git a/src/gallium/drivers/llvmpipe/lp_state_surface.c b/src/gallium/drivers/llvmpipe/lp_state_surface.c
index 3eff40e3f19cf88cf1c7b78e73f3d08302a50e6e..048ac5b968b315e4d7692602b40beab37aa59150 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_state_surface.c
+++ b/src/gallium/drivers/llvmpipe/lp_state_surface.c
@@ -28,13 +28,17 @@
 /* Authors:  Keith Whitwell <keith@tungstengraphics.com>
  */
 
+#include "pipe/p_state.h"
+#include "util/u_inlines.h"
+#include "util/u_surface.h"
 #include "lp_context.h"
 #include "lp_state.h"
-#include "lp_surface.h"
 #include "lp_setup.h"
 
 #include "draw/draw_context.h"
 
+#include "util/u_format.h"
+
 
 /**
  * Set the framebuffer surface info: color buffers, zbuffer, stencil buffer.
@@ -44,34 +48,20 @@ llvmpipe_set_framebuffer_state(struct pipe_context *pipe,
                                const struct pipe_framebuffer_state *fb)
 {
    struct llvmpipe_context *lp = llvmpipe_context(pipe);
-   uint i;
-   boolean dirty = FALSE;
-
-   for (i = 0; i < PIPE_MAX_COLOR_BUFS; i++) {
-      if (lp->framebuffer.cbufs[i] != fb->cbufs[i]) {
-         pipe_surface_reference(&lp->framebuffer.cbufs[i], fb->cbufs[i]);
-         dirty = TRUE;
-      }
-   }
 
-   if (lp->framebuffer.nr_cbufs != fb->nr_cbufs) {
-      dirty = TRUE;
-      lp->framebuffer.nr_cbufs = fb->nr_cbufs;
-   }
+   boolean changed = !util_framebuffer_state_equal(&lp->framebuffer, fb);
 
-   /* zbuf changing? */
-   if (lp->framebuffer.zsbuf != fb->zsbuf) {
-      dirty = TRUE;
+   if (changed) {
 
-      /* assign new */
-      pipe_surface_reference(&lp->framebuffer.zsbuf, fb->zsbuf);
+      util_copy_framebuffer_state(&lp->framebuffer, fb);
 
       /* Tell draw module how deep the Z/depth buffer is */
       if (lp->framebuffer.zsbuf) {
          int depth_bits;
          double mrd;
-         depth_bits = pf_get_component_bits(lp->framebuffer.zsbuf->format,
-                                            PIPE_FORMAT_COMP_Z);
+         depth_bits = util_format_get_component_bits(lp->framebuffer.zsbuf->format,
+                                                     UTIL_FORMAT_COLORSPACE_ZS,
+                                                     0);
          if (depth_bits > 16) {
             mrd = 0.0000001;
          }
@@ -80,10 +70,8 @@ llvmpipe_set_framebuffer_state(struct pipe_context *pipe,
          }
          draw_set_mrd(lp->draw, mrd);
       }
-   }
 
-   if (dirty) {
-      lp_setup_bind_framebuffer( lp->setup, fb );
+      lp_setup_bind_framebuffer( lp->setup, &lp->framebuffer );
 
       lp->dirty |= LP_NEW_FRAMEBUFFER;
    }