pxcloud/spice
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2025-12-31 20:04:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

spice: client: gl: fix glx support.

Browse Source 
Just move around touch_context and untouch_context to be at the right
places.

Signed-off-by: Izik Eidus <ieidus@redhat.com>
This commit is contained in:
Izik Eidus 2009-11-09 22:27:13 +02:00 committed by Yaniv Kamay
parent 54cf04beed
commit 3915319125
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client/display_channel.cpp
View File

@ -693,6 +693,8 @@ DisplayChannel::~DisplayChannel()
if (screen()) {
screen()->set_update_interrupt_trigger(NULL);
}
destroy_canvas();
destroy_strams();
}
@ -776,6 +778,7 @@ void DisplayChannel::recreate_ogl_context_interrupt()
{
Canvas* canvas = _canvas.release();
if (canvas) {
((GCanvas *)(canvas))->touch_context();
((GCanvas *)canvas)->textures_lost();
delete canvas;
}
@ -783,6 +786,8 @@ void DisplayChannel::recreate_ogl_context_interrupt()
if (!create_ogl_canvas(_x_res, _y_res, _depth, 0, _rendertype)) {
THROW("create_ogl_canvas failed");
}
((GCanvas *)(_canvas.get()))->touch_context();
}
void DisplayChannel::recreate_ogl_context()
@ -917,10 +922,10 @@ bool DisplayChannel::create_ogl_canvas(int width, int height, int depth,
return false;
}
screen()->untouch_context();
canvas->set_mode(width, height, depth, win, rendertype);
screen()->untouch_context();
_canvas.reset(canvas.release());
_rendertype = rendertype;
LOG_INFO("display %d: using ogl", get_id());
@ -954,6 +959,11 @@ void DisplayChannel::destroy_canvas()
Canvas* canvas = _canvas.release();
if (canvas) {
#ifdef USE_OGL
if (canvas->get_pixmap_type() == CANVAS_TYPE_GL) {
((GCanvas *)(canvas))->touch_context();
}
#endif
delete canvas;
}
}
@ -1019,6 +1029,7 @@ void DisplayChannel::handle_mode(RedPeer::InMessage* message)
if (_canvas.get()) {
if (_canvas->get_pixmap_type() == CANVAS_TYPE_GL) {
screen()->unset_type_gl();
screen()->untouch_context();
//glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
}
}
@ -1038,6 +1049,7 @@ void DisplayChannel::handle_mode(RedPeer::InMessage* message)
#ifdef USE_OGL
if (_canvas->get_pixmap_type() == CANVAS_TYPE_GL) {
((GCanvas *)(_canvas.get()))->touch_context();
screen()->set_update_interrupt_trigger(&_interrupt_update);
screen()->set_type_gl();
}