Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

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

Issue 7564013: Roll skia to r2034 (and add new gl bindings) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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
« no previous file with comments | « ui/gfx/gl/gl_interface.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 glCullFace, 46 glCullFace,
47 glDeleteBuffers, 47 glDeleteBuffers,
48 glDeleteProgram, 48 glDeleteProgram,
49 glDeleteShader, 49 glDeleteShader,
50 glDeleteTextures, 50 glDeleteTextures,
51 glDepthMask, 51 glDepthMask,
52 glDisable, 52 glDisable,
53 NULL, // glDisableClientState 53 NULL, // glDisableClientState
54 glDisableVertexAttribArray, 54 glDisableVertexAttribArray,
55 glDrawArrays, 55 glDrawArrays,
56 NULL, // glDrawBuffer
57 NULL, // glDrawBuffers
56 glDrawElements, 58 glDrawElements,
57 glEnable, 59 glEnable,
58 NULL, // glEnableClientState 60 NULL, // glEnableClientState
59 glEnableVertexAttribArray, 61 glEnableVertexAttribArray,
60 glFrontFace, 62 glFrontFace,
61 glGenBuffers, 63 glGenBuffers,
62 glGenTextures, 64 glGenTextures,
63 glGetBufferParameteriv, 65 glGetBufferParameteriv,
64 glGetError, 66 glGetError,
65 glGetIntegerv, 67 glGetIntegerv,
66 glGetProgramInfoLog, 68 glGetProgramInfoLog,
67 glGetProgramiv, 69 glGetProgramiv,
68 glGetShaderInfoLog, 70 glGetShaderInfoLog,
69 glGetShaderiv, 71 glGetShaderiv,
70 glGetString, 72 glGetString,
71 NULL, // glGetTexLevelParameteriv 73 NULL, // glGetTexLevelParameteriv
72 glGetUniformLocation, 74 glGetUniformLocation,
73 glLineWidth, 75 glLineWidth,
74 glLinkProgram, 76 glLinkProgram,
75 NULL, // glLoadMatrixf 77 NULL, // glLoadMatrixf
76 NULL, // glMatrixMode 78 NULL, // glMatrixMode
77 glPixelStorei, 79 glPixelStorei,
78 NULL, // glPointSize 80 NULL, // glPointSize
81 NULL, // glReadBuffer
79 glReadPixels, 82 glReadPixels,
80 glScissor, 83 glScissor,
81 NULL, // glShadeModel 84 NULL, // glShadeModel
82 glShaderSource, 85 glShaderSource,
83 glStencilFunc, 86 glStencilFunc,
84 glStencilFuncSeparate, 87 glStencilFuncSeparate,
85 glStencilMask, 88 glStencilMask,
86 glStencilMaskSeparate, 89 glStencilMaskSeparate,
87 glStencilOp, 90 glStencilOp,
88 glStencilOpSeparate, 91 glStencilOpSeparate,
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 }; 141 };
139 static bool host_StubGL_initialized = false; 142 static bool host_StubGL_initialized = false;
140 if (!host_StubGL_initialized) { 143 if (!host_StubGL_initialized) {
141 GrGLSetGLInterface(&cmd_buffer_interface); 144 GrGLSetGLInterface(&cmd_buffer_interface);
142 host_StubGL_initialized = true; 145 host_StubGL_initialized = true;
143 } 146 }
144 } 147 }
145 148
146 } // namespace webkit_glue 149 } // namespace webkit_glue
147 150
OLDNEW
« no previous file with comments | « ui/gfx/gl/gl_interface.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698