summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/common/gles2_cmd_utils.h
diff options
context:
space:
mode:
authorgman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-27 01:33:44 +0000
committergman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-27 01:33:44 +0000
commit8e2a5abe106158df74caad4c6fbd988d8d900b7c (patch)
tree882455dbf8a278cc8274aaa3ec2df67cf7981c2c /gpu/command_buffer/common/gles2_cmd_utils.h
parent1e7cd2c7c0e52296e9c25a71d652bc6a53413eb7 (diff)
downloadchromium_src-8e2a5abe106158df74caad4c6fbd988d8d900b7c.zip
chromium_src-8e2a5abe106158df74caad4c6fbd988d8d900b7c.tar.gz
chromium_src-8e2a5abe106158df74caad4c6fbd988d8d900b7c.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40193 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer/common/gles2_cmd_utils.h')
-rw-r--r--gpu/command_buffer/common/gles2_cmd_utils.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/gpu/command_buffer/common/gles2_cmd_utils.h b/gpu/command_buffer/common/gles2_cmd_utils.h
index b2da669..99b17e5 100644
--- a/gpu/command_buffer/common/gles2_cmd_utils.h
+++ b/gpu/command_buffer/common/gles2_cmd_utils.h
@@ -34,6 +34,10 @@ class GLES2Util {
static size_t GetGLTypeSizeForTexturesAndBuffers(uint32 type);
+ static uint32 GLErrorToErrorBit(uint32 gl_error);
+
+ static uint32 GLErrorBitToGLError(uint32 error_bit);
+
private:
int num_compressed_texture_formats_;
};