mesa: Assert base format before truncating to unsigned short
CID: 1433709 Fixes: ca721b3d8: mesa: use GLenum16 in a few more places Reviewed-by: Marek Olšák <marek.olsak@amd.com> Reviewed-by: Brian Paul <brianp@vmware.com> Signed-off-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
This commit is contained in:
parent
26f48fe010
commit
98d3874754
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue