summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAnuj Phogat <anuj.phogat@gmail.com>2016-09-28 11:39:39 -0700
committerAnuj Phogat <anuj.phogat@gmail.com>2016-10-04 13:20:34 -0700
commit0a7691ee62b220a19f9665a18520e13a8e646717 (patch)
treec582e3c9c59cb9bd7ca1d5cb0dd896330e107e74 /src
parent2c7e1165faa30f0b859090900bcc422a33710f22 (diff)
downloadexternal_mesa3d-0a7691ee62b220a19f9665a18520e13a8e646717.zip
external_mesa3d-0a7691ee62b220a19f9665a18520e13a8e646717.tar.gz
external_mesa3d-0a7691ee62b220a19f9665a18520e13a8e646717.tar.bz2
mesa: Enable enums for OES_viewport_array
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com> Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/get.c6
-rw-r--r--src/mesa/main/get_hash_params.py8
2 files changed, 10 insertions, 4 deletions
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index e7ebc7f..64a4b0e 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -405,6 +405,12 @@ static const int extra_ARB_viewport_array_or_oes_geometry_shader[] = {
EXTRA_END
};
+static const int extra_ARB_viewport_array_or_oes_viewport_array[] = {
+ EXT(ARB_viewport_array),
+ EXT(OES_viewport_array),
+ EXTRA_END
+};
+
static const int extra_ARB_gpu_shader5_or_oes_geometry_shader[] = {
EXT(ARB_gpu_shader5),
EXTRA_EXT_ES_GS,
diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
index f65960a..7520a39 100644
--- a/src/mesa/main/get_hash_params.py
+++ b/src/mesa/main/get_hash_params.py
@@ -615,10 +615,10 @@ descriptor=[
[ "PRIMITIVE_BOUNDING_BOX_ARB", "CONTEXT_FLOAT8(PrimitiveBoundingBox), extra_OES_primitive_bounding_box" ],
# GL_ARB_viewport_array / GL_OES_viewport_array
- [ "MAX_VIEWPORTS", "CONTEXT_INT(Const.MaxViewports), extra_ARB_viewport_array" ],
- [ "VIEWPORT_SUBPIXEL_BITS", "CONTEXT_INT(Const.ViewportSubpixelBits), extra_ARB_viewport_array" ],
- [ "VIEWPORT_BOUNDS_RANGE", "CONTEXT_FLOAT2(Const.ViewportBounds), extra_ARB_viewport_array" ],
- [ "VIEWPORT_INDEX_PROVOKING_VERTEX", "CONTEXT_ENUM(Const.LayerAndVPIndexProvokingVertex), extra_ARB_viewport_array" ],
+ [ "MAX_VIEWPORTS", "CONTEXT_INT(Const.MaxViewports), extra_ARB_viewport_array_or_oes_viewport_array" ],
+ [ "VIEWPORT_SUBPIXEL_BITS", "CONTEXT_INT(Const.ViewportSubpixelBits), extra_ARB_viewport_array_or_oes_viewport_array" ],
+ [ "VIEWPORT_BOUNDS_RANGE", "CONTEXT_FLOAT2(Const.ViewportBounds), extra_ARB_viewport_array_or_oes_viewport_array" ],
+ [ "VIEWPORT_INDEX_PROVOKING_VERTEX", "CONTEXT_ENUM(Const.LayerAndVPIndexProvokingVertex), extra_ARB_viewport_array_or_oes_viewport_array" ],
]},
{ "apis": ["GL_CORE", "GLES32"], "params": [