mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-25 22:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed debug bit not being set for OpenGL ES.

Browse Source
This commit is contained in:
Camilla Berglund 2015-02-27 02:53:21 +01:00
parent bbfdedff01
commit d90f5e0429
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -64,6 +64,7 @@ GLFW bundles a number of dependencies in the `deps/` directory.
- Removed support for LCC and Borland C++ - Removed support for LCC and Borland C++
- Bugfix: `glfwSetTime` silently accepted invalid values - Bugfix: `glfwSetTime` silently accepted invalid values
- [WGL] Bugfix: The context flags debug bit was not set for OpenGL ES
- [Cocoa] Bugfix: `glfwSetWindowSize` did not change the video mode for full - [Cocoa] Bugfix: `glfwSetWindowSize` did not change the video mode for full
screen windows screen windows
- [X11] Added support for Cygwin-X - [X11] Added support for Cygwin-X
@ -72,6 +73,8 @@ GLFW bundles a number of dependencies in the `deps/` directory.
- [X11] Bugfix: Mouse button `GLFW_MOUSE_BUTTON_4` was never used - [X11] Bugfix: Mouse button `GLFW_MOUSE_BUTTON_4` was never used
- [X11] Bugfix: `glfwTerminate` could close an unrelated file descriptor - [X11] Bugfix: `glfwTerminate` could close an unrelated file descriptor
- [X11] Bugfix: Some WMs (KWM, Fluxbox) did not respect cursor redefinition - [X11] Bugfix: Some WMs (KWM, Fluxbox) did not respect cursor redefinition
- [GLX] Bugfix: The context flags debug bit was not set for OpenGL ES
- [EGL] Bugfix: The context flags debug bit was not set for OpenGL ES
## Contact ## Contact

2
src/egl_context.c
View File

@ -339,10 +339,10 @@ int _glfwCreateContext(_GLFWwindow* window,
if (ctxconfig->forward) if (ctxconfig->forward)
flags |= EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE_BIT_KHR; flags |= EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE_BIT_KHR;
}
if (ctxconfig->debug) if (ctxconfig->debug)
flags |= EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR; flags |= EGL_CONTEXT_OPENGL_DEBUG_BIT_KHR;
}
if (ctxconfig->robustness) if (ctxconfig->robustness)
{ {

6
src/glx_context.c
View File

@ -360,9 +360,6 @@ int _glfwCreateContext(_GLFWwindow* window,
if (ctxconfig->forward) if (ctxconfig->forward)
flags |= GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB; flags |= GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;
if (ctxconfig->debug)
flags |= GLX_CONTEXT_DEBUG_BIT_ARB;
if (ctxconfig->profile) if (ctxconfig->profile)
{ {
if (ctxconfig->profile == GLFW_OPENGL_CORE_PROFILE) if (ctxconfig->profile == GLFW_OPENGL_CORE_PROFILE)
@ -374,6 +371,9 @@ int _glfwCreateContext(_GLFWwindow* window,
else else
mask |= GLX_CONTEXT_ES2_PROFILE_BIT_EXT; mask |= GLX_CONTEXT_ES2_PROFILE_BIT_EXT;
if (ctxconfig->debug)
flags |= GLX_CONTEXT_DEBUG_BIT_ARB;
if (ctxconfig->robustness) if (ctxconfig->robustness)
{ {
if (_glfw.glx.ARB_create_context_robustness) if (_glfw.glx.ARB_create_context_robustness)

6
src/wgl_context.c
View File

@ -398,9 +398,6 @@ int _glfwCreateContext(_GLFWwindow* window,
if (ctxconfig->forward) if (ctxconfig->forward)
flags |= WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB; flags |= WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB;
if (ctxconfig->debug)
flags |= WGL_CONTEXT_DEBUG_BIT_ARB;
if (ctxconfig->profile) if (ctxconfig->profile)
{ {
if (ctxconfig->profile == GLFW_OPENGL_CORE_PROFILE) if (ctxconfig->profile == GLFW_OPENGL_CORE_PROFILE)
@ -412,6 +409,9 @@ int _glfwCreateContext(_GLFWwindow* window,
else else
mask |= WGL_CONTEXT_ES2_PROFILE_BIT_EXT; mask |= WGL_CONTEXT_ES2_PROFILE_BIT_EXT;
if (ctxconfig->debug)
flags |= WGL_CONTEXT_DEBUG_BIT_ARB;
if (ctxconfig->robustness) if (ctxconfig->robustness)
{ {
if (window->wgl.ARB_create_context_robustness) if (window->wgl.ARB_create_context_robustness)