From 0a7691ee62b220a19f9665a18520e13a8e646717 Mon Sep 17 00:00:00 2001 From: Anuj Phogat Date: Wed, 28 Sep 2016 11:39:39 -0700 Subject: [PATCH] mesa: Enable enums for OES_viewport_array Signed-off-by: Anuj Phogat Reviewed-by: Ilia Mirkin --- src/mesa/main/get.c | 6 ++++++ src/mesa/main/get_hash_params.py | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index e7ebc7f6193..64a4b0e6ccf 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 f65960a5d75..7520a39b09a 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": [ -- 2.30.2