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

Side by Side Diff: src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp

Issue 322403007: Fix a number of issues with iOS build. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Remove SKOSFile_iOS.mm a little more cleanly (and clearly) Created 6 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
« no previous file with comments | « gyp/SampleApp.gyp ('k') | src/utils/ios/SkImageDecoder_iOS.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/GrGLInterface.h" 9 #include "gl/GrGLInterface.h"
10 10
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 functions->fMapBuffer = glMapBufferOES; 131 functions->fMapBuffer = glMapBufferOES;
132 functions->fUnmapBuffer = glUnmapBufferOES; 132 functions->fUnmapBuffer = glUnmapBufferOES;
133 #endif 133 #endif
134 134
135 #if GL_EXT_map_buffer_range || GL_ES_VERSION_3_0 135 #if GL_EXT_map_buffer_range || GL_ES_VERSION_3_0
136 functions->fMapBufferRange = glMapBufferRangeEXT; 136 functions->fMapBufferRange = glMapBufferRangeEXT;
137 functions->fFlushMappedBufferRange = glFlushMappedBufferRangeEXT; 137 functions->fFlushMappedBufferRange = glFlushMappedBufferRangeEXT;
138 #endif 138 #endif
139 139
140 #if GL_APPLE_framebuffer_multisample 140 #if GL_APPLE_framebuffer_multisample
141 functions->fRenderbufferStorageMultisample = glRenderbufferStorageMultisampl eAPPLE; 141 functions->fRenderbufferStorageMultisampleES2APPLE = glRenderbufferStorageMu ltisampleAPPLE;
142 functions->fResolveMultisampleFramebuffer = glResolveMultisampleFramebufferA PPLE; 142 functions->fResolveMultisampleFramebuffer = glResolveMultisampleFramebufferA PPLE;
143 #endif 143 #endif
144 144
145 #if GL_OES_vertex_array_object 145 #if GL_OES_vertex_array_object
146 functions->fBindVertexArray = glBindVertexArrayOES; 146 functions->fBindVertexArray = glBindVertexArrayOES;
147 functions->fDeleteVertexArrays = glDeleteVertexArraysOES; 147 functions->fDeleteVertexArrays = glDeleteVertexArraysOES;
148 functions->fGenVertexArrays = glGenVertexArraysOES; 148 functions->fGenVertexArrays = glGenVertexArraysOES;
149 #endif 149 #endif
150 150
151 #if GL_EXT_debug_marker 151 #if GL_EXT_debug_marker
(...skipping 12 matching lines...) Expand all
164 functions->fInvalidateBufferSubData = glInvalidateBufferSubData; 164 functions->fInvalidateBufferSubData = glInvalidateBufferSubData;
165 functions->fInvalidateTexImage = glInvalidateTexImage; 165 functions->fInvalidateTexImage = glInvalidateTexImage;
166 functions->fInvalidateTexSubImage = glInvalidateTexSubImage; 166 functions->fInvalidateTexSubImage = glInvalidateTexSubImage;
167 #endif 167 #endif
168 168
169 interface->fStandard = kGLES_GrGLStandard; 169 interface->fStandard = kGLES_GrGLStandard;
170 interface->fExtensions.init(kGLES_GrGLStandard, glGetString, NULL, glGetInte gerv); 170 interface->fExtensions.init(kGLES_GrGLStandard, glGetString, NULL, glGetInte gerv);
171 171
172 return interface; 172 return interface;
173 } 173 }
OLDNEW
« no previous file with comments | « gyp/SampleApp.gyp ('k') | src/utils/ios/SkImageDecoder_iOS.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698