On 05/14/2014 11:39 PM, Jordan Justen wrote: > mt->format is of type mesa_format, and therefore can't be > used with _mesa_base_fbo_format which requires a GLenum input. > > On gen8, this fixes various piglit fbo-depthstencil tests with > samples > 1. > > Signed-off-by: Jordan Justen <jordan.l.jus...@intel.com> > Cc: Topi Pohjolainen <topi.pohjolai...@intel.com> > Cc: Kenneth Graunke <kenn...@whitecape.org> > --- > This was tested on Ken's broadwell branch, which includes > Topi's recent gen8 stencil series, but the patch is based > on the current master tree. > > src/mesa/drivers/dri/i965/brw_meta_updownsample.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/src/mesa/drivers/dri/i965/brw_meta_updownsample.c > b/src/mesa/drivers/dri/i965/brw_meta_updownsample.c > index de25bf4..a35b7e1 100644 > --- a/src/mesa/drivers/dri/i965/brw_meta_updownsample.c > +++ b/src/mesa/drivers/dri/i965/brw_meta_updownsample.c > @@ -27,6 +27,7 @@ > > #include "main/blit.h" > #include "main/buffers.h" > +#include "main/enums.h" > #include "main/fbobject.h" > > #include "drivers/common/meta.h" > @@ -62,7 +63,7 @@ brw_get_rb_for_first_slice(struct brw_context *brw, struct > intel_mipmap_tree *mt > irb = intel_renderbuffer(rb); > > rb->Format = mt->format; > - rb->_BaseFormat = _mesa_base_fbo_format(ctx, mt->format); > + rb->_BaseFormat = _mesa_get_format_base_format(mt->format); > > rb->NumSamples = mt->num_samples; > rb->Width = mt->logical_width0; >
Man, I wish we had type safety. Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
signature.asc
Description: OpenPGP digital signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev