diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2011-04-21 13:06:37 +0200 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2011-05-03 14:44:11 +0200 |
| commit | e0c20725c8c7b516ed500b570fcf134534efd6b3 (patch) | |
| tree | ca604891742f134e4d30390c97a3714e410fde8f /client/display_channel.h | |
| parent | c1b7ecac3f51a2818bf7abd00d27f0475b507ba1 (diff) | |
| download | spice-e0c20725c8c7b516ed500b570fcf134534efd6b3.tar.gz spice-e0c20725c8c7b516ed500b570fcf134534efd6b3.tar.xz spice-e0c20725c8c7b516ed500b570fcf134534efd6b3.zip | |
s/USE_OGL/USE_OPENGL
This is more explicit about what it does, and not much longer
Diffstat (limited to 'client/display_channel.h')
| -rw-r--r-- | client/display_channel.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/client/display_channel.h b/client/display_channel.h index e6cd227e..647fb660 100644 --- a/client/display_channel.h +++ b/client/display_channel.h @@ -26,7 +26,7 @@ #include "cache.hpp" #include "screen_layer.h" #include "process_loop.h" -#ifdef USE_OGL +#ifdef USE_OPENGL #include "red_pixmap_gl.h" #endif #include "glz_decoder_window.h" @@ -48,7 +48,7 @@ private: DisplayChannel& _channel; }; -#ifdef USE_OGL +#ifdef USE_OPENGL class GLInterruptRecreate: public EventSources::Trigger { public: GLInterruptRecreate(DisplayChannel& channel); @@ -103,7 +103,7 @@ public: virtual void copy_pixels(const QRegion& dest_region, RedDrawable& dest_dc); virtual void copy_pixels(const QRegion& dest_region, const PixmapHeader &dest); -#ifdef USE_OGL +#ifdef USE_OPENGL virtual void recreate_ogl_context(); virtual void recreate_ogl_context_interrupt(); virtual void pre_migrate(); @@ -134,7 +134,7 @@ private: void set_draw_handlers(); void clear_draw_handlers(); bool create_sw_canvas(int surface_id, int width, int height, uint32_t format); -#ifdef USE_OGL +#ifdef USE_OPENGL bool create_ogl_canvas(int surface_id, int width, int height, uint32_t format, bool recreate, RenderType rendertype); #endif @@ -200,7 +200,7 @@ private: int _x_res; int _y_res; uint32_t _format; -#ifdef USE_OGL +#ifdef USE_OPENGL RenderType _rendertype; #endif @@ -226,7 +226,7 @@ private: std::vector<VideoStream*> _streams; VideoStream* _active_streams; StreamsTrigger _streams_trigger; -#ifdef USE_OGL +#ifdef USE_OPENGL GLInterruptRecreate _gl_interrupt_recreate; #endif InterruptUpdate _interrupt_update; |