diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/doc/jogl/spec-overview.html | 3 | ||||
| -rw-r--r-- | make/stub_includes/opengl/GL/glxext.h | 7 | ||||
| -rw-r--r-- | make/stub_includes/opengl/GL/wglext.h | 7 |
3 files changed, 12 insertions, 5 deletions
diff --git a/make/doc/jogl/spec-overview.html b/make/doc/jogl/spec-overview.html index f2c0c0339..5d4779c57 100644 --- a/make/doc/jogl/spec-overview.html +++ b/make/doc/jogl/spec-overview.html @@ -329,12 +329,13 @@ according the following rules: <br> <li> OpenGL 3.1 requires a new native context, incompatible with prior versions.</li> <li> OpenGL 3.1 forward compatible profile drops fixed functionality.</li> </ul></li> - <li>Forward compatibility, dropping fixed functionality, is choosen because: + <li>Forward compatibility, aka core, ie a context without <code>GL_ARB_compatibility</code>, is chosen because: <ul> <li> It shares a commont subset with ES2.x</li> <li> It is not guaranteed to be provided by all vendors.</li> <li> It is not guaranteed to be provided in future versions.</li> <li> OpenGL 3.2 core profile is compatible with OpenGL 3.1 forward compatible spec.</li> + <li> OpenGL 3.2 Spec Appendix E.1: It is not possible to implement both core and compatibility profiles in a single GL context, ..</li> </ul></li> </ul></li> <a name="GL2InclusionCriteria"/> diff --git a/make/stub_includes/opengl/GL/glxext.h b/make/stub_includes/opengl/GL/glxext.h index 2d6036bcd..2ed99a824 100644 --- a/make/stub_includes/opengl/GL/glxext.h +++ b/make/stub_includes/opengl/GL/glxext.h @@ -77,11 +77,14 @@ extern "C" { #endif #ifndef GLX_ARB_create_context -#define GLX_CONTEXT_DEBUG_BIT_ARB 0x00000001 -#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002 +#define GLX_CONTEXT_DEBUG_BIT_ARB 0x00000001 +#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002 +#define GLX_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 +#define GLX_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 #define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 #define GLX_CONTEXT_FLAGS_ARB 0x2094 +#define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126 #endif #ifndef GLX_SGIS_multisample diff --git a/make/stub_includes/opengl/GL/wglext.h b/make/stub_includes/opengl/GL/wglext.h index 6f367c09b..d581756c2 100644 --- a/make/stub_includes/opengl/GL/wglext.h +++ b/make/stub_includes/opengl/GL/wglext.h @@ -190,12 +190,15 @@ extern "C" { #endif #ifndef WGL_ARB_create_context +#define WGL_CONTEXT_DEBUG_BIT_ARB 0x00000001 +#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002 +#define WGL_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001 +#define WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB 0x00000002 #define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 #define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 #define WGL_CONTEXT_LAYER_PLANE_ARB 0x2093 #define WGL_CONTEXT_FLAGS_ARB 0x2094 -#define WGL_CONTEXT_DEBUG_BIT_ARB 0x0001 -#define WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002 +#define WGL_CONTEXT_PROFILE_MASK_ARB 0x9126 #define ERROR_INVALID_VERSION_ARB 0x2095 #endif |