# HG changeset patch
# User reimar
# Date 1093900012 0
# Node ID 6e8d1ac141fc07f0b2d08ef6bcdeb0ccb25dd901
# Parent  08bb01a9905a656c639cd85bc6099d72a3cb64a0
Using updated colorspace specifications from colorspaces.txt.
All by manyfmts suboption supported formats should display correctly now.

diff -r 08bb01a9905a -r 6e8d1ac141fc libvo/vo_gl.c
--- a/libvo/vo_gl.c	Mon Aug 30 20:39:32 2004 +0000
+++ b/libvo/vo_gl.c	Mon Aug 30 21:06:52 2004 +0000
@@ -77,7 +77,7 @@
       gl_format = GL_RGB;
       gl_type = GL_UNSIGNED_BYTE;
       break;
-    case IMGFMT_RGB32:
+    case IMGFMT_RGBA:
       gl_texfmt = 4;
       gl_format = GL_RGBA;
       gl_type = GL_UNSIGNED_BYTE;
@@ -92,15 +92,15 @@
 #ifdef GL_VERSION_1_2
     case IMGFMT_RGB8:
       gl_format = GL_RGB;
-      gl_type = GL_UNSIGNED_BYTE_3_3_2;
+      gl_type = GL_UNSIGNED_BYTE_2_3_3_REV;
       break;
     case IMGFMT_RGB15:
       gl_format = GL_RGBA;
-      gl_type = GL_UNSIGNED_SHORT_5_5_5_1;
+      gl_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
       break;
     case IMGFMT_RGB16:
       gl_format = GL_RGB;
-      gl_type = GL_UNSIGNED_SHORT_5_6_5;
+      gl_type = GL_UNSIGNED_SHORT_5_6_5_REV;
       break;
     case IMGFMT_BGR8:
       // special case as red and blue have a differen number of bits.
@@ -108,21 +108,21 @@
       // by nVidia drivers, and in addition would give more bits to
       // blue than to red, which isn't wanted
       gl_format = GL_RGB;
-      gl_type = GL_UNSIGNED_BYTE_2_3_3_REV;
+      gl_type = GL_UNSIGNED_BYTE_3_3_2;
       break;
     case IMGFMT_BGR15:
       gl_format = GL_BGRA;
-      gl_type = GL_UNSIGNED_SHORT_5_5_5_1;
+      gl_type = GL_UNSIGNED_SHORT_1_5_5_5_REV;
       break;
     case IMGFMT_BGR16:
       gl_format = GL_RGB;
-      gl_type = GL_UNSIGNED_SHORT_5_6_5_REV;
+      gl_type = GL_UNSIGNED_SHORT_5_6_5;
       break;
     case IMGFMT_BGR24:
       gl_format = GL_BGR;
       gl_type = GL_UNSIGNED_BYTE;
       break;
-    case IMGFMT_BGR32:
+    case IMGFMT_BGRA:
       gl_texfmt = 4;
       gl_format = GL_BGRA;
       gl_type = GL_UNSIGNED_BYTE;
@@ -340,7 +340,7 @@
 static uint32_t
 query_format(uint32_t format)
 {
-    if ((format == IMGFMT_RGB24) || (format == IMGFMT_RGB32))
+    if ((format == IMGFMT_RGB24) || (format == IMGFMT_RGBA))
         return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW;
     if (many_fmts && find_gl_format(format))
         return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW;