mesa: fix broken glGet*(GL_POLYGON_MODE) query

This reverts part of the patch which introduced the GLenum16 change.
Fixes a conform regression found by Roland.

Fixes: f96a69f916aed405 ("mesa: replace GLenum with GLenum16 in
common structures (v4)")
Reviewed-by: Roland Scheidegger <sroland@vmware.com>

diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
index 55d29e9a9a64112dd5399f33046f4f3013beee1f..e10282a156513478e2f9f239d848c0d7a0662763 100644 (file)
--- a/src/mesa/main/get_hash_params.py
+++ b/src/mesa/main/get_hash_params.py
@@ -743,7 +743,7 @@ descriptor=[
   [ "PIXEL_MAP_R_TO_R_SIZE", "CONTEXT_INT(PixelMaps.RtoR.Size), NO_EXTRA" ],
   [ "PIXEL_MAP_S_TO_S_SIZE", "CONTEXT_INT(PixelMaps.StoS.Size), NO_EXTRA" ],
   [ "POINT_SIZE_GRANULARITY", "CONTEXT_FLOAT(Const.PointSizeGranularity), NO_EXTRA" ],
-  [ "POLYGON_MODE", "CONTEXT_ENUM16(Polygon.FrontMode), NO_EXTRA" ],
+  [ "POLYGON_MODE", "CONTEXT_ENUM2(Polygon.FrontMode), NO_EXTRA" ],
   [ "POLYGON_OFFSET_BIAS_EXT", "CONTEXT_FLOAT(Polygon.OffsetUnits), NO_EXTRA" ],
   [ "POLYGON_OFFSET_POINT", "CONTEXT_BOOL(Polygon.OffsetPoint), NO_EXTRA" ],
   [ "POLYGON_OFFSET_LINE", "CONTEXT_BOOL(Polygon.OffsetLine), NO_EXTRA" ],

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 35fafa519e0235f76162311a43e16a44597953c1..f6fa6f45618f08e8144b372b6aecc768f90fa43d 100644 (file)
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -843,8 +843,8 @@ struct gl_point_attrib
 struct gl_polygon_attrib
 {
    GLenum16 FrontFace;         /**< Either GL_CW or GL_CCW */
-   GLenum16 FrontMode;         /**< Either GL_POINT, GL_LINE or GL_FILL */
-   GLenum16 BackMode;          /**< Either GL_POINT, GL_LINE or GL_FILL */
+   GLenum FrontMode;           /**< Either GL_POINT, GL_LINE or GL_FILL */
+   GLenum BackMode;            /**< Either GL_POINT, GL_LINE or GL_FILL */
    GLboolean CullFlag;         /**< Culling on/off flag */
    GLboolean SmoothFlag;       /**< True if GL_POLYGON_SMOOTH is enabled */
    GLboolean StippleFlag;      /**< True if GL_POLYGON_STIPPLE is enabled */