[Mesa-dev] [PATCH 2/5] mesa: add missing CONTEXT_ROBUST_ACCESS enum
Tapani Pälli
tapani.palli at intel.com
Tue Oct 25 11:49:08 UTC 2016
commit 85008db1d51f923113832394d7f8d6b1868be882 missed this enum
for GL_KHR_robustness implementation
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
---
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 e773501..2142593 100644
--- a/src/mapi/glapi/gen/KHR_robustness.xml
+++ b/src/mapi/glapi/gen/KHR_robustness.xml
@@ -12,6 +12,9 @@
<enum name="INNOCENT_CONTEXT_RESET" value="0x8254"/>
<enum name="UNKNOWN_CONTEXT_RESET" value="0x8255"/>
+ <enum name="CONTEXT_ROBUST_ACCESS" count="1" value="0x90F3">
+ <size name="Get" mode="get"/>
+ </enum>
<enum name="RESET_NOTIFICATION_STRATEGY" count="1" value="0x8256">
<size name="Get" mode="get"/>
</enum>
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 47fd4a0..88c6899 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 6234f6e..ad692c6 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 5237180..90fae87 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 79dd1c5..9b2dff7 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -3643,6 +3643,9 @@ struct gl_constants
/* GL_ARB_robustness */
GLenum ResetStrategy;
+ /* GL_KHR_robustness */
+ GLboolean RobustAccess;
+
/* GL_ARB_blend_func_extended */
GLuint MaxDualSourceDrawBuffers;
--
2.7.4
More information about the mesa-dev
mailing list