src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp - Issue 261983002: Revert of Fix iOS build.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 261983002: Revert of Fix iOS build. (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Created 6 years, 7 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 | « no previous file | no next file » | no next file with comments »

OLD	NEW
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 115 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
126 functions->fDeleteRenderbuffers = glDeleteRenderbuffers;	126 functions->fDeleteRenderbuffers = glDeleteRenderbuffers;

127 functions->fFramebufferRenderbuffer = glFramebufferRenderbuffer;	127 functions->fFramebufferRenderbuffer = glFramebufferRenderbuffer;

128 functions->fBindRenderbuffer = glBindRenderbuffer;	128 functions->fBindRenderbuffer = glBindRenderbuffer;

129	129

130 #if GL_OES_mapbuffer	130 #if GL_OES_mapbuffer

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 = glMapBufferRange;

137 functions->fFlushMappedBufferRange = glFlushMappedBufferRangeEXT;	137 functions->fFlushMappedBufferRange = glFlushMappedBufferRange;

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->fRenderbufferStorageMultisample = glRenderbufferStorageMultisampl eAPPLE;

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;

(...skipping 16 matching lines...) Expand all Loading...
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 }

OLD	NEW