From: Mark Janes <mark.a.janes@intel.com>
Date: Tue, 13 Feb 2018 06:15:47 +0000 (-0800)
Subject: Partially revert "mesa: use GLenum16 in a few more places"
X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=d9de7aaca3857122046389d1f86acd249c6a5972

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
---

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 */