From d9de7aaca3857122046389d1f86acd249c6a5972 Mon Sep 17 00:00:00 2001 From: Mark Janes Date: Mon, 12 Feb 2018 22:15:47 -0800 Subject: [PATCH] Partially revert "mesa: use GLenum16 in a few more places" This reverts part of commit ca721b3d894a49d7342f5aa053ed132017e9352a. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105067 --- src/mesa/main/mtypes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index a589bd4bb29..7da3240da78 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -1068,7 +1068,7 @@ struct gl_texture_object GLbyte _MaxLevel; /**< actual max mipmap level (q in the spec) */ GLfloat _MaxLambda; /**< = _MaxLevel - BaseLevel (q - p in spec) */ GLint CropRect[4]; /**< GL_OES_draw_texture */ - GLenum16 Swizzle[4]; /**< GL_EXT_texture_swizzle */ + GLenum Swizzle[4]; /**< GL_EXT_texture_swizzle */ GLushort _Swizzle; /**< same as Swizzle, but SWIZZLE_* format */ GLbyte ImmutableLevels; /**< ES 3.0 / ARB_texture_view */ GLboolean GenerateMipmap; /**< GL_SGIS_generate_mipmap */ -- 2.30.2