diff options
author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2013-09-25 22:21:35 +0200 |
---|---|---|
committer | Frediano Ziglio <fziglio@redhat.com> | 2015-11-21 13:50:46 +0000 |
commit | c5c176a5c7718177f23b07981556b5d460627498 (patch) | |
tree | 5ef4f1700ac263abfffce7a9ec1ea31889f9e1be /server/red_worker.c | |
parent | 1f27043b8264c2c43e62269992cbfd85d9753482 (diff) | |
download | spice-c5c176a5c7718177f23b07981556b5d460627498.tar.gz spice-c5c176a5c7718177f23b07981556b5d460627498.tar.xz spice-c5c176a5c7718177f23b07981556b5d460627498.zip |
server: remove OpenGL
This is really not supported, requires X11, so better to remove it for
now. Some day it might be revived, using DRM, ..
Note for later, this could be removed too (not used by client):
- spice-common/common/ogl_ctx
Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
Diffstat (limited to 'server/red_worker.c')
-rw-r--r-- | server/red_worker.c | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/server/red_worker.c b/server/red_worker.c index 44627f06..c8f123de 100644 --- a/server/red_worker.c +++ b/server/red_worker.c @@ -4511,63 +4511,6 @@ static void red_migrate_display(DisplayChannel *display, RedChannelClient *rcc) } } -#ifdef USE_OPENGL -static SpiceCanvas *create_ogl_context_common(DisplayChannel *display, OGLCtx *ctx, - uint32_t width, uint32_t height, - int32_t stride, uint8_t depth) -{ - SpiceCanvas *canvas; - - oglctx_make_current(ctx); - if (!(canvas = gl_canvas_create(width, height, depth, &display->image_cache.base, - &display->image_surfaces, NULL, NULL, NULL))) { - return NULL; - } - - spice_canvas_set_usr_data(canvas, ctx, (spice_destroy_fn_t)oglctx_destroy); - - canvas->ops->clear(canvas); - - return canvas; -} - -static SpiceCanvas *create_ogl_pbuf_context(DisplayChannel *display, uint32_t width, - uint32_t height, int32_t stride, uint8_t depth) -{ - OGLCtx *ctx; - SpiceCanvas *canvas; - - if (!(ctx = pbuf_create(width, height))) { - return NULL; - } - - if (!(canvas = create_ogl_context_common(display, ctx, width, height, stride, depth))) { - oglctx_destroy(ctx); - return NULL; - } - - return canvas; -} - -static SpiceCanvas *create_ogl_pixmap_context(DisplayChannel *display, uint32_t width, - uint32_t height, int32_t stride, uint8_t depth) -{ - OGLCtx *ctx; - SpiceCanvas *canvas; - - if (!(ctx = pixmap_create(width, height))) { - return NULL; - } - - if (!(canvas = create_ogl_context_common(display, ctx, width, height, stride, depth))) { - oglctx_destroy(ctx); - return NULL; - } - - return canvas; -} -#endif - static inline void *create_canvas_for_surface(DisplayChannel *display, RedSurface *surface, uint32_t renderer, uint32_t width, uint32_t height, int32_t stride, uint32_t format, void *line_0) @@ -4583,18 +4526,6 @@ static inline void *create_canvas_for_surface(DisplayChannel *display, RedSurfac surface->context.top_down = TRUE; surface->context.canvas_draws_on_surface = TRUE; return canvas; -#ifdef USE_OPENGL - case RED_RENDERER_OGL_PBUF: - canvas = create_ogl_pbuf_context(display, width, height, stride, - SPICE_SURFACE_FMT_DEPTH(format)); - surface->context.top_down = FALSE; - return canvas; - case RED_RENDERER_OGL_PIXMAP: - canvas = create_ogl_pixmap_context(display, width, height, stride, - SPICE_SURFACE_FMT_DEPTH(format)); - surface->context.top_down = FALSE; - return canvas; -#endif default: spice_error("invalid renderer type"); }; |