diff options
| author | Damien Leone <dleone@nvidia.com> | 2011-11-21 15:41:40 -0800 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2012-02-17 23:48:52 +0000 |
| commit | 88ac126bffa71484642873f5531ca0e282aee7fc (patch) | |
| tree | 332bac507104f696f93fe5be60619bf21e4f95ab | |
| parent | b5ae1a716f49165d3d8683da934615ff92106580 (diff) | |
| download | cogl-88ac126bffa71484642873f5531ca0e282aee7fc.tar.gz | |
Add support for X101010 and 2101010 pixel formats to fallback OpenGL rendering
https://bugzilla.gnome.org/show_bug.cgi?id=660188
edit: tweaked the internal format returned by pixel_format_to_gl();
handled 1010102 formats and rebased -- Robert Bragg
Reviewed-by: Robert Bragg <robert@linux.intel.com>
| -rw-r--r-- | cogl/cogl-util.c | 5 | ||||
| -rw-r--r-- | cogl/driver/gl/cogl-texture-driver-gl.c | 24 |
2 files changed, 29 insertions, 0 deletions
diff --git a/cogl/cogl-util.c b/cogl/cogl-util.c index ba84d94d..9cb519b9 100644 --- a/cogl/cogl-util.c +++ b/cogl/cogl-util.c @@ -167,6 +167,11 @@ _cogl_util_pixel_format_from_masks_real (unsigned long r_mask, { return COGL_PIXEL_FORMAT_ARGB_8888_PRE; } + else if ((depth == 30 || depth == 32) && + r_mask == 0x3ff00000 && g_mask == 0xffc00 && b_mask == 0x3ff) + { + return COGL_PIXEL_FORMAT_ARGB_2101010_PRE; + } else if (depth == 16 && bpp == 16 && r_mask == 0xf800 && g_mask == 0x7e0 && b_mask == 0x1f) { diff --git a/cogl/driver/gl/cogl-texture-driver-gl.c b/cogl/driver/gl/cogl-texture-driver-gl.c index deda4c6c..27248116 100644 --- a/cogl/driver/gl/cogl-texture-driver-gl.c +++ b/cogl/driver/gl/cogl-texture-driver-gl.c @@ -466,6 +466,30 @@ _cogl_texture_driver_pixel_format_to_gl (CoglPixelFormat format, #endif break; + case COGL_PIXEL_FORMAT_RGBA_1010102: + glintformat = GL_RGBA; + glformat = GL_RGBA; + gltype = GL_UNSIGNED_INT_10_10_10_2; + break; + + case COGL_PIXEL_FORMAT_BGRA_1010102: + glintformat = GL_RGBA; + glformat = GL_BGRA; + gltype = GL_UNSIGNED_INT_10_10_10_2; + break; + + case COGL_PIXEL_FORMAT_ABGR_2101010: + glintformat = GL_RGBA; + glformat = GL_RGBA; + gltype = GL_UNSIGNED_INT_2_10_10_10_REV; + break; + + case COGL_PIXEL_FORMAT_ARGB_2101010: + glintformat = GL_RGBA; + glformat = GL_BGRA; + gltype = GL_UNSIGNED_INT_2_10_10_10_REV; + break; + /* The following three types of channel ordering * are always defined using system word byte * ordering (even according to GLES spec) */ |