Move SkGLContext and some GrGLInterface implementations to skgputest module

samplecode/SampleApp.cpp

Index: samplecode/SampleApp.cpp
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 3149711d86b30e88784715a4862c7c526b714896..4d86e66e3f37caea481652cb001d2de58aa0875e 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -33,11 +33,14 @@
 #include "sk_tool_utils.h"
 
 #if SK_SUPPORT_GPU
-#include "gl/GrGLInterface.h"
-#include "gl/GrGLUtil.h"
-#include "GrRenderTarget.h"
-#include "GrContext.h"
-#include "SkGpuDevice.h"
+#   include "gl/GrGLInterface.h"

[jvanverth1, 2016/03/29 17:21:15]

Not sure if you intended this indenting.

[bsalomon, 2016/03/29 17:32:04]

I did, but can revert it. DM (or some other tool code) uses this style and I
found it easier to track nested conditionals.

+#   include "gl/GrGLUtil.h"
+#   include "GrRenderTarget.h"
+#   include "GrContext.h"
+#   include "SkGpuDevice.h"
+#   if SK_ANGLE
+#       include "gl/angle/GLContext_angle.h"
+#   endif
 #else
 class GrContext;
 #endif
@@ -233,7 +236,7 @@ public:
                 break;
 #if SK_ANGLE
             case kANGLE_DeviceType:
-                glInterface.reset(GrGLCreateANGLEInterface());
+                glInterface.reset(sk_gpu_test::CreateANGLEGLInterface());
                 break;
 #endif // SK_ANGLE
 #if SK_COMMAND_BUFFER