webkit/glue/gl_bindings_skia_cmd_buffer.cc - Issue 10441122: Roll Skia to r4102.

Side by Side Diff: webkit/glue/gl_bindings_skia_cmd_buffer.cc

Issue 10441122: Roll Skia to r4102. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5	5

6 #include "webkit/glue/gl_bindings_skia_cmd_buffer.h"	6 #include "webkit/glue/gl_bindings_skia_cmd_buffer.h"

7	7

8 #ifndef GL_GLEXT_PROTOTYPES	8 #ifndef GL_GLEXT_PROTOTYPES

9 #define GL_GLEXT_PROTOTYPES	9 #define GL_GLEXT_PROTOTYPES

10 #endif	10 #endif

(...skipping 56 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
67 interface->fScissor = glScissor;	67 interface->fScissor = glScissor;

68 interface->fShaderSource = glShaderSource;	68 interface->fShaderSource = glShaderSource;

69 interface->fStencilFunc = glStencilFunc;	69 interface->fStencilFunc = glStencilFunc;

70 interface->fStencilFuncSeparate = glStencilFuncSeparate;	70 interface->fStencilFuncSeparate = glStencilFuncSeparate;

71 interface->fStencilMask = glStencilMask;	71 interface->fStencilMask = glStencilMask;

72 interface->fStencilMaskSeparate = glStencilMaskSeparate;	72 interface->fStencilMaskSeparate = glStencilMaskSeparate;

73 interface->fStencilOp = glStencilOp;	73 interface->fStencilOp = glStencilOp;

74 interface->fStencilOpSeparate = glStencilOpSeparate;	74 interface->fStencilOpSeparate = glStencilOpSeparate;

75 interface->fTexImage2D = glTexImage2D;	75 interface->fTexImage2D = glTexImage2D;

76 interface->fTexParameteri = glTexParameteri;	76 interface->fTexParameteri = glTexParameteri;

	77 interface->fTexParameteriv = glTexParameteriv;

77 interface->fTexStorage2D = glTexStorage2DEXT;	78 interface->fTexStorage2D = glTexStorage2DEXT;

78 interface->fTexSubImage2D = glTexSubImage2D;	79 interface->fTexSubImage2D = glTexSubImage2D;

79 interface->fUniform1f = glUniform1f;	80 interface->fUniform1f = glUniform1f;

80 interface->fUniform1i = glUniform1i;	81 interface->fUniform1i = glUniform1i;

81 interface->fUniform1fv = glUniform1fv;	82 interface->fUniform1fv = glUniform1fv;

82 interface->fUniform1iv = glUniform1iv;	83 interface->fUniform1iv = glUniform1iv;

83 interface->fUniform2f = glUniform2f;	84 interface->fUniform2f = glUniform2f;

84 interface->fUniform2i = glUniform2i;	85 interface->fUniform2i = glUniform2i;

85 interface->fUniform2fv = glUniform2fv;	86 interface->fUniform2fv = glUniform2fv;

86 interface->fUniform2iv = glUniform2iv;	87 interface->fUniform2iv = glUniform2iv;

(...skipping 25 matching lines...) Expand all Loading...
112 glGetFramebufferAttachmentParameteriv;	113 glGetFramebufferAttachmentParameteriv;

113 interface->fGetRenderbufferParameteriv = glGetRenderbufferParameteriv;	114 interface->fGetRenderbufferParameteriv = glGetRenderbufferParameteriv;

114 interface->fRenderbufferStorage = glRenderbufferStorage;	115 interface->fRenderbufferStorage = glRenderbufferStorage;

115 interface->fRenderbufferStorageMultisample =	116 interface->fRenderbufferStorageMultisample =

116 glRenderbufferStorageMultisampleEXT;	117 glRenderbufferStorageMultisampleEXT;

117 interface->fBlitFramebuffer = glBlitFramebufferEXT;	118 interface->fBlitFramebuffer = glBlitFramebufferEXT;

118 return interface;	119 return interface;

119 }	120 }

120	121

121 } // namespace webkit_glue	122 } // namespace webkit_glue

OLD	NEW

« no previous file with comments | « ui/gl/gl_bindings_skia_in_process.cc ('k') | no next file » | no next file with comments »