diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-26 00:08:47 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-26 00:08:47 +0000 |
| commit | 9c374dbfeb787d684ffcc397d5a7105eae67dce4 (patch) | |
| tree | 81d9b2be907032fd7f898968bf5edaabe77869bc /gpu/command_buffer/common | |
| parent | 614b4a701aa26a3979f2b0f14ead01c3f3a49423 (diff) | |
| download | chromium_src-9c374dbfeb787d684ffcc397d5a7105eae67dce4.zip chromium_src-9c374dbfeb787d684ffcc397d5a7105eae67dce4.tar.gz chromium_src-9c374dbfeb787d684ffcc397d5a7105eae67dce4.tar.bz2 | |
Adds support for GL_EXT_texture_compression_s3tc,
GL_EXT_texture_filter_anisotropic,
GL_OES_packed_depth_stencil
GL_GOOGLE_depth_texture
TEST=unit tests and ran conformance tests
BUG=53262,53264,53266,53270
Review URL: http://codereview.chromium.org/3135048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/common')
| -rw-r--r-- | gpu/command_buffer/common/gles2_cmd_utils.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gpu/command_buffer/common/gles2_cmd_utils.cc b/gpu/command_buffer/common/gles2_cmd_utils.cc index 6f28bc5..a517c89 100644 --- a/gpu/command_buffer/common/gles2_cmd_utils.cc +++ b/gpu/command_buffer/common/gles2_cmd_utils.cc @@ -6,6 +6,7 @@ // includes where appropriate. #include <GLES2/gl2.h> +#include <GLES2/gl2ext.h> #include <GLES2/gles2_command_buffer.h> #include "../common/gles2_cmd_utils.h" @@ -304,6 +305,7 @@ int ElementsPerGroup(int format, int type) { case GL_UNSIGNED_SHORT_5_6_5: case GL_UNSIGNED_SHORT_4_4_4_4: case GL_UNSIGNED_SHORT_5_5_5_1: + case GL_UNSIGNED_INT_24_8_OES: return 1; default: break; @@ -313,12 +315,13 @@ int ElementsPerGroup(int format, int type) { case GL_RGB: return 3; case GL_LUMINANCE_ALPHA: - return 2; case GL_RGBA: case GL_BGRA_EXT: return 4; case GL_ALPHA: case GL_LUMINANCE: + case GL_DEPTH_COMPONENT: + case GL_DEPTH_STENCIL_OES: return 1; default: return 0; @@ -329,6 +332,7 @@ int ElementsPerGroup(int format, int type) { int BytesPerElement(int type) { switch (type) { case GL_FLOAT: + case GL_UNSIGNED_INT_24_8_OES: return 4; case GL_HALF_FLOAT_OES: case GL_UNSIGNED_SHORT: |