[Mesa-dev] [PATCH] image/pack: fix missing GL_BGR(A)_INTEGER support.

2011-11-27 Thread Dave Airlie
From: Dave Airlie airl...@redhat.com

These codepaths were missing the cases for BGR_INTEGER/BGRA_INTEGER.

Signed-off-by: Dave Airlie airl...@redhat.com
---
 src/mesa/main/image.c |2 ++
 src/mesa/main/pack.c  |2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index ca31e53..72e944e 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -243,12 +243,14 @@ _mesa_components_in_format( GLenum format )
   case GL_RGB:
   case GL_BGR:
   case GL_RGB_INTEGER_EXT:
+  case GL_BGR_INTEGER_EXT:
 return 3;
 
   case GL_RGBA:
   case GL_BGRA:
   case GL_ABGR_EXT:
   case GL_RGBA_INTEGER_EXT:
+  case GL_BGRA_INTEGER_EXT:
  return 4;
 
   default:
diff --git a/src/mesa/main/pack.c b/src/mesa/main/pack.c
index bd85031..4754d34 100644
--- a/src/mesa/main/pack.c
+++ b/src/mesa/main/pack.c
@@ -2291,6 +2291,7 @@ get_component_mapping(GLenum format,
   *aDst = 3;
   break;
case GL_BGR:
+   case GL_BGR_INTEGER:
   *rSrc = 2;
   *gSrc = 1;
   *bSrc = 0;
@@ -2312,6 +2313,7 @@ get_component_mapping(GLenum format,
   *aDst = 3;
   break;
case GL_BGRA:
+   case GL_BGRA_INTEGER:
   *rSrc = 2;
   *gSrc = 1;
   *bSrc = 0;
-- 
1.7.7.3

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] image/pack: fix missing GL_BGR(A)_INTEGER support.

2011-11-27 Thread Eric Anholt
On Sun, 27 Nov 2011 17:37:09 +, Dave Airlie airl...@gmail.com wrote:
 From: Dave Airlie airl...@redhat.com
 
 These codepaths were missing the cases for BGR_INTEGER/BGRA_INTEGER.
 
 Signed-off-by: Dave Airlie airl...@redhat.com

Reviewed-by: Eric Anholt e...@anholt.net


pgpI1qI97kMbt.pgp
Description: PGP signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev