commit 42b8b908e68b8535d0b6fff771bc55312c2cfc8f
author Geoff Lang <geoff.lang@transgaming.com> Wed Jun 05 16:08:21 2013 -0400
committer Shannon Woods <shannonwoods@chromium.org> Fri Jul 19 18:04:46 2013 -0400
tree 06fee30ef53e299fd45b1df494ceaa86754f2362
parent 18591b7c703b5ffeebcc9814554e807edd0ebb01

Fixed a bug where GL_RBG565 was labled as a GL_RGBA internal format.

TRAC #23279

Signed-off-by: Jamie Madill
Signed-off-by: Shannon Woods
Author: Geoff Lang

src/libGLESv2/formatutils.cpp

diff --git a/src/libGLESv2/formatutils.cpp b/src/libGLESv2/formatutils.cpp
index 538332a..7e4c330 100644
--- a/src/libGLESv2/formatutils.cpp
+++ b/src/libGLESv2/formatutils.cpp
@@ -710,7 +710,7 @@
     //                               |                        |                              |   |   |   |   |  |                 |                          | type                |      | renderable    | filterable     |                |
     map.insert(InternalFormatInfoPair(GL_RGBA4,                InternalFormatInfo::RGBAFormat( 4,  4,  4,  4, 0, GL_RGBA,          GL_UNSIGNED_SHORT_4_4_4_4, NormalizedFixedPoint, false, AlwaysSupported, AlwaysSupported, AlwaysSupported)));
     map.insert(InternalFormatInfoPair(GL_RGB5_A1,              InternalFormatInfo::RGBAFormat( 5,  5,  5,  1, 0, GL_RGBA,          GL_UNSIGNED_SHORT_5_5_5_1, NormalizedFixedPoint, false, AlwaysSupported, AlwaysSupported, AlwaysSupported)));
-    map.insert(InternalFormatInfoPair(GL_RGB565,               InternalFormatInfo::RGBAFormat( 5,  6,  5,  0, 0, GL_RGBA,          GL_UNSIGNED_SHORT_5_6_5,   NormalizedFixedPoint, false, AlwaysSupported, AlwaysSupported, AlwaysSupported)));
+    map.insert(InternalFormatInfoPair(GL_RGB565,               InternalFormatInfo::RGBAFormat( 5,  6,  5,  0, 0, GL_RGB,           GL_UNSIGNED_SHORT_5_6_5,   NormalizedFixedPoint, false, AlwaysSupported, AlwaysSupported, AlwaysSupported)));
 
     // Extension formats
     map.insert(InternalFormatInfoPair(GL_RGB8_OES,             InternalFormatInfo::RGBAFormat( 8,  8,  8,  0, 0, GL_RGB,           GL_UNSIGNED_BYTE,          NormalizedFixedPoint, false, AlwaysSupported, AlwaysSupported, AlwaysSupported)));