Index: tools/gpu/gl/glx/CreatePlatformGLContext_glx.cpp |
diff --git a/src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp b/tools/gpu/gl/glx/CreatePlatformGLContext_glx.cpp |
similarity index 97% |
rename from src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp |
rename to tools/gpu/gl/glx/CreatePlatformGLContext_glx.cpp |
index d0bd1de4287d7c8b25941fd22853854b744a213f..b2168e3c5a53f32ec18a2fcc17cac0e2885e92fe 100644 |
--- a/src/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp |
+++ b/tools/gpu/gl/glx/CreatePlatformGLContext_glx.cpp |
@@ -1,10 +1,11 @@ |
+ |
/* |
* Copyright 2011 Google Inc. |
* |
* Use of this source code is governed by a BSD-style license that can be |
* found in the LICENSE file. |
*/ |
-#include "gl/SkGLContext.h" |
+#include "gl/GLContext.h" |
#include <X11/Xlib.h> |
#include <GL/glx.h> |
@@ -43,7 +44,7 @@ static int ctxErrorHandler(Display *dpy, XErrorEvent *ev) { |
return 0; |
} |
-class GLXGLContext : public SkGLContext { |
+class GLXGLContext : public sk_gpu_test::GLContext { |
public: |
GLXGLContext(GrGLStandard forcedGpuAPI, GLXGLContext* shareList); |
~GLXGLContext() override; |
@@ -330,10 +331,11 @@ GrGLFuncPtr GLXGLContext::onPlatformGetProcAddress(const char* procName) const { |
return glXGetProcAddress(reinterpret_cast<const GLubyte*>(procName)); |
} |
-} // anonymous namespace |
+} // anonymous namespace |
-SkGLContext* SkCreatePlatformGLContext(GrGLStandard forcedGpuAPI, SkGLContext* shareContext) { |
- GLXGLContext* glxShareContext = reinterpret_cast<GLXGLContext*>(shareContext); |
+namespace sk_gpu_test { |
+GLContext *CreatePlatformGLContext(GrGLStandard forcedGpuAPI, GLContext *shareContext) { |
+ GLXGLContext *glxShareContext = reinterpret_cast<GLXGLContext *>(shareContext); |
GLXGLContext *ctx = new GLXGLContext(forcedGpuAPI, glxShareContext); |
if (!ctx->isValid()) { |
delete ctx; |
@@ -341,3 +343,4 @@ SkGLContext* SkCreatePlatformGLContext(GrGLStandard forcedGpuAPI, SkGLContext* s |
} |
return ctx; |
} |
+} // namespace sk_gpu_test |