diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-27 02:14:42 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-27 02:14:42 +0000 |
| commit | 85c6d6739a81098c35cb35c3430f038ed4f5ddab (patch) | |
| tree | e9302aab1b4368f28f3188087c2cb2d9521b103c /gpu/command_buffer/service/common_decoder.h | |
| parent | 85aa75c358eded70e4ebe9038d5133847d335b7f (diff) | |
| download | chromium_src-85c6d6739a81098c35cb35c3430f038ed4f5ddab.zip chromium_src-85c6d6739a81098c35cb35c3430f038ed4f5ddab.tar.gz chromium_src-85c6d6739a81098c35cb35c3430f038ed4f5ddab.tar.bz2 | |
"/b/slave/chromium-rel-linux/build/src/gpu/command_buffer/client/gles2_demo_cc.cc:50:warning: 'length' may be used uninitialized in this function"
Revert 40193 - Added support for glGetString, glGetShaderSource,
glGetProgramInfoLog and glGetShaderInfoLog
This turned up lots of issues.
* glGetShaderiv needed to be wrapped so it
returns the size of the shader the user passed
in. Not the munged shader sent to GL.
* Another issue that came up is that client
side validation is needed to ensure that
the client side GLES2Implementation does not
generate bad commands. For example, calling
glUniform1iv with a negative count would
generate a bad command. The service side
would see that and think the program was
malicious and stop processing commands.
So, that means I had to add some client side
validation and wrap glGetError on the client
side so I can synthisize GL errors there.
TEST=lots of unit tests.
BUG=none
Review URL: http://codereview.chromium.org/661220
TBR=gman@chromium.org
Review URL: http://codereview.chromium.org/660229
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40198 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/service/common_decoder.h')
| -rw-r--r-- | gpu/command_buffer/service/common_decoder.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gpu/command_buffer/service/common_decoder.h b/gpu/command_buffer/service/common_decoder.h index 9ea0d6f..2300e5a 100644 --- a/gpu/command_buffer/service/common_decoder.h +++ b/gpu/command_buffer/service/common_decoder.h @@ -57,7 +57,7 @@ class CommonDecoder : public AsyncAPIInterface { // Gets a pointer to a section the bucket. Returns NULL if offset or size is // out of range. - void* GetData(size_t offset, size_t size) const; + const void* GetData(size_t offset, size_t size) const; template <typename T> T GetDataAs(size_t offset, size_t size) const { @@ -71,8 +71,7 @@ class CommonDecoder : public AsyncAPIInterface { // Returns false if offset or size is out of range. bool SetData(const void* src, size_t offset, size_t size); - // Sets the bucket data from a string. Strings are passed NULL terminated to - // distinguish between empty string and no string. + // Sets the bucket data from a string. void SetFromString(const std::string& str); private: |