st/mesa: increase size of glsl_base_type bitfields

[mesa.git] / src / mesa / state_tracker / st_atom_framebuffer.c

diff --git a/src/mesa/state_tracker/st_atom_framebuffer.c b/src/mesa/state_tracker/st_atom_framebuffer.c
index 7435c00a4fa903cc15b6aac91d30f861e4792bff..acbe98090347aac60d92e0246b3f6f7c56eeaf81 100644 (file)
--- a/src/mesa/state_tracker/st_atom_framebuffer.c
+++ b/src/mesa/state_tracker/st_atom_framebuffer.c
@@ -43,6 +43,7 @@
 #include "util/u_math.h"
 #include "util/u_inlines.h"
 #include "util/u_format.h"
+#include "util/u_framebuffer.h"
 #include "main/framebuffer.h"
 
 
@@ -104,10 +105,10 @@ framebuffer_quantize_num_samples(struct st_context *st, unsigned num_samples)
 /**
  * Update framebuffer state (color, depth, stencil, etc. buffers)
  */
-static void
-update_framebuffer_state( struct st_context *st )
+void
+st_update_framebuffer_state( struct st_context *st )
 {
-   struct pipe_framebuffer_state *framebuffer = &st->state.framebuffer;
+   struct pipe_framebuffer_state framebuffer;
    struct gl_framebuffer *fb = st->ctx->DrawBuffer;
    struct st_renderbuffer *strb;
    GLuint i;
@@ -128,19 +129,18 @@ update_framebuffer_state( struct st_context *st )
    fb->DefaultGeometry._NumSamples =
       framebuffer_quantize_num_samples(st, fb->DefaultGeometry.NumSamples);
 
-   framebuffer->width  = _mesa_geometric_width(fb);
-   framebuffer->height = _mesa_geometric_height(fb);
-   framebuffer->samples = _mesa_geometric_samples(fb);
-   framebuffer->layers = _mesa_geometric_layers(fb);
+   framebuffer.width  = _mesa_geometric_width(fb);
+   framebuffer.height = _mesa_geometric_height(fb);
+   framebuffer.samples = _mesa_geometric_samples(fb);
+   framebuffer.layers = _mesa_geometric_layers(fb);
 
    /* Examine Mesa's ctx->DrawBuffer->_ColorDrawBuffers state
     * to determine which surfaces to draw to
     */
-   framebuffer->nr_cbufs = fb->_NumColorDrawBuffers;
+   framebuffer.nr_cbufs = fb->_NumColorDrawBuffers;
 
    for (i = 0; i < fb->_NumColorDrawBuffers; i++) {
-      pipe_surface_reference(&framebuffer->cbufs[i], NULL);
-
+      framebuffer.cbufs[i] = NULL;
       strb = st_renderbuffer(fb->_ColorDrawBuffers[i]);
 
       if (strb) {
@@ -151,21 +151,21 @@ update_framebuffer_state( struct st_context *st )
          }
 
          if (strb->surface) {
-            pipe_surface_reference(&framebuffer->cbufs[i], strb->surface);
-            update_framebuffer_size(framebuffer, strb->surface);
+            framebuffer.cbufs[i] = strb->surface;
+            update_framebuffer_size(&framebuffer, strb->surface);
          }
          strb->defined = GL_TRUE; /* we'll be drawing something */
       }
    }
 
-   for (i = framebuffer->nr_cbufs; i < PIPE_MAX_COLOR_BUFS; i++) {
-      pipe_surface_reference(&framebuffer->cbufs[i], NULL);
+   for (i = framebuffer.nr_cbufs; i < PIPE_MAX_COLOR_BUFS; i++) {
+      framebuffer.cbufs[i] = NULL;
    }
 
    /* Remove trailing GL_NONE draw buffers. */
-   while (framebuffer->nr_cbufs &&
-          !framebuffer->cbufs[framebuffer->nr_cbufs-1]) {
-      framebuffer->nr_cbufs--;
+   while (framebuffer.nr_cbufs &&
+          !framebuffer.cbufs[framebuffer.nr_cbufs-1]) {
+      framebuffer.nr_cbufs--;
    }
 
    /*
@@ -177,8 +177,8 @@ update_framebuffer_state( struct st_context *st )
          /* rendering to a GL texture, may have to update surface */
          st_update_renderbuffer_surface(st, strb);
       }
-      pipe_surface_reference(&framebuffer->zsbuf, strb->surface);
-      update_framebuffer_size(framebuffer, strb->surface);
+      framebuffer.zsbuf = strb->surface;
+      update_framebuffer_size(&framebuffer, strb->surface);
    }
    else {
       strb = st_renderbuffer(fb->Attachment[BUFFER_STENCIL].Renderbuffer);
@@ -187,34 +187,33 @@ update_framebuffer_state( struct st_context *st )
             /* rendering to a GL texture, may have to update surface */
             st_update_renderbuffer_surface(st, strb);
          }
-         pipe_surface_reference(&framebuffer->zsbuf, strb->surface);
-         update_framebuffer_size(framebuffer, strb->surface);
+         framebuffer.zsbuf = strb->surface;
+         update_framebuffer_size(&framebuffer, strb->surface);
       }
       else
-         pipe_surface_reference(&framebuffer->zsbuf, NULL);
+         framebuffer.zsbuf = NULL;
    }
 
 #ifdef DEBUG
    /* Make sure the resource binding flags were set properly */
-   for (i = 0; i < framebuffer->nr_cbufs; i++) {
-      assert(!framebuffer->cbufs[i] ||
-             framebuffer->cbufs[i]->texture->bind & PIPE_BIND_RENDER_TARGET);
+   for (i = 0; i < framebuffer.nr_cbufs; i++) {
+      assert(!framebuffer.cbufs[i] ||
+             framebuffer.cbufs[i]->texture->bind & PIPE_BIND_RENDER_TARGET);
    }
-   if (framebuffer->zsbuf) {
-      assert(framebuffer->zsbuf->texture->bind & PIPE_BIND_DEPTH_STENCIL);
+   if (framebuffer.zsbuf) {
+      assert(framebuffer.zsbuf->texture->bind & PIPE_BIND_DEPTH_STENCIL);
    }
 #endif
 
-   if (framebuffer->width == USHRT_MAX)
-      framebuffer->width = 0;
-   if (framebuffer->height == USHRT_MAX)
-      framebuffer->height = 0;
-
-   cso_set_framebuffer(st->cso_context, framebuffer);
-}
-
+   if (framebuffer.width == USHRT_MAX)
+      framebuffer.width = 0;
+   if (framebuffer.height == USHRT_MAX)
+      framebuffer.height = 0;
 
-const struct st_tracked_state st_update_framebuffer = {
-   update_framebuffer_state                            /* update */
-};
+   cso_set_framebuffer(st->cso_context, &framebuffer);
 
+   st->state.fb_width = framebuffer.width;
+   st->state.fb_height = framebuffer.height;
+   st->state.fb_num_samples = util_framebuffer_get_num_samples(&framebuffer);
+   st->state.fb_num_layers = util_framebuffer_get_num_layers(&framebuffer);
+}