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

Side by Side Diff: src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp

Issue 130423013: Use vertex buffer objects instead of client side arrays in fixed-function codepaths (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 6 years, 10 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
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 #include "gl/GrGLExtensions.h" 9 #include "gl/GrGLExtensions.h"
10 #include "gl/GrGLInterface.h" 10 #include "gl/GrGLInterface.h"
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 extensions.has("GL_ARB_imaging") || 56 extensions.has("GL_ARB_imaging") ||
57 extensions.has("GL_EXT_blend_color")) { 57 extensions.has("GL_EXT_blend_color")) {
58 GR_GL_GET_PROC(BlendColor); 58 GR_GL_GET_PROC(BlendColor);
59 } 59 }
60 60
61 GR_GL_GET_PROC(BufferData); 61 GR_GL_GET_PROC(BufferData);
62 GR_GL_GET_PROC(BufferSubData); 62 GR_GL_GET_PROC(BufferSubData);
63 GR_GL_GET_PROC(Clear); 63 GR_GL_GET_PROC(Clear);
64 GR_GL_GET_PROC(ClearColor); 64 GR_GL_GET_PROC(ClearColor);
65 GR_GL_GET_PROC(ClearStencil); 65 GR_GL_GET_PROC(ClearStencil);
66 GR_GL_GET_PROC(ClientActiveTexture);
67 GR_GL_GET_PROC(ColorMask); 66 GR_GL_GET_PROC(ColorMask);
68 GR_GL_GET_PROC(CompileShader); 67 GR_GL_GET_PROC(CompileShader);
69 GR_GL_GET_PROC(CompressedTexImage2D); 68 GR_GL_GET_PROC(CompressedTexImage2D);
70 GR_GL_GET_PROC(CopyTexSubImage2D); 69 GR_GL_GET_PROC(CopyTexSubImage2D);
71 GR_GL_GET_PROC(CreateProgram); 70 GR_GL_GET_PROC(CreateProgram);
72 GR_GL_GET_PROC(CreateShader); 71 GR_GL_GET_PROC(CreateShader);
73 GR_GL_GET_PROC(CullFace); 72 GR_GL_GET_PROC(CullFace);
74 GR_GL_GET_PROC(DeleteBuffers); 73 GR_GL_GET_PROC(DeleteBuffers);
75 GR_GL_GET_PROC(DeleteProgram); 74 GR_GL_GET_PROC(DeleteProgram);
76 GR_GL_GET_PROC(DeleteQueries); 75 GR_GL_GET_PROC(DeleteQueries);
77 GR_GL_GET_PROC(DeleteShader); 76 GR_GL_GET_PROC(DeleteShader);
78 GR_GL_GET_PROC(DeleteTextures); 77 GR_GL_GET_PROC(DeleteTextures);
79 GR_GL_GET_PROC(DepthMask); 78 GR_GL_GET_PROC(DepthMask);
80 GR_GL_GET_PROC(Disable); 79 GR_GL_GET_PROC(Disable);
81 GR_GL_GET_PROC(DisableClientState);
82 GR_GL_GET_PROC(DisableVertexAttribArray); 80 GR_GL_GET_PROC(DisableVertexAttribArray);
83 GR_GL_GET_PROC(DrawArrays); 81 GR_GL_GET_PROC(DrawArrays);
84 GR_GL_GET_PROC(DrawBuffer); 82 GR_GL_GET_PROC(DrawBuffer);
85 GR_GL_GET_PROC(DrawBuffers); 83 GR_GL_GET_PROC(DrawBuffers);
86 GR_GL_GET_PROC(DrawElements); 84 GR_GL_GET_PROC(DrawElements);
87 GR_GL_GET_PROC(Enable); 85 GR_GL_GET_PROC(Enable);
88 GR_GL_GET_PROC(EnableClientState);
89 GR_GL_GET_PROC(EnableVertexAttribArray); 86 GR_GL_GET_PROC(EnableVertexAttribArray);
90 GR_GL_GET_PROC(EndQuery); 87 GR_GL_GET_PROC(EndQuery);
91 GR_GL_GET_PROC(Finish); 88 GR_GL_GET_PROC(Finish);
92 GR_GL_GET_PROC(Flush); 89 GR_GL_GET_PROC(Flush);
93 GR_GL_GET_PROC(FrontFace); 90 GR_GL_GET_PROC(FrontFace);
94 GR_GL_GET_PROC(GenBuffers); 91 GR_GL_GET_PROC(GenBuffers);
95 GR_GL_GET_PROC(GenerateMipmap); 92 GR_GL_GET_PROC(GenerateMipmap);
96 GR_GL_GET_PROC(GenQueries); 93 GR_GL_GET_PROC(GenQueries);
97 GR_GL_GET_PROC(GetBufferParameteriv); 94 GR_GL_GET_PROC(GetBufferParameteriv);
98 GR_GL_GET_PROC(GetError); 95 GR_GL_GET_PROC(GetError);
(...skipping 28 matching lines...) Expand all
127 GR_GL_GET_PROC(ReadBuffer); 124 GR_GL_GET_PROC(ReadBuffer);
128 GR_GL_GET_PROC(ReadPixels); 125 GR_GL_GET_PROC(ReadPixels);
129 GR_GL_GET_PROC(Scissor); 126 GR_GL_GET_PROC(Scissor);
130 GR_GL_GET_PROC(ShaderSource); 127 GR_GL_GET_PROC(ShaderSource);
131 GR_GL_GET_PROC(StencilFunc); 128 GR_GL_GET_PROC(StencilFunc);
132 GR_GL_GET_PROC(StencilFuncSeparate); 129 GR_GL_GET_PROC(StencilFuncSeparate);
133 GR_GL_GET_PROC(StencilMask); 130 GR_GL_GET_PROC(StencilMask);
134 GR_GL_GET_PROC(StencilMaskSeparate); 131 GR_GL_GET_PROC(StencilMaskSeparate);
135 GR_GL_GET_PROC(StencilOp); 132 GR_GL_GET_PROC(StencilOp);
136 GR_GL_GET_PROC(StencilOpSeparate); 133 GR_GL_GET_PROC(StencilOpSeparate);
137 GR_GL_GET_PROC(TexGenf);
138 GR_GL_GET_PROC(TexGenfv); 134 GR_GL_GET_PROC(TexGenfv);
139 GR_GL_GET_PROC(TexGeni); 135 GR_GL_GET_PROC(TexGeni);
140 GR_GL_GET_PROC(TexImage2D) 136 GR_GL_GET_PROC(TexImage2D)
141 GR_GL_GET_PROC(TexParameteri); 137 GR_GL_GET_PROC(TexParameteri);
142 GR_GL_GET_PROC(TexParameteriv); 138 GR_GL_GET_PROC(TexParameteriv);
143 GR_GL_GET_PROC(TexStorage2D); 139 GR_GL_GET_PROC(TexStorage2D);
144 if (NULL == interface->fFunctions.fTexStorage2D) { 140 if (NULL == interface->fFunctions.fTexStorage2D) {
145 GR_GL_GET_PROC_SUFFIX(TexStorage2D, EXT); 141 GR_GL_GET_PROC_SUFFIX(TexStorage2D, EXT);
146 } 142 }
147 GR_GL_GET_PROC(TexSubImage2D); 143 GR_GL_GET_PROC(TexSubImage2D);
(...skipping 13 matching lines...) Expand all
161 GR_GL_GET_PROC(Uniform4i); 157 GR_GL_GET_PROC(Uniform4i);
162 GR_GL_GET_PROC(Uniform4fv); 158 GR_GL_GET_PROC(Uniform4fv);
163 GR_GL_GET_PROC(Uniform4iv); 159 GR_GL_GET_PROC(Uniform4iv);
164 GR_GL_GET_PROC(UniformMatrix2fv); 160 GR_GL_GET_PROC(UniformMatrix2fv);
165 GR_GL_GET_PROC(UniformMatrix3fv); 161 GR_GL_GET_PROC(UniformMatrix3fv);
166 GR_GL_GET_PROC(UniformMatrix4fv); 162 GR_GL_GET_PROC(UniformMatrix4fv);
167 GR_GL_GET_PROC(UnmapBuffer); 163 GR_GL_GET_PROC(UnmapBuffer);
168 GR_GL_GET_PROC(UseProgram); 164 GR_GL_GET_PROC(UseProgram);
169 GR_GL_GET_PROC(VertexAttrib4fv); 165 GR_GL_GET_PROC(VertexAttrib4fv);
170 GR_GL_GET_PROC(VertexAttribPointer); 166 GR_GL_GET_PROC(VertexAttribPointer);
171 GR_GL_GET_PROC(VertexPointer);
172 GR_GL_GET_PROC(Viewport); 167 GR_GL_GET_PROC(Viewport);
173 168
174 if (glVer >= GR_GL_VER(3,0) || extensions.has("GL_ARB_vertex_array_objec t")) { 169 if (glVer >= GR_GL_VER(3,0) || extensions.has("GL_ARB_vertex_array_objec t")) {
175 // no ARB suffix for GL_ARB_vertex_array_object 170 // no ARB suffix for GL_ARB_vertex_array_object
176 GR_GL_GET_PROC(BindVertexArray); 171 GR_GL_GET_PROC(BindVertexArray);
177 GR_GL_GET_PROC(DeleteVertexArrays); 172 GR_GL_GET_PROC(DeleteVertexArrays);
178 GR_GL_GET_PROC(GenVertexArrays); 173 GR_GL_GET_PROC(GenVertexArrays);
179 } 174 }
180 175
181 // First look for GL3.0 FBO or GL_ARB_framebuffer_object (same since 176 // First look for GL3.0 FBO or GL_ARB_framebuffer_object (same since
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 } 223 }
229 224
230 interface->fStandard = kGL_GrGLStandard; 225 interface->fStandard = kGL_GrGLStandard;
231 interface->fExtensions.swap(&extensions); 226 interface->fExtensions.swap(&extensions);
232 227
233 return interface; 228 return interface;
234 } else { 229 } else {
235 return NULL; 230 return NULL;
236 } 231 }
237 } 232 }
OLDNEW
« no previous file with comments | « src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp ('k') | src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698