Reviewed-by: Marek Olšák <marek.ol...@amd.com> Marek
On Fri, Apr 6, 2018 at 10:26 AM, Topi Pohjolainen < topi.pohjolai...@gmail.com> wrote: > CID: 1433709 > Fixes: ca721b3d8: mesa: use GLenum16 in a few more places > CC: Marek Olšák <marek.ol...@amd.com> > CC: Brian Paul <bri...@vmware.com> > > Signed-off-by: Topi Pohjolainen <topi.pohjolai...@intel.com> > --- > src/mesa/main/teximage.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c > index 8f53510..f560512 100644 > --- a/src/mesa/main/teximage.c > +++ b/src/mesa/main/teximage.c > @@ -845,6 +845,7 @@ _mesa_init_teximage_fields_ms(struct gl_context *ctx, > mesa_format format, > GLuint numSamples, GLboolean fixedSampleLocations) > { > + const GLint base_format =_mesa_base_tex_format(ctx, internalFormat); > GLenum target; > assert(img); > assert(width >= 0); > @@ -852,8 +853,8 @@ _mesa_init_teximage_fields_ms(struct gl_context *ctx, > assert(depth >= 0); > > target = img->TexObject->Target; > - img->_BaseFormat = _mesa_base_tex_format( ctx, internalFormat ); > - assert(img->_BaseFormat != -1); > + assert(base_format != -1); > + img->_BaseFormat = (GLenum16)base_format; > img->InternalFormat = internalFormat; > img->Border = border; > img->Width = width; > -- > 2.7.4 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev >
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev