commit 5127803f5cd781675b02ae259f3c214bf9f45e34
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Oct 17 18:22:51 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Oct 17 18:22:51 2012 +0000
tree 7e0179d60ae703d21a1f00ef2b634bb04226a83d
parent 6b1a0a0c62bd296364adb6508faad040d350fa71

Don't promote packed RGB textures to RGBA d3d surfaces.

TRAC #21591
Issue=362

Signed-off-by: Daniel Koch

Author: Shannon Woods

git-svn-id: https://angleproject.googlecode.com/svn/trunk@1305 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/common/version.h

diff --git a/src/common/version.h b/src/common/version.h
index 68ab790..3d8bbe8 100644
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -1,7 +1,7 @@
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 1299
+#define BUILD_REVISION 1305
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/libGLESv2/Texture.cpp

diff --git a/src/libGLESv2/Texture.cpp b/src/libGLESv2/Texture.cpp
index beb4205..8f4488e 100644
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -68,6 +68,7 @@
         }
         break;
       case GL_RGB8_OES:
+      case GL_RGB565:
         return D3DFMT_X8R8G8B8;
     }