diff options
Diffstat (limited to 'client/x11/red_drawable.cpp')
| -rw-r--r-- | client/x11/red_drawable.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/client/x11/red_drawable.cpp b/client/x11/red_drawable.cpp index 3712dfd7..d6cce920 100644 --- a/client/x11/red_drawable.cpp +++ b/client/x11/red_drawable.cpp @@ -25,7 +25,7 @@ #include "x_platform.h" #include "utils.h" -#ifdef USE_OGL +#ifdef USE_OPENGL #include "gl_utils.h" #include <GL/gl.h> #include <GL/glu.h> @@ -136,7 +136,7 @@ static inline void copy_to_gldrawable_from_pixmap(const RedDrawable_p* dest, glXMakeCurrent(XPlatform::get_display(), pbuffer, context); } } -#endif // USE_OGL +#endif // USE_OPENGL static inline void copy_to_drawable_from_drawable(const RedDrawable_p* dest, const SpiceRect& area, @@ -274,7 +274,7 @@ static inline void copy_to_x_drawable(const RedDrawable_p* dest, } } -#ifdef USE_OGL +#ifdef USE_OPENGL static inline void copy_to_gl_drawable(const RedDrawable_p* dest, const SpiceRect& area, const SpicePoint& offset, @@ -292,7 +292,7 @@ static inline void copy_to_gl_drawable(const RedDrawable_p* dest, THROW("invalid source type %d", source->type); } } -#endif // USE_OGL +#endif // USE_OPENGL static inline void copy_to_pixmap_from_drawable(const RedDrawable_p* dest, const SpiceRect& area, @@ -323,7 +323,7 @@ static inline void copy_to_pixmap_from_pixmap(const RedDrawable_p* dest, area.bottom - area.top); } -#ifdef USE_OGL +#ifdef USE_OPENGL static inline void copy_to_pixmap_from_gltexture(const RedDrawable_p* dest, const SpiceRect& area, const SpicePoint& offset, @@ -367,7 +367,7 @@ static inline void copy_to_pixmap_from_gltexture(const RedDrawable_p* dest, glXMakeCurrent(XPlatform::get_display(), win, context); } } -#endif // USE_OGL +#endif // USE_OPENGL static inline void copy_to_pixmap(const RedDrawable_p* dest, const SpiceRect& area, @@ -376,11 +376,11 @@ static inline void copy_to_pixmap(const RedDrawable_p* dest, int src_x, int src_y) { switch (source->type) { -#ifdef USE_OGL +#ifdef USE_OPENGL case PIXELS_SOURCE_TYPE_GL_TEXTURE: copy_to_pixmap_from_gltexture(dest, area, offset, source, src_x, src_y); break; -#endif // USE_OGL +#endif // USE_OPENGL case PIXELS_SOURCE_TYPE_X_DRAWABLE: copy_to_pixmap_from_drawable(dest, area, offset, source, src_x, src_y); break; @@ -397,12 +397,12 @@ void RedDrawable::copy_pixels(const PixelsSource& src, int src_x, int src_y, con PixelsSource_p* source = (PixelsSource_p*)src.get_opaque(); RedDrawable_p* dest = (RedDrawable_p*)get_opaque(); switch (dest->source.type) { -#ifdef USE_OGL +#ifdef USE_OPENGL case PIXELS_SOURCE_TYPE_GL_DRAWABLE: copy_to_gl_drawable(dest, area, _origin, source, src_x + src._origin.x, src_y + src._origin.y); break; -#endif // USE_OGL +#endif // USE_OPENGL case PIXELS_SOURCE_TYPE_X_DRAWABLE: copy_to_x_drawable(dest, area, _origin, source, src_x + src._origin.x, src_y + src._origin.y); @@ -654,7 +654,7 @@ static inline void fill_drawable(RedDrawable_p* dest, const SpiceRect& area, rgb area.right - area.left, area.bottom - area.top); } -#ifdef USE_OGL +#ifdef USE_OPENGL static inline void fill_gl_drawable(RedDrawable_p* dest, const SpiceRect& area, rgb32_t color, const SpicePoint& offset) { @@ -688,7 +688,7 @@ static inline void fill_gl_drawable(RedDrawable_p* dest, const SpiceRect& area, glColor3f(1, 1, 1); } -#endif // USE_OGL +#endif // USE_OPENGL static inline void fill_pixmap(RedDrawable_p* dest, const SpiceRect& area, rgb32_t color, const SpicePoint& offset) @@ -706,11 +706,11 @@ void RedDrawable::fill_rect(const SpiceRect& area, rgb32_t color) { RedDrawable_p* dest = (RedDrawable_p*)get_opaque(); switch (dest->source.type) { -#ifdef USE_OGL +#ifdef USE_OPENGL case PIXELS_SOURCE_TYPE_GL_DRAWABLE: fill_gl_drawable(dest, area, color, _origin); break; -#endif // USE_OGL +#endif // USE_OPENGL case PIXELS_SOURCE_TYPE_X_DRAWABLE: fill_drawable(dest, area, color, _origin); break; |