diff options
| author | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-04 20:28:09 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-04 20:28:09 +0000 |
| commit | 0df8deee0144377853bb1fc214f5b5d7ce4331a0 (patch) | |
| tree | 3f114f36c57c8551e3fcf652b599e92b4f9f3f8c /webkit/glue | |
| parent | 6a160e7875ec2b1b6003480c4a61ba236a649a24 (diff) | |
| download | chromium_src-0df8deee0144377853bb1fc214f5b5d7ce4331a0.zip chromium_src-0df8deee0144377853bb1fc214f5b5d7ce4331a0.tar.gz chromium_src-0df8deee0144377853bb1fc214f5b5d7ce4331a0.tar.bz2 | |
Roll skia to r1241.
Adds functions to GL interface table. Use static initializer syntax for in-proccess bindings (more likely to see compiler errors when skia struct is changed without correspsonding update to gl_bindings_in_process.cc)
Review URL: http://codereview.chromium.org/6931005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84113 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue')
| -rw-r--r-- | webkit/glue/gl_bindings_skia_cmd_buffer.cc | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/webkit/glue/gl_bindings_skia_cmd_buffer.cc b/webkit/glue/gl_bindings_skia_cmd_buffer.cc index 06010cb..c7f8d4f 100644 --- a/webkit/glue/gl_bindings_skia_cmd_buffer.cc +++ b/webkit/glue/gl_bindings_skia_cmd_buffer.cc @@ -84,10 +84,25 @@ void BindSkiaToCommandBufferGL() { glTexImage2D, glTexParameteri, glTexSubImage2D, - glUniform1fv, + glUniform1f, glUniform1i, + glUniform1fv, + glUniform1iv, + glUniform2f, + glUniform2i, + glUniform2fv, + glUniform2iv, + glUniform3f, + glUniform3i, + glUniform3fv, + glUniform3iv, + glUniform4f, + glUniform4i, glUniform4fv, + glUniform4iv, + glUniformMatrix2fv, glUniformMatrix3fv, + glUniformMatrix4fv, glUseProgram, glVertexAttrib4fv, glVertexAttribPointer, |