diff options
| author | neb@chromium.org <neb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 23:52:22 +0000 |
|---|---|---|
| committer | neb@chromium.org <neb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 23:52:22 +0000 |
| commit | d6c997fe9d62350b0923a4b2cb3838db1b049b26 (patch) | |
| tree | 2cd87d27a3cf45af5f183a164fbe0734ef35c608 /gpu | |
| parent | c60e248d33e970d2cedce183f8e5db34961b28d3 (diff) | |
| download | chromium_src-d6c997fe9d62350b0923a4b2cb3838db1b049b26.zip chromium_src-d6c997fe9d62350b0923a4b2cb3838db1b049b26.tar.gz chromium_src-d6c997fe9d62350b0923a4b2cb3838db1b049b26.tar.bz2 | |
Fixes to allow building with -pedantic.
NaCl builds the CommandBuffer sources with -pedantic.
BUG=NaCl:1420
TEST=Compiling NaCl's SDK succeeds without removing -pedantic.
Review URL: http://codereview.chromium.org/6507009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74697 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/client/gles2_implementation.cc | 2 | ||||
| -rw-r--r-- | gpu/command_buffer/common/gles2_cmd_utils.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc index 0d5cd70..88f5499 100644 --- a/gpu/command_buffer/client/gles2_implementation.cc +++ b/gpu/command_buffer/client/gles2_implementation.cc @@ -757,7 +757,7 @@ void GLES2Implementation::GetVertexAttribPointerv( index, pname, result_shm_id(), result_shm_offset()); WaitForCmd(); result->CopyResult(ptr); -}; +} GLint GLES2Implementation::GetAttribLocation( GLuint program, const char* name) { diff --git a/gpu/command_buffer/common/gles2_cmd_utils.cc b/gpu/command_buffer/common/gles2_cmd_utils.cc index a46d420..50108c6 100644 --- a/gpu/command_buffer/common/gles2_cmd_utils.cc +++ b/gpu/command_buffer/common/gles2_cmd_utils.cc @@ -22,7 +22,7 @@ enum GLErrorBit { kInvalidValue = (1 << 1), kInvalidOperation = (1 << 2), kOutOfMemory = (1 << 3), - kInvalidFrameBufferOperation = (1 << 4), + kInvalidFrameBufferOperation = (1 << 4) }; } |