diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-09-23 22:04:47 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-09-30 02:19:51 +0200 |
| commit | d524047400f14d0899dcff1a057f0e25b3dfcff9 (patch) | |
| tree | c17cb66cdb1866f674204500e778cedf9d8c19c8 /client | |
| parent | a2be67cbfaf20303704ec549313778729190d89b (diff) | |
| download | spice-d524047400f14d0899dcff1a057f0e25b3dfcff9.tar.gz spice-d524047400f14d0899dcff1a057f0e25b3dfcff9.tar.xz spice-d524047400f14d0899dcff1a057f0e25b3dfcff9.zip | |
spicec: remove dead GL code
Diffstat (limited to 'client')
| -rw-r--r-- | client/x11/red_window.cpp | 31 | ||||
| -rw-r--r-- | client/x11/red_window_p.h | 3 |
2 files changed, 0 insertions, 34 deletions
diff --git a/client/x11/red_window.cpp b/client/x11/red_window.cpp index b6e11e14..d82f5b74 100644 --- a/client/x11/red_window.cpp +++ b/client/x11/red_window.cpp @@ -1073,28 +1073,6 @@ void RedWindow_p::wait_for_unmap() } } -#ifdef USE_OPENGL -void RedWindow_p::set_glx(int width, int height) -{ - if (_glcont_copy) { - XLockDisplay(x_display); - XSync(x_display, False); - XUnlockDisplay(x_display); - glXMakeCurrent(x_display, _win, _glcont_copy); - //glDrawBuffer(GL_FRONT); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - gluOrtho2D(0, width, 0, height); - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - glViewport(0, 0, width, height); - glColor3f(1, 1, 1); - glEnable(GL_TEXTURE_2D); - GLC_ERROR_TEST_FINISH; - } -} -#endif // USE_OPENGL - void RedWindow_p::set_minmax(PixelsSource_p& pix_source) { //todo: auto res @@ -1134,9 +1112,6 @@ Cursor RedWindow_p::create_invisible_cursor(Window window) RedWindow_p::RedWindow_p() : _win (None) , _show_pos_valid (false) -#ifdef USE_OPENGL - , _glcont_copy (NULL) -#endif // USE_OPENGL , _icon (NULL) , _focused (false) , _ignore_foucs (false) @@ -1174,12 +1149,6 @@ void RedWindow_p::destroy(RedWindow& red_window, PixelsSource_p& pix_source) XFreeCursor(x_display, _invisible_cursor); _invisible_cursor = None; XDeleteContext(x_display, window, user_data_context); -#ifdef USE_OPENGL - if (_glcont_copy) { - glXDestroyContext(x_display, _glcont_copy); - _glcont_copy = NULL; - } -#endif // USE_OPENGL XDestroyWindow(x_display, window); XFreeColormap(x_display, _colormap); XFreeGC(x_display, pix_source.x_drawable.gc); diff --git a/client/x11/red_window_p.h b/client/x11/red_window_p.h index 27825393..4856be05 100644 --- a/client/x11/red_window_p.h +++ b/client/x11/red_window_p.h @@ -67,9 +67,6 @@ protected: bool _expect_parent; SpicePoint _show_pos; bool _show_pos_valid; -#ifdef USE_OPENGL - GLXContext _glcont_copy; -#endif // USE_OPENGL Icon* _icon; bool _focused; bool _ignore_foucs; |