Browse Source

Updates for robust buffer access in ES 3.2.

pull/231/head
Vladimír Vondruš 9 years ago
parent
commit
49fd379da5
  1. 4
      src/Magnum/Context.cpp
  2. 12
      src/Magnum/Context.h

4
src/Magnum/Context.cpp

@ -881,7 +881,7 @@ Debug& operator<<(Debug& debug, const Context::Flag value) {
#define _c(value) case Context::Flag::value: return debug << "Context::Flag::" #value; #define _c(value) case Context::Flag::value: return debug << "Context::Flag::" #value;
_c(Debug) _c(Debug)
_c(NoError) _c(NoError)
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES2
_c(RobustAccess) _c(RobustAccess)
#endif #endif
#undef _c #undef _c
@ -895,7 +895,7 @@ Debug& operator<<(Debug& debug, const Context::Flags value) {
return Containers::enumSetDebugOutput(debug, value, "Context::Flags{}", { return Containers::enumSetDebugOutput(debug, value, "Context::Flags{}", {
Context::Flag::Debug, Context::Flag::Debug,
Context::Flag::NoError, Context::Flag::NoError,
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES2
Context::Flag::RobustAccess Context::Flag::RobustAccess
#endif #endif
}); });

12
src/Magnum/Context.h

@ -154,15 +154,17 @@ class MAGNUM_EXPORT Context {
*/ */
NoError = GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR, NoError = GL_CONTEXT_FLAG_NO_ERROR_BIT_KHR,
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES2
/** /**
* Context with robust access * Context with robust access
* @requires_extension Extension @extension{ARB,robustness} * @requires_gl45 Extension @extension{KHR,robustness} or
* @requires_es_extension Extension @extension{EXT,robustness} * @extension{ARB,robustness}
* @todo In ES available under glGetIntegerv(CONTEXT_ROBUST_ACCESS_EXT), * @requires_gles32 Extension @extension{KHR,robustness} or
* @extension{EXT,robustness}
* @todo In ES2 available under glGetIntegerv(CONTEXT_ROBUST_ACCESS_EXT),
* how to make it compatible? * how to make it compatible?
*/ */
RobustAccess = GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT_ARB RobustAccess = GL_CONTEXT_FLAG_ROBUST_ACCESS_BIT
#endif #endif
}; };

Loading…
Cancel
Save