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

Side by Side Diff: src/gpu/gl/android/GrGLCreateNativeInterface_android.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, 9 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
« no previous file with comments | « src/gpu/gl/GrGpuGL_program.cpp ('k') | src/gpu/gl/debug/GrGLCreateDebugInterface.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Modified from chromium/src/webkit/glue/gl_bindings_skia_cmd_buffer.cc 1 // Modified from chromium/src/webkit/glue/gl_bindings_skia_cmd_buffer.cc
2 2
3 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 3 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
4 // Use of this source code is governed by a BSD-style license that can be 4 // Use of this source code is governed by a BSD-style license that can be
5 // found in the LICENSE file. 5 // found in the LICENSE file.
6 6
7 #include "gl/GrGLExtensions.h" 7 #include "gl/GrGLExtensions.h"
8 #include "gl/GrGLInterface.h" 8 #include "gl/GrGLInterface.h"
9 #include "gl/GrGLUtil.h" 9 #include "gl/GrGLUtil.h"
10 10
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 functions->fBindVertexArray = (GrGLBindVertexArrayProc) eglGetProcAddress("g lBindVertexArray"); 224 functions->fBindVertexArray = (GrGLBindVertexArrayProc) eglGetProcAddress("g lBindVertexArray");
225 functions->fBlendColor = (GrGLBlendColorProc) eglGetProcAddress("glBlendColo r"); 225 functions->fBlendColor = (GrGLBlendColorProc) eglGetProcAddress("glBlendColo r");
226 functions->fBlendFunc = (GrGLBlendFuncProc) eglGetProcAddress("glBlendFunc") ; 226 functions->fBlendFunc = (GrGLBlendFuncProc) eglGetProcAddress("glBlendFunc") ;
227 functions->fBlitFramebuffer = (GrGLBlitFramebufferProc) eglGetProcAddress("g lBlitFramebuffer"); 227 functions->fBlitFramebuffer = (GrGLBlitFramebufferProc) eglGetProcAddress("g lBlitFramebuffer");
228 functions->fBufferData = (GrGLBufferDataProc) eglGetProcAddress("glBufferDat a"); 228 functions->fBufferData = (GrGLBufferDataProc) eglGetProcAddress("glBufferDat a");
229 functions->fBufferSubData = (GrGLBufferSubDataProc) eglGetProcAddress("glBuf ferSubData"); 229 functions->fBufferSubData = (GrGLBufferSubDataProc) eglGetProcAddress("glBuf ferSubData");
230 functions->fCheckFramebufferStatus = (GrGLCheckFramebufferStatusProc) eglGet ProcAddress("glCheckFramebufferStatus"); 230 functions->fCheckFramebufferStatus = (GrGLCheckFramebufferStatusProc) eglGet ProcAddress("glCheckFramebufferStatus");
231 functions->fClear = (GrGLClearProc) eglGetProcAddress("glClear"); 231 functions->fClear = (GrGLClearProc) eglGetProcAddress("glClear");
232 functions->fClearColor = (GrGLClearColorProc) eglGetProcAddress("glClearColo r"); 232 functions->fClearColor = (GrGLClearColorProc) eglGetProcAddress("glClearColo r");
233 functions->fClearStencil = (GrGLClearStencilProc) eglGetProcAddress("glClear Stencil"); 233 functions->fClearStencil = (GrGLClearStencilProc) eglGetProcAddress("glClear Stencil");
234 functions->fClientActiveTexture = (GrGLClientActiveTextureProc) eglGetProcAd dress("glClientActiveTexture");
235 functions->fColorMask = (GrGLColorMaskProc) eglGetProcAddress("glColorMask") ; 234 functions->fColorMask = (GrGLColorMaskProc) eglGetProcAddress("glColorMask") ;
236 functions->fCompileShader = (GrGLCompileShaderProc) eglGetProcAddress("glCom pileShader"); 235 functions->fCompileShader = (GrGLCompileShaderProc) eglGetProcAddress("glCom pileShader");
237 functions->fCompressedTexImage2D = (GrGLCompressedTexImage2DProc) eglGetProc Address("glCompressedTexImage2D"); 236 functions->fCompressedTexImage2D = (GrGLCompressedTexImage2DProc) eglGetProc Address("glCompressedTexImage2D");
238 functions->fCopyTexSubImage2D = (GrGLCopyTexSubImage2DProc) eglGetProcAddres s("glCopyTexSubImage2D"); 237 functions->fCopyTexSubImage2D = (GrGLCopyTexSubImage2DProc) eglGetProcAddres s("glCopyTexSubImage2D");
239 functions->fCreateProgram = (GrGLCreateProgramProc) eglGetProcAddress("glCre ateProgram"); 238 functions->fCreateProgram = (GrGLCreateProgramProc) eglGetProcAddress("glCre ateProgram");
240 functions->fCreateShader = (GrGLCreateShaderProc) eglGetProcAddress("glCreat eShader"); 239 functions->fCreateShader = (GrGLCreateShaderProc) eglGetProcAddress("glCreat eShader");
241 functions->fCullFace = (GrGLCullFaceProc) eglGetProcAddress("glCullFace"); 240 functions->fCullFace = (GrGLCullFaceProc) eglGetProcAddress("glCullFace");
242 functions->fDeleteBuffers = (GrGLDeleteBuffersProc) eglGetProcAddress("glDel eteBuffers"); 241 functions->fDeleteBuffers = (GrGLDeleteBuffersProc) eglGetProcAddress("glDel eteBuffers");
243 functions->fDeleteFramebuffers = (GrGLDeleteFramebuffersProc) eglGetProcAddr ess("glDeleteFramebuffers"); 242 functions->fDeleteFramebuffers = (GrGLDeleteFramebuffersProc) eglGetProcAddr ess("glDeleteFramebuffers");
244 functions->fDeleteProgram = (GrGLDeleteProgramProc) eglGetProcAddress("glDel eteProgram"); 243 functions->fDeleteProgram = (GrGLDeleteProgramProc) eglGetProcAddress("glDel eteProgram");
245 functions->fDeleteQueries = (GrGLDeleteQueriesProc) eglGetProcAddress("glDel eteQueries"); 244 functions->fDeleteQueries = (GrGLDeleteQueriesProc) eglGetProcAddress("glDel eteQueries");
246 functions->fDeleteRenderbuffers = (GrGLDeleteRenderbuffersProc) eglGetProcAd dress("glDeleteRenderbuffers"); 245 functions->fDeleteRenderbuffers = (GrGLDeleteRenderbuffersProc) eglGetProcAd dress("glDeleteRenderbuffers");
247 functions->fDeleteShader = (GrGLDeleteShaderProc) eglGetProcAddress("glDelet eShader"); 246 functions->fDeleteShader = (GrGLDeleteShaderProc) eglGetProcAddress("glDelet eShader");
248 functions->fDeleteTextures = (GrGLDeleteTexturesProc) eglGetProcAddress("glD eleteTextures"); 247 functions->fDeleteTextures = (GrGLDeleteTexturesProc) eglGetProcAddress("glD eleteTextures");
249 functions->fDeleteVertexArrays = (GrGLDeleteVertexArraysProc) eglGetProcAddr ess("glDeleteVertexArrays"); 248 functions->fDeleteVertexArrays = (GrGLDeleteVertexArraysProc) eglGetProcAddr ess("glDeleteVertexArrays");
250 functions->fDepthMask = (GrGLDepthMaskProc) eglGetProcAddress("glDepthMask") ; 249 functions->fDepthMask = (GrGLDepthMaskProc) eglGetProcAddress("glDepthMask") ;
251 functions->fDisable = (GrGLDisableProc) eglGetProcAddress("glDisable"); 250 functions->fDisable = (GrGLDisableProc) eglGetProcAddress("glDisable");
252 functions->fDisableClientState = (GrGLDisableClientStateProc) eglGetProcAddr ess("glDisableClientState");
253 functions->fDisableVertexAttribArray = (GrGLDisableVertexAttribArrayProc) eg lGetProcAddress("glDisableVertexAttribArray"); 251 functions->fDisableVertexAttribArray = (GrGLDisableVertexAttribArrayProc) eg lGetProcAddress("glDisableVertexAttribArray");
254 functions->fDrawArrays = (GrGLDrawArraysProc) eglGetProcAddress("glDrawArray s"); 252 functions->fDrawArrays = (GrGLDrawArraysProc) eglGetProcAddress("glDrawArray s");
255 functions->fDrawBuffer = (GrGLDrawBufferProc) eglGetProcAddress("glDrawBuffe r"); 253 functions->fDrawBuffer = (GrGLDrawBufferProc) eglGetProcAddress("glDrawBuffe r");
256 functions->fDrawBuffers = (GrGLDrawBuffersProc) eglGetProcAddress("glDrawBuf fers"); 254 functions->fDrawBuffers = (GrGLDrawBuffersProc) eglGetProcAddress("glDrawBuf fers");
257 functions->fDrawElements = (GrGLDrawElementsProc) eglGetProcAddress("glDrawE lements"); 255 functions->fDrawElements = (GrGLDrawElementsProc) eglGetProcAddress("glDrawE lements");
258 functions->fEnable = (GrGLEnableProc) eglGetProcAddress("glEnable"); 256 functions->fEnable = (GrGLEnableProc) eglGetProcAddress("glEnable");
259 functions->fEnableClientState = (GrGLEnableClientStateProc) eglGetProcAddres s("glEnableClientState");
260 functions->fEnableVertexAttribArray = (GrGLEnableVertexAttribArrayProc) eglG etProcAddress("glEnableVertexAttribArray"); 257 functions->fEnableVertexAttribArray = (GrGLEnableVertexAttribArrayProc) eglG etProcAddress("glEnableVertexAttribArray");
261 functions->fEndQuery = (GrGLEndQueryProc) eglGetProcAddress("glEndQuery"); 258 functions->fEndQuery = (GrGLEndQueryProc) eglGetProcAddress("glEndQuery");
262 functions->fFinish = (GrGLFinishProc) eglGetProcAddress("glFinish"); 259 functions->fFinish = (GrGLFinishProc) eglGetProcAddress("glFinish");
263 functions->fFlush = (GrGLFlushProc) eglGetProcAddress("glFlush"); 260 functions->fFlush = (GrGLFlushProc) eglGetProcAddress("glFlush");
264 functions->fFramebufferRenderbuffer = (GrGLFramebufferRenderbufferProc) eglG etProcAddress("glFramebufferRenderbuffer"); 261 functions->fFramebufferRenderbuffer = (GrGLFramebufferRenderbufferProc) eglG etProcAddress("glFramebufferRenderbuffer");
265 functions->fFramebufferTexture2D = (GrGLFramebufferTexture2DProc) eglGetProc Address("glFramebufferTexture2D"); 262 functions->fFramebufferTexture2D = (GrGLFramebufferTexture2DProc) eglGetProc Address("glFramebufferTexture2D");
266 functions->fFrontFace = (GrGLFrontFaceProc) eglGetProcAddress("glFrontFace") ; 263 functions->fFrontFace = (GrGLFrontFaceProc) eglGetProcAddress("glFrontFace") ;
267 functions->fGenBuffers = (GrGLGenBuffersProc) eglGetProcAddress("glGenBuffer s"); 264 functions->fGenBuffers = (GrGLGenBuffersProc) eglGetProcAddress("glGenBuffer s");
268 functions->fGenFramebuffers = (GrGLGenFramebuffersProc) eglGetProcAddress("g lGenFramebuffers"); 265 functions->fGenFramebuffers = (GrGLGenFramebuffersProc) eglGetProcAddress("g lGenFramebuffers");
269 functions->fGenerateMipmap = (GrGLGenerateMipmapProc) eglGetProcAddress("glG enerateMipmap"); 266 functions->fGenerateMipmap = (GrGLGenerateMipmapProc) eglGetProcAddress("glG enerateMipmap");
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 functions->fRenderbufferStorage = (GrGLRenderbufferStorageProc) eglGetProcAd dress("glRenderbufferStorage"); 299 functions->fRenderbufferStorage = (GrGLRenderbufferStorageProc) eglGetProcAd dress("glRenderbufferStorage");
303 functions->fRenderbufferStorageMultisample = (GrGLRenderbufferStorageMultisa mpleProc) eglGetProcAddress("glRenderbufferStorageMultisample"); 300 functions->fRenderbufferStorageMultisample = (GrGLRenderbufferStorageMultisa mpleProc) eglGetProcAddress("glRenderbufferStorageMultisample");
304 functions->fScissor = (GrGLScissorProc) eglGetProcAddress("glScissor"); 301 functions->fScissor = (GrGLScissorProc) eglGetProcAddress("glScissor");
305 functions->fShaderSource = (GrGLShaderSourceProc) eglGetProcAddress("glShade rSource"); 302 functions->fShaderSource = (GrGLShaderSourceProc) eglGetProcAddress("glShade rSource");
306 functions->fStencilFunc = (GrGLStencilFuncProc) eglGetProcAddress("glStencil Func"); 303 functions->fStencilFunc = (GrGLStencilFuncProc) eglGetProcAddress("glStencil Func");
307 functions->fStencilFuncSeparate = (GrGLStencilFuncSeparateProc) eglGetProcAd dress("glStencilFuncSeparate"); 304 functions->fStencilFuncSeparate = (GrGLStencilFuncSeparateProc) eglGetProcAd dress("glStencilFuncSeparate");
308 functions->fStencilMask = (GrGLStencilMaskProc) eglGetProcAddress("glStencil Mask"); 305 functions->fStencilMask = (GrGLStencilMaskProc) eglGetProcAddress("glStencil Mask");
309 functions->fStencilMaskSeparate = (GrGLStencilMaskSeparateProc) eglGetProcAd dress("glStencilMaskSeparate"); 306 functions->fStencilMaskSeparate = (GrGLStencilMaskSeparateProc) eglGetProcAd dress("glStencilMaskSeparate");
310 functions->fStencilOp = (GrGLStencilOpProc) eglGetProcAddress("glStencilOp") ; 307 functions->fStencilOp = (GrGLStencilOpProc) eglGetProcAddress("glStencilOp") ;
311 functions->fStencilOpSeparate = (GrGLStencilOpSeparateProc) eglGetProcAddres s("glStencilOpSeparate"); 308 functions->fStencilOpSeparate = (GrGLStencilOpSeparateProc) eglGetProcAddres s("glStencilOpSeparate");
312 functions->fTexGenf = (GrGLTexGenfProc) eglGetProcAddress("glTexGenf");
313 functions->fTexGenfv = (GrGLTexGenfvProc) eglGetProcAddress("glTexGenfv"); 309 functions->fTexGenfv = (GrGLTexGenfvProc) eglGetProcAddress("glTexGenfv");
314 functions->fTexGeni = (GrGLTexGeniProc) eglGetProcAddress("glTexGeni"); 310 functions->fTexGeni = (GrGLTexGeniProc) eglGetProcAddress("glTexGeni");
315 functions->fTexImage2D = (GrGLTexImage2DProc) eglGetProcAddress("glTexImage2 D"); 311 functions->fTexImage2D = (GrGLTexImage2DProc) eglGetProcAddress("glTexImage2 D");
316 functions->fTexParameteri = (GrGLTexParameteriProc) eglGetProcAddress("glTex Parameteri"); 312 functions->fTexParameteri = (GrGLTexParameteriProc) eglGetProcAddress("glTex Parameteri");
317 functions->fTexParameteriv = (GrGLTexParameterivProc) eglGetProcAddress("glT exParameteriv"); 313 functions->fTexParameteriv = (GrGLTexParameterivProc) eglGetProcAddress("glT exParameteriv");
318 functions->fTexSubImage2D = (GrGLTexSubImage2DProc) eglGetProcAddress("glTex SubImage2D"); 314 functions->fTexSubImage2D = (GrGLTexSubImage2DProc) eglGetProcAddress("glTex SubImage2D");
319 functions->fTexStorage2D = (GrGLTexStorage2DProc) eglGetProcAddress("glTexSt orage2D"); 315 functions->fTexStorage2D = (GrGLTexStorage2DProc) eglGetProcAddress("glTexSt orage2D");
320 functions->fUniform1f = (GrGLUniform1fProc) eglGetProcAddress("glUniform1f") ; 316 functions->fUniform1f = (GrGLUniform1fProc) eglGetProcAddress("glUniform1f") ;
321 functions->fUniform1i = (GrGLUniform1iProc) eglGetProcAddress("glUniform1i") ; 317 functions->fUniform1i = (GrGLUniform1iProc) eglGetProcAddress("glUniform1i") ;
322 functions->fUniform1fv = (GrGLUniform1fvProc) eglGetProcAddress("glUniform1f v"); 318 functions->fUniform1fv = (GrGLUniform1fvProc) eglGetProcAddress("glUniform1f v");
(...skipping 10 matching lines...) Expand all
333 functions->fUniform4i = (GrGLUniform4iProc) eglGetProcAddress("glUniform4i") ; 329 functions->fUniform4i = (GrGLUniform4iProc) eglGetProcAddress("glUniform4i") ;
334 functions->fUniform4fv = (GrGLUniform4fvProc) eglGetProcAddress("glUniform4f v"); 330 functions->fUniform4fv = (GrGLUniform4fvProc) eglGetProcAddress("glUniform4f v");
335 functions->fUniform4iv = (GrGLUniform4ivProc) eglGetProcAddress("glUniform4i v"); 331 functions->fUniform4iv = (GrGLUniform4ivProc) eglGetProcAddress("glUniform4i v");
336 functions->fUniformMatrix2fv = (GrGLUniformMatrix2fvProc) eglGetProcAddress( "glUniformMatrix2fv"); 332 functions->fUniformMatrix2fv = (GrGLUniformMatrix2fvProc) eglGetProcAddress( "glUniformMatrix2fv");
337 functions->fUniformMatrix3fv = (GrGLUniformMatrix3fvProc) eglGetProcAddress( "glUniformMatrix3fv"); 333 functions->fUniformMatrix3fv = (GrGLUniformMatrix3fvProc) eglGetProcAddress( "glUniformMatrix3fv");
338 functions->fUniformMatrix4fv = (GrGLUniformMatrix4fvProc) eglGetProcAddress( "glUniformMatrix4fv"); 334 functions->fUniformMatrix4fv = (GrGLUniformMatrix4fvProc) eglGetProcAddress( "glUniformMatrix4fv");
339 functions->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnmapBu ffer"); 335 functions->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnmapBu ffer");
340 functions->fUseProgram = (GrGLUseProgramProc) eglGetProcAddress("glUseProgra m"); 336 functions->fUseProgram = (GrGLUseProgramProc) eglGetProcAddress("glUseProgra m");
341 functions->fVertexAttrib4fv = (GrGLVertexAttrib4fvProc) eglGetProcAddress("g lVertexAttrib4fv"); 337 functions->fVertexAttrib4fv = (GrGLVertexAttrib4fvProc) eglGetProcAddress("g lVertexAttrib4fv");
342 functions->fVertexAttribPointer = (GrGLVertexAttribPointerProc) eglGetProcAd dress("glVertexAttribPointer"); 338 functions->fVertexAttribPointer = (GrGLVertexAttribPointerProc) eglGetProcAd dress("glVertexAttribPointer");
343 functions->fVertexPointer = (GrGLVertexPointerProc) eglGetProcAddress("glVer texPointer");
344 functions->fViewport = (GrGLViewportProc) eglGetProcAddress("glViewport"); 339 functions->fViewport = (GrGLViewportProc) eglGetProcAddress("glViewport");
345 340
346 if (extensions.has("GL_NV_path_rendering")) { 341 if (extensions.has("GL_NV_path_rendering")) {
347 functions->fPathCommands = (GrGLPathCommandsProc) eglGetProcAddress("glP athCommandsNV"); 342 functions->fPathCommands = (GrGLPathCommandsProc) eglGetProcAddress("glP athCommandsNV");
348 functions->fPathCoords = (GrGLPathCoordsProc) eglGetProcAddress("glPathC oordsNV"); 343 functions->fPathCoords = (GrGLPathCoordsProc) eglGetProcAddress("glPathC oordsNV");
349 functions->fPathSubCommands = (GrGLPathSubCommandsProc) eglGetProcAddres s("glPathSubCommandsNV"); 344 functions->fPathSubCommands = (GrGLPathSubCommandsProc) eglGetProcAddres s("glPathSubCommandsNV");
350 functions->fPathSubCoords = (GrGLPathSubCoordsProc) eglGetProcAddress("g lPathSubCoordsNV"); 345 functions->fPathSubCoords = (GrGLPathSubCoordsProc) eglGetProcAddress("g lPathSubCoordsNV");
351 functions->fPathString = (GrGLPathStringProc) eglGetProcAddress("glPathS tringNV"); 346 functions->fPathString = (GrGLPathStringProc) eglGetProcAddress("glPathS tringNV");
352 functions->fPathGlyphs = (GrGLPathGlyphsProc) eglGetProcAddress("glPathG lyphsNV"); 347 functions->fPathGlyphs = (GrGLPathGlyphsProc) eglGetProcAddress("glPathG lyphsNV");
353 functions->fPathGlyphRange = (GrGLPathGlyphRangeProc) eglGetProcAddress( "glPathGlyphRangeNV"); 348 functions->fPathGlyphRange = (GrGLPathGlyphRangeProc) eglGetProcAddress( "glPathGlyphRangeNV");
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
423 } else if (kGL_GrGLStandard == standard) { 418 } else if (kGL_GrGLStandard == standard) {
424 interface = create_desktop_interface(version, extensions); 419 interface = create_desktop_interface(version, extensions);
425 } 420 }
426 421
427 if (NULL != interface) { 422 if (NULL != interface) {
428 interface->fExtensions.swap(&extensions); 423 interface->fExtensions.swap(&extensions);
429 } 424 }
430 425
431 return interface; 426 return interface;
432 } 427 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGpuGL_program.cpp ('k') | src/gpu/gl/debug/GrGLCreateDebugInterface.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698