diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-12 00:11:25 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-12 00:11:25 +0000 |
| commit | a7a27ace0760f1ed19016822a45c6ec5300e861c (patch) | |
| tree | b7641f10c9fb3130c0ae8f50e7223db2ae722cda /gpu/command_buffer/common/gles2_cmd_format.h | |
| parent | 82017272e7272182443d7054911c4f890346353e (diff) | |
| download | chromium_src-a7a27ace0760f1ed19016822a45c6ec5300e861c.zip chromium_src-a7a27ace0760f1ed19016822a45c6ec5300e861c.tar.gz chromium_src-a7a27ace0760f1ed19016822a45c6ec5300e861c.tar.bz2 | |
Added CommandBufferProxy, CommandBufferStub. Replaced NPAPI with IPC for synchronous messages. WebPluginDelegateImpl can instantiate a command buffer. Removed remaining dependencies on NPAPI.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/465040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34397 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/common/gles2_cmd_format.h')
| -rw-r--r-- | gpu/command_buffer/common/gles2_cmd_format.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gpu/command_buffer/common/gles2_cmd_format.h b/gpu/command_buffer/common/gles2_cmd_format.h index 6e3a09b..4fcd273 100644 --- a/gpu/command_buffer/common/gles2_cmd_format.h +++ b/gpu/command_buffer/common/gles2_cmd_format.h @@ -4,8 +4,8 @@ // This file defines the GLES2 command buffer commands. -#ifndef GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H -#define GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H +#ifndef GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H_ +#define GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H_ // This is here because service side code must include the system's version of // the GL headers where as client side code includes the Chrome version. @@ -24,7 +24,7 @@ #include "gpu/command_buffer/common/cmd_buffer_common.h" #include "gpu/command_buffer/common/gles2_cmd_ids.h" -namespace command_buffer { +namespace gpu { namespace gles2 { #include "gpu/command_buffer/common/gles2_cmd_format_autogen.h" @@ -69,7 +69,7 @@ struct GetAttribLocation { return NextCmdAddress<ValueType>(cmd); } - command_buffer::CommandHeader header; + gpu::CommandHeader header; uint32 program; uint32 name_shm_id; uint32 name_shm_offset; @@ -132,7 +132,7 @@ struct GetAttribLocationImmediate { return NextImmediateCmdAddressTotalSize<ValueType>(cmd, total_size); } - command_buffer::CommandHeader header; + gpu::CommandHeader header; uint32 program; uint32 location_shm_id; uint32 location_shm_offset; @@ -189,7 +189,7 @@ struct GetUniformLocation { return NextCmdAddress<ValueType>(cmd); } - command_buffer::CommandHeader header; + gpu::CommandHeader header; uint32 program; uint32 name_shm_id; uint32 name_shm_offset; @@ -252,7 +252,7 @@ struct GetUniformLocationImmediate { return NextImmediateCmdAddressTotalSize<ValueType>(cmd, total_size); } - command_buffer::CommandHeader header; + gpu::CommandHeader header; uint32 program; uint32 location_shm_id; uint32 location_shm_offset; @@ -275,7 +275,7 @@ COMPILE_ASSERT(offsetof(GetUniformLocationImmediate, data_size) == 16, } // namespace gles2 -} // namespace command_buffer +} // namespace gpu -#endif // GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H +#endif // GPU_COMMAND_BUFFER_COMMON_GLES2_CMD_FORMAT_H_ |