Merge pull request #60 from onbjerg/linux-gl-context
Properly create OpenGL context on Linux
This commit is contained in:
commit
571690a513
@ -95,6 +95,7 @@ setup_pixel_format(SWindowData_X11 *window_data_x11) {
|
|||||||
XCloseDisplay(window_data_x11->display);
|
XCloseDisplay(window_data_x11->display);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
window_data_x11->context = glXCreateContext(window_data_x11->display, visualInfo, NULL, GL_TRUE);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -140,7 +141,6 @@ create_GL_context(SWindowData *window_data) {
|
|||||||
if (setup_pixel_format(window_data_x11) == false)
|
if (setup_pixel_format(window_data_x11) == false)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
window_data_x11->context = glXCreateContext(window_data_x11->display, visualInfo, NULL, GL_TRUE);
|
|
||||||
glXMakeCurrent(window_data_x11->display, window_data_x11->window, window_data_x11->context);
|
glXMakeCurrent(window_data_x11->display, window_data_x11->window, window_data_x11->context);
|
||||||
|
|
||||||
//fprintf(stdout, "GL Vendor: %s\n", glGetString(GL_VENDOR));
|
//fprintf(stdout, "GL Vendor: %s\n", glGetString(GL_VENDOR));
|
||||||
@ -150,7 +150,7 @@ create_GL_context(SWindowData *window_data) {
|
|||||||
|
|
||||||
init_GL(window_data);
|
init_GL(window_data);
|
||||||
|
|
||||||
SwapIntervalEXT = (PFNGLXSWAPINTERVALEXTPROC) getProcAddressGLX("glXSwapIntervalEXT");
|
SwapIntervalEXT = (PFNGLXSWAPINTERVALEXTPROC) glXGetProcAddress("glXSwapIntervalEXT");
|
||||||
set_target_fps_aux();
|
set_target_fps_aux();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
Loading…
Reference in New Issue
Block a user