Mesa (master): mesa/st: Update framebuffer state with no.of samples, layers

[Dave Airlie]

Module: Mesa
Branch: master
Commit: c6a514d7dfde51711399b1c3ffec7b7c7d1bad3b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c6a514d7dfde51711399b1c3ffec7b7c7d1bad3b

Author: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Date:   Sun Jan  3 21:08:33 2016 +1100

mesa/st: Update framebuffer state with no.of samples,layers

Handle the case of ARB_framebuffer_no_attachment.
Also, kill off a dead debug printf() call while we are here.

Signed-off-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/mesa/state_tracker/st_atom_framebuffer.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mesa/state_tracker/st_atom_framebuffer.c b/src/mesa/state_tracker/st_atom_framebuffer.c
index 5c23735..ade3d61 100644
--- 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 "main/framebuffer.h"
 
 
 /**
@@ -114,8 +115,6 @@ update_framebuffer_state( struct st_context *st )
    st_flush_bitmap_cache(st);
 
    st->state.fb_orientation = st_fb_orientation(fb);
-   framebuffer->width  = UINT_MAX;
-   framebuffer->height = UINT_MAX;
 
    /**
     * Quantize the derived default number of samples:
@@ -128,7 +127,10 @@ update_framebuffer_state( struct st_context *st )
    fb->DefaultGeometry._NumSamples =
       framebuffer_quantize_num_samples(st, fb->DefaultGeometry.NumSamples);
 
-   /*printf("------ fb size %d x %d\n", fb->Width, fb->Height);*/
+   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