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

Side by Side Diff: src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp

Issue 23185004: Rename kES2_GrGLBinding to kES_GrGLBinding. Step 0 for supporting ES3. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: 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
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 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"
(...skipping 19 matching lines...) Expand all
30 ghANGLELib = LoadLibrary("libGLESv2.dll"); 30 ghANGLELib = LoadLibrary("libGLESv2.dll");
31 } 31 }
32 if (NULL == ghANGLELib) { 32 if (NULL == ghANGLELib) {
33 // We can't setup the interface correctly w/o the DLL 33 // We can't setup the interface correctly w/o the DLL
34 return NULL; 34 return NULL;
35 } 35 }
36 36
37 if (!glInterface.get()) { 37 if (!glInterface.get()) {
38 GrGLInterface* interface = new GrGLInterface; 38 GrGLInterface* interface = new GrGLInterface;
39 glInterface.reset(interface); 39 glInterface.reset(interface);
40 interface->fBindingsExported = kES2_GrGLBinding; 40 interface->fBindingsExported = kES_GrGLBinding;
41 41
42 GET_PROC(ActiveTexture); 42 GET_PROC(ActiveTexture);
43 GET_PROC(AttachShader); 43 GET_PROC(AttachShader);
44 GET_PROC(BindAttribLocation); 44 GET_PROC(BindAttribLocation);
45 GET_PROC(BindBuffer); 45 GET_PROC(BindBuffer);
46 GET_PROC(BindTexture); 46 GET_PROC(BindTexture);
47 interface->fBindVertexArray = 47 interface->fBindVertexArray =
48 (GrGLBindVertexArrayProc) eglGetProcAddress("glBindVertexArrayOES"); 48 (GrGLBindVertexArrayProc) eglGetProcAddress("glBindVertexArrayOES");
49 GET_PROC(BlendColor); 49 GET_PROC(BlendColor);
50 GET_PROC(BlendFunc); 50 GET_PROC(BlendFunc);
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 GET_PROC(GetFramebufferAttachmentParameteriv); 150 GET_PROC(GetFramebufferAttachmentParameteriv);
151 GET_PROC(GetRenderbufferParameteriv); 151 GET_PROC(GetRenderbufferParameteriv);
152 GET_PROC(RenderbufferStorage); 152 GET_PROC(RenderbufferStorage);
153 153
154 interface->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBuff erOES"); 154 interface->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBuff erOES");
155 interface->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnm apBufferOES"); 155 interface->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnm apBufferOES");
156 } 156 }
157 glInterface.get()->ref(); 157 glInterface.get()->ref();
158 return glInterface.get(); 158 return glInterface.get();
159 } 159 }
OLDNEW
« no previous file with comments | « src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp ('k') | src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698