diff options
| author | Edward O'Callaghan <[email protected]> | 2016-01-03 21:08:33 +1100 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2016-04-07 12:03:58 +1000 |
| commit | c6a514d7dfde51711399b1c3ffec7b7c7d1bad3b (patch) | |
| tree | 136cb3375d32f27cbfcf9c2d579a57876e4a6bae | |
| parent | 7ff28d2af0e6099cecb2c6456765e189785a027c (diff) | |
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 <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
| -rw-r--r-- | src/mesa/state_tracker/st_atom_framebuffer.c | 8 |
1 files 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 5c23735f9ac..ade3d61dc70 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 |