diff options
Diffstat (limited to 'common/headless_view.hpp')
-rw-r--r-- | common/headless_view.hpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/common/headless_view.hpp b/common/headless_view.hpp index 57cdec5246..a203d477e0 100644 --- a/common/headless_view.hpp +++ b/common/headless_view.hpp @@ -3,11 +3,9 @@ #ifdef __APPLE__ #define LLMR_USE_CGL 1 -#define LLMR_CONTEXT_OBJ CGLContextObj #else #include <GL/glx.h> #define LLMR_USE_GLX 1 -#define LLMR_CONTEXT_OBJ GLXContext #endif #include <llmr/map/view.hpp> @@ -31,19 +29,19 @@ private: private: - LLMR_CONTEXT_OBJ gl_context; - #ifdef LLMR_USE_CGL + CGLContextObj gl_context; GLuint fbo = 0; GLuint fbo_depth_stencil = 0; GLuint fbo_color = 0; #endif #ifdef LLMR_USE_GLX + GLXContext gl_context = nullptr; XVisualInfo *x_info = nullptr; Display *x_display = nullptr; - Pixmap x_pixmap; - GLXPixmap glx_pixmap; + Pixmap x_pixmap = 0; + GLXPixmap glx_pixmap = 0; #endif }; |