diff options
| author | Alon Levy <alevy@redhat.com> | 2011-01-25 12:26:22 +0200 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2011-01-27 12:48:40 +0200 |
| commit | 1bb56f5f46d225f9d2e6bbe0bd86e281caceeff0 (patch) | |
| tree | a609f620dfe80b0b01e6ccfaea6934634b5a0d05 | |
| parent | 143452477df2a095406f69a154d1056953fda229 (diff) | |
| download | spice-1bb56f5f46d225f9d2e6bbe0bd86e281caceeff0.tar.gz spice-1bb56f5f46d225f9d2e6bbe0bd86e281caceeff0.tar.xz spice-1bb56f5f46d225f9d2e6bbe0bd86e281caceeff0.zip | |
client/display_channel: gcc 4.6.0 unused fixes
| -rw-r--r-- | client/display_channel.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/client/display_channel.cpp b/client/display_channel.cpp index 1d5ebf34..45673b47 100644 --- a/client/display_channel.cpp +++ b/client/display_channel.cpp @@ -880,15 +880,16 @@ void DisplayChannel::set_capture_mode(bool on) void DisplayChannel::update_interrupt() { +#ifdef USE_OGL Canvas *canvas; +#endif if (!surfaces_mngr.is_present_canvas(0) || !screen()) { return; } - canvas = surfaces_mngr.get_canvas(0); - #ifdef USE_OGL + canvas = surfaces_mngr.get_canvas(0); if (canvas->get_pixmap_type() == CANVAS_TYPE_GL) { ((GCanvas *)(canvas))->pre_gl_copy(); } @@ -1404,7 +1405,9 @@ void DisplayChannel::handle_stream_destroy_all(RedPeer::InMessage* message) void DisplayChannel::create_primary_surface(int width, int height, uint32_t format) { +#ifdef USE_OGL Canvas *canvas; +#endif _mark = false; attach_to_screen(get_client().get_application(), get_id()); clear_area(); @@ -1421,9 +1424,9 @@ void DisplayChannel::create_primary_surface(int width, int height, uint32_t form _y_res = height; _format = format; +#ifdef USE_OGL canvas = surfaces_mngr.get_canvas(0); -#ifdef USE_OGL if (canvas->get_pixmap_type() == CANVAS_TYPE_GL) { ((GCanvas *)(canvas))->touch_context(); screen()->set_update_interrupt_trigger(&_interrupt_update); @@ -1434,8 +1437,9 @@ void DisplayChannel::create_primary_surface(int width, int height, uint32_t form void DisplayChannel::create_surface(int surface_id, int width, int height, uint32_t format) { - Canvas *canvas; - +#ifdef USE_OGL + Canvas *canvas; +#endif AutoRef<CreateSurfaceEvent> event(new CreateSurfaceEvent(*this, surface_id, width, height, format)); get_client().push_event(*event); @@ -1444,9 +1448,11 @@ void DisplayChannel::create_surface(int surface_id, int width, int height, uint3 THROW("Create surface failed"); } +#ifdef USE_OGL + Canvas *canvas; + canvas = surfaces_mngr.get_canvas(surface_id); -#ifdef USE_OGL if (canvas->get_pixmap_type() == CANVAS_TYPE_GL) { ((GCanvas *)(canvas))->touch_context(); } |