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

Side by Side Diff: src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp

Issue 20436002: get genmipmap function in the struct (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: fix rebase conflicts Created 7 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 | « src/gpu/gl/GrGpuGL.cpp ('k') | src/gpu/gl/angle/GrGLCreateANGLEInterface.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 9
10 #ifndef GL_GLEXT_PROTOTYPES 10 #ifndef GL_GLEXT_PROTOTYPES
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 interface->fDisable = glDisable; 55 interface->fDisable = glDisable;
56 interface->fDisableVertexAttribArray = glDisableVertexAttribArray; 56 interface->fDisableVertexAttribArray = glDisableVertexAttribArray;
57 interface->fDrawArrays = glDrawArrays; 57 interface->fDrawArrays = glDrawArrays;
58 interface->fDrawElements = glDrawElements; 58 interface->fDrawElements = glDrawElements;
59 interface->fEnable = glEnable; 59 interface->fEnable = glEnable;
60 interface->fEnableVertexAttribArray = glEnableVertexAttribArray; 60 interface->fEnableVertexAttribArray = glEnableVertexAttribArray;
61 interface->fFinish = glFinish; 61 interface->fFinish = glFinish;
62 interface->fFlush = glFlush; 62 interface->fFlush = glFlush;
63 interface->fFrontFace = glFrontFace; 63 interface->fFrontFace = glFrontFace;
64 interface->fGenBuffers = glGenBuffers; 64 interface->fGenBuffers = glGenBuffers;
65 interface->fGenerateMipmap = glGenerateMipmap;
65 interface->fGenTextures = glGenTextures; 66 interface->fGenTextures = glGenTextures;
66 interface->fGenVertexArrays = glGenVertexArraysOES; 67 interface->fGenVertexArrays = glGenVertexArraysOES;
67 interface->fGetBufferParameteriv = glGetBufferParameteriv; 68 interface->fGetBufferParameteriv = glGetBufferParameteriv;
68 interface->fGetError = glGetError; 69 interface->fGetError = glGetError;
69 interface->fGetIntegerv = glGetIntegerv; 70 interface->fGetIntegerv = glGetIntegerv;
70 interface->fGetProgramInfoLog = glGetProgramInfoLog; 71 interface->fGetProgramInfoLog = glGetProgramInfoLog;
71 interface->fGetProgramiv = glGetProgramiv; 72 interface->fGetProgramiv = glGetProgramiv;
72 interface->fGetShaderInfoLog = glGetShaderInfoLog; 73 interface->fGetShaderInfoLog = glGetShaderInfoLog;
73 interface->fGetShaderiv = glGetShaderiv; 74 interface->fGetShaderiv = glGetShaderiv;
74 interface->fGetString = glGetString; 75 interface->fGetString = glGetString;
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 interface->fMapBuffer = glMapBufferOES; 160 interface->fMapBuffer = glMapBufferOES;
160 interface->fUnmapBuffer = glUnmapBufferOES; 161 interface->fUnmapBuffer = glUnmapBufferOES;
161 #else 162 #else
162 interface->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBuff erOES"); 163 interface->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBuff erOES");
163 interface->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnm apBufferOES"); 164 interface->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnm apBufferOES");
164 #endif 165 #endif
165 } 166 }
166 glInterface.get()->ref(); 167 glInterface.get()->ref();
167 return glInterface.get(); 168 return glInterface.get();
168 } 169 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGpuGL.cpp ('k') | src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698