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 /server | |
| 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 'server')
| -rw-r--r-- | server/red_dispatcher.c | 10 | ||||
| -rw-r--r-- | server/red_worker.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/server/red_dispatcher.c b/server/red_dispatcher.c index 8b3d0ffc..19d6e8da 100644 --- a/server/red_dispatcher.c +++ b/server/red_dispatcher.c @@ -32,9 +32,9 @@ #include "red_worker.h" #include "quic.h" #include "reds_sw_canvas.h" -#ifdef USE_OGL +#ifdef USE_OPENGL #include "reds_gl_canvas.h" -#endif // USE_OGL +#endif // USE_OPENGL #include "reds.h" #include "red_dispatcher.h" #include "red_parse_qxl.h" @@ -140,7 +140,7 @@ typedef struct RendererInfo { static RendererInfo renderers_info[] = { {RED_RENDERER_SW, "sw"}, -#ifdef USE_OGL +#ifdef USE_OPENGL {RED_RENDERER_OGL_PBUF, "oglpbuf"}, {RED_RENDERER_OGL_PIXMAP, "oglpixmap"}, #endif @@ -496,9 +496,9 @@ RedDispatcher *red_dispatcher_init(QXLInstance *qxl) quic_init(); sw_canvas_init(); -#ifdef USE_OGL +#ifdef USE_OPENGL gl_canvas_init(); -#endif // USE_OGL +#endif // USE_OPENGL if (socketpair(AF_LOCAL, SOCK_STREAM, 0, channels) == -1) { red_error("socketpair failed %s", strerror(errno)); diff --git a/server/red_worker.c b/server/red_worker.c index 856b66aa..a9452fb1 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -40,10 +40,10 @@ #include <spice/protocol.h> #include "red_worker.h" #include "reds_sw_canvas.h" -#ifdef USE_OGL +#ifdef USE_OPENGL #include "reds_gl_canvas.h" #include "ogl_ctx.h" -#endif /* USE_OGL */ +#endif /* USE_OPENGL */ #include "quic.h" #include "lz.h" #include "glz_encoder_dictionary.h" @@ -8305,7 +8305,7 @@ static void red_migrate_display(RedWorker *worker) } } -#ifdef USE_OGL +#ifdef USE_OPENGL static SpiceCanvas *create_ogl_context_common(RedWorker *worker, OGLCtx *ctx, uint32_t width, uint32_t height, int32_t stride, uint8_t depth) { @@ -8375,7 +8375,7 @@ static inline void *create_canvas_for_surface(RedWorker *worker, RedSurface *sur surface->context.top_down = TRUE; surface->context.canvas_draws_on_surface = TRUE; return canvas; -#ifdef USE_OGL +#ifdef USE_OPENGL case RED_RENDERER_OGL_PBUF: canvas = create_ogl_pbuf_context(worker, width, height, stride, SPICE_SURFACE_FMT_DEPTH(format)); |