diff options
author | Alexander Larsson <alexl@redhat.com> | 2010-06-21 14:17:29 +0200 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2010-06-21 14:50:18 +0200 |
commit | cfc1e95bda0e150b3de225c3572bb1004dad070e (patch) | |
tree | e672e2607613ac012f0cfe3414a33b129bae52b2 /client/x11/red_window_p.h | |
parent | ae4436215cb113a02eac73c6afd368166090967c (diff) | |
download | spice-cfc1e95bda0e150b3de225c3572bb1004dad070e.tar.gz spice-cfc1e95bda0e150b3de225c3572bb1004dad070e.tar.xz spice-cfc1e95bda0e150b3de225c3572bb1004dad070e.zip |
Make opengl optional, disabled by default
The OpenGL renderer isn't really useful right now, its not quite up
to date, its not really faster than software and it only supports a limited
subset of drivers. So, lets disable it for now.
Long term opengl rendering of the 2d part of spice is important if we want
to combine 2d and 3d rendering (say if spice adds opengl support in the
protocol). But until then this is isn't useful for normal use.
Diffstat (limited to 'client/x11/red_window_p.h')
-rw-r--r-- | client/x11/red_window_p.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/client/x11/red_window_p.h b/client/x11/red_window_p.h index b843c423..29121d9c 100644 --- a/client/x11/red_window_p.h +++ b/client/x11/red_window_p.h @@ -18,12 +18,17 @@ #ifndef _H_RED_WINDOW_P #define _H_RED_WINDOW_P +#ifdef USE_OGL #include <GL/glx.h> +#endif // USE_OGL +#include <X11/Xdefs.h> #include <X11/Xlib.h> typedef Window Win; +#ifdef USE_OGL typedef GLXContext RedGlContext; typedef GLXPbuffer RedPbuffer; +#endif // USE_OGL class RedWindow; class Icon; @@ -49,7 +54,9 @@ public: static void win_proc(XEvent& event); static Cursor create_invisible_cursor(Window window); +#ifdef USE_OGL void set_glx(int width, int height); +#endif // USE_OGL static void handle_key_press_event(RedWindow& red_window, XKeyEvent* event); protected: @@ -59,7 +66,9 @@ protected: bool _visibale; bool _expect_parent; SpicePoint _show_pos; +#ifdef USE_OGL GLXContext _glcont_copy; +#endif // USE_OGL Icon* _icon; bool _focused; bool _ignore_foucs; |