summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer
diff options
context:
space:
mode:
authorgman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 00:27:57 +0000
committergman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 00:27:57 +0000
commit29e8ac9328ea8ea22dd13370ae3fea0073a02feb (patch)
tree0f98db693dd9823fe7ae546b68c705195bb4bc43 /gpu/command_buffer
parent57f360233af2f9d75a2a3fe8204275ab44b4388d (diff)
downloadchromium_src-29e8ac9328ea8ea22dd13370ae3fea0073a02feb.zip
chromium_src-29e8ac9328ea8ea22dd13370ae3fea0073a02feb.tar.gz
chromium_src-29e8ac9328ea8ea22dd13370ae3fea0073a02feb.tar.bz2
Fix for ANGLE and readpixels.
TEST=webgl conformance tests pass BUG=76093 Review URL: http://codereview.chromium.org/6677024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78132 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer')
-rw-r--r--gpu/command_buffer/common/gles2_cmd_utils.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/gpu/command_buffer/common/gles2_cmd_utils.cc b/gpu/command_buffer/common/gles2_cmd_utils.cc
index 50108c6..ddab126 100644
--- a/gpu/command_buffer/common/gles2_cmd_utils.cc
+++ b/gpu/command_buffer/common/gles2_cmd_utils.cc
@@ -512,9 +512,11 @@ uint32 GLES2Util::GetChannelsForFormat(int format) {
case GL_LUMINANCE_ALPHA:
return 0x000F;
case GL_RGB:
+ case GL_RGB8_OES:
case GL_RGB565:
return 0x0007;
case GL_RGBA:
+ case GL_RGBA8_OES:
case GL_RGBA4:
case GL_RGB5_A1:
return 0x000F;