anulax
/
imgui-docking
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

Portability fixes to OpenGL example application (courtesy of djoshea)

Browse Source
features/sdl_renderer3_multiviewports v1.02
ocornut ago%!(EXTRA string=11 years)
parent 150ad95bd6
commit 8825545653
1 changed files with 12 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      examples/opengl_example/main.cpp

16
examples/opengl_example/main.cpp
Unescape View File

@ -191,13 +191,13 @@ void InitGL()
if (!glfwInit()) if (!glfwInit())
exit(1); exit(1);
//glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
//glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
//glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
//glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
glfwWindowHint(GLFW_REFRESH_RATE, 60); glfwWindowHint(GLFW_REFRESH_RATE, 60);
glfwWindowHint(GLFW_RESIZABLE, GL_FALSE); glfwWindowHint(GLFW_RESIZABLE, GL_FALSE);
window = glfwCreateWindow(1280, 720, "ImGui OpenGL example", nullptr, nullptr); window = glfwCreateWindow(1280, 720, "ImGui OpenGL example", NULL, NULL);
glfwMakeContextCurrent(window); glfwMakeContextCurrent(window);
glfwSetKeyCallback(window, glfw_key_callback); glfwSetKeyCallback(window, glfw_key_callback);
@ -207,8 +207,10 @@ void InitGL()
glewExperimental = GL_TRUE; glewExperimental = GL_TRUE;
glewInit(); glewInit();
GLenum err = GL_NO_ERROR; // After calling glewInit() our GL error state may be GL_INVALID_ENUM
err = glGetError(); IM_ASSERT(err == GL_NO_ERROR); const GLenum err = glGetError();
(void)err;
IM_ASSERT(err == GL_NO_ERROR || err == GL_INVALID_ENUM);
} }
void InitImGui() void InitImGui()

Write Preview
Loading…
Cancel
Save