From c4503eaf17664bdf501ee96ba86d3a24636b83bc Mon Sep 17 00:00:00 2001 From: numzero Date: Thu, 14 Jan 2021 02:28:12 +0300 Subject: [PATCH] GLX window is *not* an X11 window --- include/SExposedVideoData.h | 1 + source/Irrlicht/CGLXManager.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/SExposedVideoData.h b/include/SExposedVideoData.h index 35108f0..ba47f1e 100644 --- a/include/SExposedVideoData.h +++ b/include/SExposedVideoData.h @@ -61,6 +61,7 @@ struct SExposedVideoData void* X11Display; void* X11Context; unsigned long X11Window; + unsigned long GLXWindow; }; struct SOpenGLOSX diff --git a/source/Irrlicht/CGLXManager.cpp b/source/Irrlicht/CGLXManager.cpp index 467b69c..4778a49 100644 --- a/source/Irrlicht/CGLXManager.cpp +++ b/source/Irrlicht/CGLXManager.cpp @@ -294,7 +294,7 @@ bool CGLXManager::generateSurface() return false; } - CurrentContext.OpenGLLinux.X11Window=GlxWin; + CurrentContext.OpenGLLinux.GLXWindow=GlxWin; } return true; }