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/command_buffer/client | |
| 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/command_buffer/client')
5 files changed, 11 insertions, 13 deletions
diff --git a/gpu/command_buffer/client/gles2_c_lib_autogen.h b/gpu/command_buffer/client/gles2_c_lib_autogen.h index fdd781e..6e2dd2b 100644 --- a/gpu/command_buffer/client/gles2_c_lib_autogen.h +++ b/gpu/command_buffer/client/gles2_c_lib_autogen.h @@ -534,8 +534,8 @@ void GLES2RegisterSharedIdsCHROMIUM( GLuint namespace_id, GLsizei n, const GLuint* ids) { gles2::GetGLContext()->RegisterSharedIdsCHROMIUM(namespace_id, n, ids); } -GLboolean GLES2CommandBufferEnableCHROMIUM(const char* feature) { - return gles2::GetGLContext()->CommandBufferEnableCHROMIUM(feature); +GLboolean GLES2EnableFeatureCHROMIUM(const char* feature) { + return gles2::GetGLContext()->EnableFeatureCHROMIUM(feature); } void* GLES2MapBufferSubDataCHROMIUM( GLuint target, GLintptr offset, GLsizeiptr size, GLenum access) { diff --git a/gpu/command_buffer/client/gles2_cmd_helper_autogen.h b/gpu/command_buffer/client/gles2_cmd_helper_autogen.h index 010443c..d6d1654 100644 --- a/gpu/command_buffer/client/gles2_cmd_helper_autogen.h +++ b/gpu/command_buffer/client/gles2_cmd_helper_autogen.h @@ -1188,10 +1188,10 @@ c.Init(namespace_id, n, ids_shm_id, ids_shm_offset); } - void CommandBufferEnableCHROMIUM( + void EnableFeatureCHROMIUM( GLuint bucket_id, uint32 result_shm_id, uint32 result_shm_offset) { - gles2::CommandBufferEnableCHROMIUM& c = - GetCmdSpace<gles2::CommandBufferEnableCHROMIUM>(); + gles2::EnableFeatureCHROMIUM& c = + GetCmdSpace<gles2::EnableFeatureCHROMIUM>(); c.Init(bucket_id, result_shm_id, result_shm_offset); } diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc index 0c052ce..fc4f547 100644 --- a/gpu/command_buffer/client/gles2_implementation.cc +++ b/gpu/command_buffer/client/gles2_implementation.cc @@ -7,7 +7,6 @@ #include "../client/gles2_implementation.h" #include <GLES2/gl2ext.h> -#include <GLES2/gles2_command_buffer.h> #include "../client/mapped_memory.h" #include "../client/program_info_manager.h" #include "../common/gles2_cmd_utils.h" @@ -2148,16 +2147,16 @@ void GLES2Implementation::GetVertexAttribiv( }); } -GLboolean GLES2Implementation::CommandBufferEnableCHROMIUM( +GLboolean GLES2Implementation::EnableFeatureCHROMIUM( const char* feature) { - GPU_CLIENT_LOG("[" << this << "] glCommandBufferEnableCHROMIUM(" + GPU_CLIENT_LOG("[" << this << "] glEnableFeatureCHROMIUM(" << feature << ")"); - TRACE_EVENT0("gpu", "GLES2::CommandBufferEnableCHROMIUM"); - typedef CommandBufferEnableCHROMIUM::Result Result; + TRACE_EVENT0("gpu", "GLES2::EnableFeatureCHROMIUM"); + typedef EnableFeatureCHROMIUM::Result Result; Result* result = GetResultAs<Result*>(); *result = 0; SetBucketAsCString(kResultBucketId, feature); - helper_->CommandBufferEnableCHROMIUM( + helper_->EnableFeatureCHROMIUM( kResultBucketId, result_shm_id(), result_shm_offset()); WaitForCmd(); helper_->SetBucketSize(kResultBucketId, 0); diff --git a/gpu/command_buffer/client/gles2_implementation_autogen.h b/gpu/command_buffer/client/gles2_implementation_autogen.h index f0c5c4d..702ad02 100644 --- a/gpu/command_buffer/client/gles2_implementation_autogen.h +++ b/gpu/command_buffer/client/gles2_implementation_autogen.h @@ -1253,7 +1253,7 @@ void DeleteSharedIdsCHROMIUM( void RegisterSharedIdsCHROMIUM( GLuint namespace_id, GLsizei n, const GLuint* ids); -GLboolean CommandBufferEnableCHROMIUM(const char* feature); +GLboolean EnableFeatureCHROMIUM(const char* feature); void* MapBufferSubDataCHROMIUM( GLuint target, GLintptr offset, GLsizeiptr size, GLenum access); diff --git a/gpu/command_buffer/client/gles2_implementation_unittest.cc b/gpu/command_buffer/client/gles2_implementation_unittest.cc index c526d76..68ae339 100644 --- a/gpu/command_buffer/client/gles2_implementation_unittest.cc +++ b/gpu/command_buffer/client/gles2_implementation_unittest.cc @@ -8,7 +8,6 @@ #include <GLES2/gl2ext.h> #include "gpu/command_buffer/common/command_buffer.h" -#include "gpu/GLES2/gles2_command_buffer.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" |