diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-23 23:02:09 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-23 23:02:09 +0000 |
| commit | d595fa2e4e1d9588349798cb5c1f119d622420ca (patch) | |
| tree | 8d493b8190a4a674e72e0633fdfe2e12c7bbcd7a /gpu | |
| parent | 2e6720abaa059f0964d26d7a0dc5536510bf833f (diff) | |
| download | chromium_src-d595fa2e4e1d9588349798cb5c1f119d622420ca.zip chromium_src-d595fa2e4e1d9588349798cb5c1f119d622420ca.tar.gz chromium_src-d595fa2e4e1d9588349798cb5c1f119d622420ca.tar.bz2 | |
linux: gles2 client fixes
Review URL: http://codereview.chromium.org/518011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/client/gles2_demo_cc.cc | 5 | ||||
| -rw-r--r-- | gpu/command_buffer/client/gles2_implementation.cc | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/gpu/command_buffer/client/gles2_demo_cc.cc b/gpu/command_buffer/client/gles2_demo_cc.cc index b4c6239..0478e32 100644 --- a/gpu/command_buffer/client/gles2_demo_cc.cc +++ b/gpu/command_buffer/client/gles2_demo_cc.cc @@ -10,8 +10,6 @@ namespace { -int g_width = 512; -int g_height = 512; GLuint g_texture = 0; int g_textureLoc = -1; GLuint g_programObject = 0; @@ -189,6 +187,3 @@ void GLFromCPPTestFunction() { } Draw(); } - - - diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc index 576a1e6..f792977 100644 --- a/gpu/command_buffer/client/gles2_implementation.cc +++ b/gpu/command_buffer/client/gles2_implementation.cc @@ -17,6 +17,10 @@ static GLuint ToGLuint(const void* ptr) { return static_cast<GLuint>(reinterpret_cast<size_t>(ptr)); } +#if !defined(COMPILER_MSVC) +const size_t GLES2Implementation::kMaxSizeOfSimpleResult; +#endif + GLES2Implementation::GLES2Implementation( GLES2CmdHelper* helper, size_t transfer_buffer_size, |