diff options
| author | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-07 21:56:35 +0000 |
|---|---|---|
| committer | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-07 21:56:35 +0000 |
| commit | 2c39338321bfcd99727813c9ae55f8ad4927b5df (patch) | |
| tree | 1eea41b63b3287bf2fc47f895e9609d72b25b692 /gpu | |
| parent | 7cc0d975aa61af7374044c7d8ae489a54915c15d (diff) | |
| download | chromium_src-2c39338321bfcd99727813c9ae55f8ad4927b5df.zip chromium_src-2c39338321bfcd99727813c9ae55f8ad4927b5df.tar.gz chromium_src-2c39338321bfcd99727813c9ae55f8ad4927b5df.tar.bz2 | |
Move gles2 extensions out of dev.
BUG=none
TEST=simple usage test in nacl
Review URL: https://chromiumcodereview.appspot.com/10354004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135735 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rwxr-xr-x | gpu/command_buffer/build_gles2_cmd_buffer.py | 12 | ||||
| -rw-r--r-- | gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gpu/command_buffer/build_gles2_cmd_buffer.py b/gpu/command_buffer/build_gles2_cmd_buffer.py index abc2e69..f0087c8 100755 --- a/gpu/command_buffer/build_gles2_cmd_buffer.py +++ b/gpu/command_buffer/build_gles2_cmd_buffer.py @@ -758,12 +758,12 @@ _ENUM_LISTS = { # GL commands. 'dev' is true if it's a dev interface. _PEPPER_INTERFACES = [ {'name': '', 'dev': False}, - {'name': 'InstancedArrays', 'dev': True}, - {'name': 'FramebufferBlit', 'dev': True}, - {'name': 'FramebufferMultisample', 'dev': True}, - {'name': 'ChromiumEnableFeature', 'dev': True}, - {'name': 'ChromiumMapSub', 'dev': True}, - {'name': 'Query', 'dev': True}, + {'name': 'InstancedArrays', 'dev': False}, + {'name': 'FramebufferBlit', 'dev': False}, + {'name': 'FramebufferMultisample', 'dev': False}, + {'name': 'ChromiumEnableFeature', 'dev': False}, + {'name': 'ChromiumMapSub', 'dev': False}, + {'name': 'Query', 'dev': False}, ] # This table specifies types and other special data for the commands that diff --git a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h index 5fb03f7..bea92a4 100644 --- a/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h +++ b/gpu/command_buffer/common/gles2_cmd_utils_implementation_autogen.h @@ -224,7 +224,7 @@ static GLES2Util::EnumToString enum_to_string_table[] = { { 0x00000400, "GL_STENCIL_BUFFER_BIT", }, { 0x800A, "GL_FUNC_SUBTRACT", }, { 0x8E2C, "GL_DEPTH_COMPONENT16_NONLINEAR_NV", }, - { 0x8508, "GL_DECR_WRAP", }, + { 0x889F, "GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING", }, { 0x8006, "GL_FUNC_ADD", }, { 0x8007, "GL_MIN_EXT", }, { 0x8004, "GL_ONE_MINUS_CONSTANT_ALPHA", }, @@ -500,7 +500,7 @@ static GLES2Util::EnumToString enum_to_string_table[] = { { 0x8CD6, "GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT", }, { 0x8253, "GL_GUILTY_CONTEXT_RESET_EXT", }, { 0x8872, "GL_MAX_TEXTURE_IMAGE_UNITS", }, - { 0x889F, "GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING", }, + { 0x8508, "GL_DECR_WRAP", }, { 0x8507, "GL_INCR_WRAP", }, { 0x8895, "GL_ELEMENT_ARRAY_BUFFER_BINDING", }, { 0x8894, "GL_ARRAY_BUFFER_BINDING", }, |