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

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

Issue 133413003: Rename GrGLBinding->GrGLStandard, no longer a bitfield (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: actually fix enum names? 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
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 16 matching lines...) Expand all
27 if (NULL == ghANGLELib) { 27 if (NULL == ghANGLELib) {
28 // We load the ANGLE library and never let it go 28 // We load the ANGLE library and never let it go
29 ghANGLELib = LoadLibrary("libGLESv2.dll"); 29 ghANGLELib = LoadLibrary("libGLESv2.dll");
30 } 30 }
31 if (NULL == ghANGLELib) { 31 if (NULL == ghANGLELib) {
32 // We can't setup the interface correctly w/o the DLL 32 // We can't setup the interface correctly w/o the DLL
33 return NULL; 33 return NULL;
34 } 34 }
35 35
36 GrGLInterface* interface = SkNEW(GrGLInterface); 36 GrGLInterface* interface = SkNEW(GrGLInterface);
37 interface->fBindingsExported = kES_GrGLBinding; 37 interface->fStandard = kGLES_GrGLStandard;
38 38
39 GET_PROC(ActiveTexture); 39 GET_PROC(ActiveTexture);
40 GET_PROC(AttachShader); 40 GET_PROC(AttachShader);
41 GET_PROC(BindAttribLocation); 41 GET_PROC(BindAttribLocation);
42 GET_PROC(BindBuffer); 42 GET_PROC(BindBuffer);
43 GET_PROC(BindTexture); 43 GET_PROC(BindTexture);
44 interface->fBindVertexArray = 44 interface->fBindVertexArray =
45 (GrGLBindVertexArrayProc) eglGetProcAddress("glBindVertexArrayOES"); 45 (GrGLBindVertexArrayProc) eglGetProcAddress("glBindVertexArrayOES");
46 GET_PROC(BlendColor); 46 GET_PROC(BlendColor);
47 GET_PROC(BlendFunc); 47 GET_PROC(BlendFunc);
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 GET_PROC(GenFramebuffers); 145 GET_PROC(GenFramebuffers);
146 GET_PROC(GenRenderbuffers); 146 GET_PROC(GenRenderbuffers);
147 GET_PROC(GetFramebufferAttachmentParameteriv); 147 GET_PROC(GetFramebufferAttachmentParameteriv);
148 GET_PROC(GetRenderbufferParameteriv); 148 GET_PROC(GetRenderbufferParameteriv);
149 GET_PROC(RenderbufferStorage); 149 GET_PROC(RenderbufferStorage);
150 150
151 interface->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBufferOE S"); 151 interface->fMapBuffer = (GrGLMapBufferProc) eglGetProcAddress("glMapBufferOE S");
152 interface->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnmapBu fferOES"); 152 interface->fUnmapBuffer = (GrGLUnmapBufferProc) eglGetProcAddress("glUnmapBu fferOES");
153 return interface; 153 return interface;
154 } 154 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698