From ef1600332009f0f526dc04b5d9dd6d430661e4f2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tapani=20P=C3=A4lli?= Date: Tue, 25 Oct 2016 13:31:58 +0300 Subject: [PATCH] mesa: add missing CONTEXT_ROBUST_ACCESS enum MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit commit 85008db1d51f923113832394d7f8d6b1868be882 missed this enum for GL_KHR_robustness implementation Signed-off-by: Tapani Pälli Reviewed-by: Eric Engestrom --- src/mapi/glapi/gen/KHR_robustness.xml | 3 +++ src/mesa/main/context.c | 3 +++ src/mesa/main/get.c | 1 + src/mesa/main/get_hash_params.py | 1 + src/mesa/main/mtypes.h | 3 +++ 5 files changed, 11 insertions(+) diff --git a/src/mapi/glapi/gen/KHR_robustness.xml b/src/mapi/glapi/gen/KHR_robustness.xml index e773501daa8..21425938a66 100644 --- a/src/mapi/glapi/gen/KHR_robustness.xml +++ b/src/mapi/glapi/gen/KHR_robustness.xml @@ -12,6 +12,9 @@ + + + diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 5aaf150e019..c62575c08ab 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -678,6 +678,9 @@ _mesa_init_constants(struct gl_constants *consts, gl_api api) /* GL_ARB_robustness */ consts->ResetStrategy = GL_NO_RESET_NOTIFICATION_ARB; + /* GL_KHR_robustness */ + consts->RobustAccess = GL_FALSE; + /* ES 3.0 or ARB_ES3_compatibility */ consts->MaxElementIndex = 0xffffffffu; diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 6234f6ed6b7..ad692c6c2cf 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -491,6 +491,7 @@ EXTRA_EXT(EXT_window_rectangles); EXTRA_EXT(KHR_blend_equation_advanced_coherent); EXTRA_EXT(OES_primitive_bounding_box); EXTRA_EXT(ARB_compute_variable_group_size); +EXTRA_EXT(KHR_robustness); static const int extra_ARB_color_buffer_float_or_glcore[] = { diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py index 52371805941..90fae8754ab 100644 --- a/src/mesa/main/get_hash_params.py +++ b/src/mesa/main/get_hash_params.py @@ -343,6 +343,7 @@ descriptor=[ [ "BLEND_ADVANCED_COHERENT_KHR", "CONTEXT_BOOL(Color.BlendCoherent), extra_KHR_blend_equation_advanced_coherent" ], # GL_ARB_robustness / GL_KHR_robustness + [ "CONTEXT_ROBUST_ACCESS", "CONTEXT_ENUM(Const.RobustAccess), extra_KHR_robustness" ], [ "RESET_NOTIFICATION_STRATEGY_ARB", "CONTEXT_ENUM(Const.ResetStrategy), extra_KHR_robustness_or_GL" ], ]}, diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 79cf9878dbd..3f3c41bad6f 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -3548,6 +3548,9 @@ struct gl_constants /* GL_ARB_robustness */ GLenum ResetStrategy; + /* GL_KHR_robustness */ + GLboolean RobustAccess; + /* GL_ARB_blend_func_extended */ GLuint MaxDualSourceDrawBuffers; -- 2.30.2