Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-22 11:57:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Backends: OpenGL3: Fixed loader compatibility with GL_VERSION for GL 2.x (#6154, #4445, #3530)

Browse Source 
GL_MAJOR_VERSION and GL_MINOR_VERSION are available on GL 3.0 and above.
So we have to parse GL_VERSION under GL 2.x
Reference https://www.khronos.org/opengl/wiki/OpenGL_Context#Context_information_queries
Regressed since 459de65477
See https://github.com/ocornut/imgui/pull/3530
This commit is contained in:
Laurens Holst 2023-02-09 21:56:04 +01:00 committed by ocornut
parent fa0852f9e5
commit b0c1816664
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backends/imgui_impl_opengl3_loader.h
View File

@ -685,7 +685,13 @@ static int parse_version(void)
return GL3W_ERROR_INIT; return GL3W_ERROR_INIT;
glGetIntegerv(GL_MAJOR_VERSION, &version.major); glGetIntegerv(GL_MAJOR_VERSION, &version.major);
glGetIntegerv(GL_MINOR_VERSION, &version.minor); glGetIntegerv(GL_MINOR_VERSION, &version.minor);
if (version.major < 3) if (version.major == 0 && version.minor == 0)
{
// Query GL_VERSION in desktop GL 2.x, the string will start with "<major>.<minor>"
const char* gl_version = (const char*)glGetString(GL_VERSION);
sscanf(gl_version, "%d.%d", &version.major, &version.minor);
}
if (version.major < 2)
return GL3W_ERROR_OPENGL_VERSION; return GL3W_ERROR_OPENGL_VERSION;
return GL3W_OK; return GL3W_OK;
} }
@ -709,7 +715,7 @@ int imgl3wInit2(GL3WGetProcAddressProc proc)
int imgl3wIsSupported(int major, int minor) int imgl3wIsSupported(int major, int minor)
{ {
if (major < 3) if (major < 2)
return 0; return 0;
if (version.major == major) if (version.major == major)
return version.minor >= minor; return version.minor >= minor;

3
docs/CHANGELOG.txt
View File

@ -116,7 +116,8 @@ All changes:
- Backends: GLFW: Added ImGui_ImplGlfw_SetCallbacksChainForAllWindows() to instruct backend - Backends: GLFW: Added ImGui_ImplGlfw_SetCallbacksChainForAllWindows() to instruct backend
to chain callbacks even for secondary viewports/windows. User callbacks may need to test to chain callbacks even for secondary viewports/windows. User callbacks may need to test
the 'window' parameter. (#6142) the 'window' parameter. (#6142)
- Backends: WebGPU: Fix building for latest WebGPU specs (remove implicit layout generation). - Backends: OpenGL3: Fixed GL loader compatibility with 2.x profiles. (#6154, #4445, #3530) [@grauw]
- Backends: WebGPU: Fixed building for latest WebGPU specs (remove implicit layout generation).
(#6117, #4116, #3632) [@tonygrue, @bfierz] (#6117, #4116, #3632) [@tonygrue, @bfierz]
- Examples: refactored SDL2+GL and GLFW+GL examples to compile with Emscripten. - Examples: refactored SDL2+GL and GLFW+GL examples to compile with Emscripten.
(#2492, #2494, #3699, #3705) [@ocornut, @nicolasnoble] (#2492, #2494, #3699, #3705) [@ocornut, @nicolasnoble]