Expose GrGLAssembleInterface

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1842363003

Review URL: https://codereview.chromium.org/1842363003

diff --git a/gyp/gpu.gypi b/gyp/gpu.gypi
index 37a7d31..94215c1 100644 (file)
--- a/gyp/gpu.gypi
+++ b/gyp/gpu.gypi
@@ -48,6 +48,7 @@
       '<(skia_include_path)/gpu/effects/GrPorterDuffXferProcessor.h',
       '<(skia_include_path)/gpu/effects/GrXfermodeFragmentProcessor.h',
 
+      '<(skia_include_path)/gpu/gl/GrGLAssembleInterface.h',
       '<(skia_include_path)/gpu/gl/GrGLConfig.h',
       '<(skia_include_path)/gpu/gl/GrGLExtensions.h',
       '<(skia_include_path)/gpu/gl/GrGLFunctions.h',
@@ -310,7 +311,6 @@
       '<(skia_src_path)/gpu/text/GrTextUtils.h',
 
       '<(skia_src_path)/gpu/gl/GrGLAssembleInterface.cpp',
-      '<(skia_src_path)/gpu/gl/GrGLAssembleInterface.h',
       '<(skia_src_path)/gpu/gl/GrGLBuffer.cpp',
       '<(skia_src_path)/gpu/gl/GrGLBuffer.h',
       '<(skia_src_path)/gpu/gl/GrGLCaps.cpp',

diff --git a/src/gpu/gl/GrGLAssembleInterface.h b/include/gpu/gl/GrGLAssembleInterface.h
similarity index 77%
rename from src/gpu/gl/GrGLAssembleInterface.h
rename to include/gpu/gl/GrGLAssembleInterface.h
index 3882f71..b9881a9 100644 (file)
--- a/src/gpu/gl/GrGLAssembleInterface.h
+++ b/include/gpu/gl/GrGLAssembleInterface.h
@@ -14,17 +14,17 @@ typedef GrGLFuncPtr (*GrGLGetProc)(void* ctx, const char name[]);
  * Generic function for creating a GrGLInterface for an either OpenGL or GLES. It calls
  * get() to get each function address. ctx is a generic ptr passed to and interpreted by get().
  */
-const GrGLInterface* GrGLAssembleInterface(void* ctx, GrGLGetProc get);
+SK_API const GrGLInterface* GrGLAssembleInterface(void* ctx, GrGLGetProc get);
 
 /**
  * Generic function for creating a GrGLInterface for an OpenGL (but not GLES) context. It calls
  * get() to get each function address. ctx is a generic ptr passed to and interpreted by get().
  */
-const GrGLInterface* GrGLAssembleGLInterface(void* ctx, GrGLGetProc get);
+SK_API const GrGLInterface* GrGLAssembleGLInterface(void* ctx, GrGLGetProc get);
 
 /**
  * Generic function for creating a GrGLInterface for an OpenGL ES (but not Open GL) context. It
  * calls get() to get each function address. ctx is a generic ptr passed to and interpreted by
  * get().
  */
-const GrGLInterface* GrGLAssembleGLESInterface(void* ctx, GrGLGetProc get);
+SK_API const GrGLInterface* GrGLAssembleGLESInterface(void* ctx, GrGLGetProc get);

diff --git a/src/gpu/gl/GrGLAssembleInterface.cpp b/src/gpu/gl/GrGLAssembleInterface.cpp
index 91aa045..bc7dc8a 100644 (file)
--- a/src/gpu/gl/GrGLAssembleInterface.cpp
+++ b/src/gpu/gl/GrGLAssembleInterface.cpp
@@ -6,7 +6,7 @@
  */
 
 
-#include "GrGLAssembleInterface.h"
+#include "gl/GrGLAssembleInterface.h"
 #include "GrGLUtil.h"
 
 #define GET_PROC(F) functions->f ## F = (GrGL ## F ## Proc) get(ctx, "gl" #F)