On Sun, Jan 31, 2016 at 1:25 AM, Edward O'Callaghan <eocallag...@alterapraxis.com> wrote: > Handle the case of ARB_framebuffer_no_attachment. > Also, kill off a dead debug printf() call while we are here. > --- > 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 ae883a2..671ef07 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" > > > /** > @@ -79,10 +80,11 @@ 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; > > - /*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);
Please make sure to run all of piglit for this change. The width/height-determining logic is more complex than it appears to need to be, so I wonder if it's not papering over something subtle. (Which you are effectively un-papering-over.) Also, the subject prefix here should be st/mesa or mesa/st, not mesa_st. (This goes for your other patches too.) Assuming the piglit run doesn't show any regressions, this is Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu> > > /* Examine Mesa's ctx->DrawBuffer->_ColorDrawBuffers state > * to determine which surfaces to draw to > -- > 2.5.0 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev