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

Unified Diff: src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp

Issue 133073009: Move GrGLInterface function pointers into a nested struct (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: upload again, rietveld diff failed. 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 side-by-side diff with in-line comments
Download patch
Index: src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp
diff --git a/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp b/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp
index 709c3ae0186baa20d25d023b3e2508be1fa7cdda..59314445b348686316c0ca0076f40f798803cc28 100644
--- a/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp
+++ b/src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp
@@ -13,9 +13,9 @@
#define GL_GLEXT_PROTOTYPES
#include "osmesa_wrapper.h"
-#define GR_GL_GET_PROC(F) interface->f ## F = (GrGL ## F ## Proc) \
+#define GR_GL_GET_PROC(F) interface->fFunctions.f ## F = (GrGL ## F ## Proc) \
OSMesaGetProcAddress("gl" #F);
-#define GR_GL_GET_PROC_SUFFIX(F, S) interface->f ## F = (GrGL ## F ## Proc) \
+#define GR_GL_GET_PROC_SUFFIX(F, S) interface->fFunctions.f ## F = (GrGL ## F ## Proc) \
OSMesaGetProcAddress("gl" #F #S);
// We use OSMesaGetProcAddress for every gl function to avoid accidentally using
@@ -141,7 +141,7 @@ const GrGLInterface* GrGLCreateMesaInterface() {
GR_GL_GET_PROC(TexParameteri);
GR_GL_GET_PROC(TexParameteriv);
GR_GL_GET_PROC(TexStorage2D);
- if (NULL == interface->fTexStorage2D) {
+ if (NULL == interface->fFunctions.fTexStorage2D) {
GR_GL_GET_PROC_SUFFIX(TexStorage2D, EXT);
}
GR_GL_GET_PROC(TexSubImage2D);
« no previous file with comments | « src/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp ('k') | src/gpu/gl/unix/GrGLCreateNativeInterface_unix.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698