From 47e2e367170edec022481f1487cd980e00ef3203 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Sun, 27 Nov 2011 17:16:27 +0000 Subject: [PATCH] image/pack: fix missing GL_BGR(A)_INTEGER support. These codepaths were missing the cases for BGR_INTEGER/BGRA_INTEGER. Signed-off-by: Dave Airlie Reviewed-by: Eric Anholt --- src/mesa/main/image.c | 2 ++ src/mesa/main/pack.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c index ca31e53a8cf..72e944e11ac 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 bd8503168fb..4754d34c646 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; -- 2.30.2