PolyGun/PolyGun
6
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Legacy GL renderer compilation with X11

Browse Source
This commit is contained in:
mrkubax10 2023-07-29 10:41:17 +02:00
parent e9bb4470a2
commit cc5d883482
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/window/x11_window.cpp
View File

@ -169,7 +169,8 @@ X11Window::X11Window(const std::string& title, unsigned width, unsigned height,
switch(renderer_type) { switch(renderer_type) {
case renderer::RendererType::RENDERER_TYPE_GL: case renderer::RendererType::RENDERER_TYPE_GL:
#if defined(RENDERER_GL) case renderer::RendererType::RENDERER_TYPE_LEGACY_GL:
#if defined(RENDERER_GL) || defined(RENDERER_LEGACY_GL)
m_visual_info = setup_glx(); m_visual_info = setup_glx();
#else #else
LOG_FATAL("Request to setup GLX while OpenGL renderer is not compiled in"); LOG_FATAL("Request to setup GLX while OpenGL renderer is not compiled in");
@ -332,7 +333,8 @@ size_t X11Window::poll_events(Event& event) {
void X11Window::finish_frame() { void X11Window::finish_frame() {
switch(m_renderer_type) { switch(m_renderer_type) {
case renderer::RendererType::RENDERER_TYPE_GL: case renderer::RendererType::RENDERER_TYPE_GL:
#if defined(RENDERER_GL) case renderer::RendererType::RENDERER_TYPE_LEGACY_GL:
#if defined(RENDERER_GL) || defined(RENDERER_LEGACY_GL)
if(m_glx_has_doublebuffer) if(m_glx_has_doublebuffer)
glXSwapBuffers(m_display, m_window_id); glXSwapBuffers(m_display, m_window_id);
break; break;
@ -357,7 +359,7 @@ void X11Window::grab_mouse(bool grab) {
m_mouse_grabbed = grab; m_mouse_grabbed = grab;
} }
#if defined(RENDERER_GL) #if defined(RENDERER_GL) || defined(RENDERER_LEGACY_GL)
XVisualInfo* X11Window::setup_glx() { XVisualInfo* X11Window::setup_glx() {
// check if GLX is supported // check if GLX is supported
int dummy; int dummy;

4
src/game/window/x11_window.hpp
View File

@ -46,7 +46,7 @@ namespace polygun::window {
virtual void grab_mouse(bool grab) override; virtual void grab_mouse(bool grab) override;
private: private:
#if defined(RENDERER_GL) #if defined(RENDERER_GL) || defined(RENDERER_LEGACY_GL)
bool m_glx_has_doublebuffer; bool m_glx_has_doublebuffer;
#endif #endif
Display* m_display; Display* m_display;
@ -63,7 +63,7 @@ namespace polygun::window {
bool m_first_focus_out_event; bool m_first_focus_out_event;
private: private:
#if defined(RENDERER_GL) #if defined(RENDERER_GL) || defined(RENDERER_LEGACY_GL)
XVisualInfo* setup_glx(); XVisualInfo* setup_glx();
#endif #endif
}; };