diff options
author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 04:51:22 +0000 |
---|---|---|
committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-12 04:51:22 +0000 |
commit | d42398570e13c364a7f403fc9685ddb437b194f4 (patch) | |
tree | 739c99463efc13bec23138869d3baf9a4d3cc0de /gpu/GLES2 | |
parent | e505713377b0ec2e061933ab181854062cb16ffc (diff) | |
download | chromium_src-d42398570e13c364a7f403fc9685ddb437b194f4.zip chromium_src-d42398570e13c364a7f403fc9685ddb437b194f4.tar.gz chromium_src-d42398570e13c364a7f403fc9685ddb437b194f4.tar.bz2 |
Rename and document glCommandBufferEnableCHROMIUM
moved to gl2ext.h. Got rid of gles2_command_buffer.h
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7623001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96507 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/GLES2')
-rwxr-xr-x | gpu/GLES2/extensions/CHROMIUM/CHROMIUM_enable_feature.txt | 67 | ||||
-rw-r--r-- | gpu/GLES2/gl2ext.h | 13 | ||||
-rw-r--r-- | gpu/GLES2/gles2_command_buffer.h | 38 |
3 files changed, 80 insertions, 38 deletions
diff --git a/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_enable_feature.txt b/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_enable_feature.txt new file mode 100755 index 0000000..100cf0c --- /dev/null +++ b/gpu/GLES2/extensions/CHROMIUM/CHROMIUM_enable_feature.txt @@ -0,0 +1,67 @@ +Name + + CHROMIUM_enable_feature + +Name Strings + + GL_CHROMIUM_enable_feature + +Version + + Last Modifed Date: August 11, 2011 + +Dependencies + + OpenGL ES 2.0 is required. + +Overview + + This extension allows certain optional features to be turned on in + the Chromium OpenGL ES 2.0 implementation. + +Issues + + +New Tokens + + None + +New Procedures and Functions + + CommandBufferEnableCHROMIUM(const GLchar *feature) + + <feature> is a null terminated string of the feature you wish to enable. + The requestable feature strings are as follows: + + Note: If used this function MUST be called before any other GL commands + except GetString. Calling any other functions first will result in + undefined behavior. + + pepper3d_allow_buffers_on_mulitple_targets + + OpenGL ES 2.0 allows a single buffer to be bound to both the ARRAY_BUFFER + and ELEMENT_ARRAY_BUFFER bind points. By default Chromium does not allow + this. + + This feature is only provided for full OpenGL ES 2.0 compatibility. It is + expensive to use and should generally be avoided. + + pepper3d_support_fixed_attribs + + Turns on support for the type GL_FIXED. By default this feature is off in + Chromium. + + This feature is only provided for full OpenGL ES 2.0 compatibility. It is + expensive to use and should generally be avoided. + +Errors + + None. + +New State + + None. + +Revision History + + 8/11/2011 Documented the extension diff --git a/gpu/GLES2/gl2ext.h b/gpu/GLES2/gl2ext.h index 68773a4..fe9d2f4 100644 --- a/gpu/GLES2/gl2ext.h +++ b/gpu/GLES2/gl2ext.h @@ -1046,6 +1046,19 @@ typedef void (GL_APIENTRYP PFNGLGETPROGRAMINFOCHROMIUM) (); #define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 #endif +/* GL_CHROMIUM_enable_feature */ +#ifndef GL_CHROMIUM_enable_feature +#define GL_CHROMIUM_enable_feature 1 +#ifdef GL_GLEXT_PROTOTYPES +#define glEnableFeatureCHROMIUM GLES2_GET_FUN(EnableFeatureCHROMIUM) +#if !defined(GLES2_USE_CPP_BINDINGS) +GL_APICALL void GL_APIENTRY glEnableFeatureCHROMIUM (const GLchar *feature); +#endif +#else +typedef void (GL_APIENTRYP PFNGLENABLEFEATURECHROMIUM) (const GLchar *feature); +#endif +#endif + /* GL_ARB_robustness */ /* This extension is subsetted for the moment, incorporating only the * enums necessary to describe the reasons that we might encounter for diff --git a/gpu/GLES2/gles2_command_buffer.h b/gpu/GLES2/gles2_command_buffer.h deleted file mode 100644 index c027afd..0000000 --- a/gpu/GLES2/gles2_command_buffer.h +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// This file defines constants and functions for the Pepper gles2 command -// buffers that fall outside the scope of OpenGL ES 2.0 - -#ifndef GPU_GLES2_GLES2_COMMAND_BUFFER_H_ -#define GPU_GLES2_GLES2_COMMAND_BUFFER_H_ - -// constants for CommandBufferEnableCHROMIUM command. -#define PEPPER3D_ALLOW_BUFFERS_ON_MULTIPLE_TARGETS \ - "pepper3d_allow_buffers_on_multiple_targets" -#define PEPPER3D_SUPPORT_FIXED_ATTRIBS \ - "pepper3d_support_fixed_attribs" -// TODO(gman): remove this -#define PEPPER3D_SKIP_GLSL_TRANSLATION \ - "pepper3d_skip_glsl_translation" - -// TODO(gman): move this somewhere else. -#ifndef GL_READ_ONLY -#define GL_READ_ONLY 0x88B8 -#endif -#ifndef GL_WRITE_ONLY -#define GL_WRITE_ONLY 0x88B9 -#endif -#ifndef GL_BGRA_EXT -#define GL_BGRA_EXT 0x80E1 -#endif -#ifndef GL_HALF_FLOAT_OES -#define GL_HALF_FLOAT_OES 0x8D61 -#endif - -#endif // GPU_GLES2_GLES2_COMMAND_BUFFER_H_ - - - - |