From 98d91203c5d2f6f7249f38941466857b6a566f5d Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 19 Apr 2010 16:19:43 +0200 Subject: Make client canvas and pixmaps handle more formats and simplify We now support 16bit format pixmaps as well as the old ones. Including both 555 and 565 modes. We drop the palette argument for pixmap construction as it was only used for black/white anyway. Canvas creation is simplified so that there is no separate set_mode state. Canvases are already created in the right mode and never change. --- client/display_channel.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'client/display_channel.h') diff --git a/client/display_channel.h b/client/display_channel.h index 2bb697c5..a5761b35 100644 --- a/client/display_channel.h +++ b/client/display_channel.h @@ -133,13 +133,13 @@ protected: private: void set_draw_handlers(); void clear_draw_handlers(); - bool create_cairo_canvas(int surface_id, int width, int height, int depth); + bool create_cairo_canvas(int surface_id, int width, int height, uint32_t format); #ifdef USE_OGL - bool create_ogl_canvas(int surface_id, int width, int height, int depth, bool recreate, + bool create_ogl_canvas(int surface_id, int width, int height, uint32_t format, bool recreate, RenderType rendertype); #endif #ifdef WIN32 - bool create_gdi_canvas(int surface_id, int width, int height, int depth); + bool create_gdi_canvas(int surface_id, int width, int height, uint32_t format); #endif void destroy_canvas(int surface_id); void create_canvas(int surface_id, const std::vector& canvas_type, int width, int height, -- cgit