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

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

Issue 144063003: Really fix ios build? (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 11 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 »
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 9
10 #include "gl/GrGLInterface.h" 10 #include "gl/GrGLInterface.h"
11 11
12 #import <OpenGLES/ES2/gl.h> 12 #import <OpenGLES/ES2/gl.h>
13 #import <OpenGLES/ES2/glext.h> 13 #import <OpenGLES/ES2/glext.h>
14 14
15 const GrGLInterface* GrGLCreateNativeInterface() { 15 const GrGLInterface* GrGLCreateNativeInterface() {
16 GrGLInterface* interface = SkNEW(GrGLInterface); 16 GrGLInterface* interface = SkNEW(GrGLInterface);
17 17
18 GrGLInterface::Functions* functions = interface->functions; 18 GrGLInterface::Functions* functions = &interface->functions;
19 19
20 functions->fActiveTexture = glActiveTexture; 20 functions->fActiveTexture = glActiveTexture;
21 functions->fAttachShader = glAttachShader; 21 functions->fAttachShader = glAttachShader;
22 functions->fBindAttribLocation = glBindAttribLocation; 22 functions->fBindAttribLocation = glBindAttribLocation;
23 functions->fBindBuffer = glBindBuffer; 23 functions->fBindBuffer = glBindBuffer;
24 functions->fBindTexture = glBindTexture; 24 functions->fBindTexture = glBindTexture;
25 functions->fBlendColor = glBlendColor; 25 functions->fBlendColor = glBlendColor;
26 functions->fBlendFunc = glBlendFunc; 26 functions->fBlendFunc = glBlendFunc;
27 functions->fBufferData = (GrGLBufferDataProc)glBufferData; 27 functions->fBufferData = (GrGLBufferDataProc)glBufferData;
28 functions->fBufferSubData = (GrGLBufferSubDataProc)glBufferSubData; 28 functions->fBufferSubData = (GrGLBufferSubDataProc)glBufferSubData;
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 functions->fBindVertexArray = glBindVertexArrayOES; 142 functions->fBindVertexArray = glBindVertexArrayOES;
143 functions->fDeleteVertexArrays = glDeleteVertexArraysOES; 143 functions->fDeleteVertexArrays = glDeleteVertexArraysOES;
144 functions->fGenVertexArrays = glGenVertexArraysOES; 144 functions->fGenVertexArrays = glGenVertexArraysOES;
145 #endif 145 #endif
146 146
147 interface->fStandard = kGLES_GrGLStandard; 147 interface->fStandard = kGLES_GrGLStandard;
148 interface->fExtensions.init(kGLES_GrGLStandard, glGetString, NULL, glGetInte gerv); 148 interface->fExtensions.init(kGLES_GrGLStandard, glGetString, NULL, glGetInte gerv);
149 149
150 return interface; 150 return interface;
151 } 151 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698