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

Unified Diff: tools/gpu/gl/mac/CreatePlatformGLContext_mac.cpp

Issue 1815823002: Move SkGLContext and some GrGLInterface implementations to skgputest module (Closed) Base URL: https://chromium.googlesource.com/skia.git@debugobject
Patch Set: fix windows and android? Created 4 years, 9 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
« no previous file with comments | « tools/gpu/gl/iOS/CreatePlatformGLContext_iOS.mm ('k') | tools/gpu/gl/mesa/GLContext_mesa.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gpu/gl/mac/CreatePlatformGLContext_mac.cpp
diff --git a/src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp b/tools/gpu/gl/mac/CreatePlatformGLContext_mac.cpp
similarity index 91%
rename from src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp
rename to tools/gpu/gl/mac/CreatePlatformGLContext_mac.cpp
index 0ca62ad1ccaf91b3e985f6d10523e529e4e7cf31..7da99d7eb5b99d89167bebe6d6a6e493b6309f99 100644
--- a/src/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp
+++ b/tools/gpu/gl/mac/CreatePlatformGLContext_mac.cpp
@@ -1,3 +1,4 @@
+
/*
* Copyright 2011 Google Inc.
*
@@ -5,16 +6,15 @@
* found in the LICENSE file.
*/
#include "SkTypes.h"
-#if defined(SK_BUILD_FOR_MAC)
-#include "gl/SkGLContext.h"
+#include "gl/GLContext.h"
#include "AvailabilityMacros.h"
#include <OpenGL/OpenGL.h>
#include <dlfcn.h>
namespace {
-class MacGLContext : public SkGLContext {
+class MacGLContext : public sk_gpu_test::GLContext {
public:
MacGLContext();
~MacGLContext() override;
@@ -106,9 +106,10 @@ GrGLFuncPtr MacGLContext::onPlatformGetProcAddress(const char* procName) const {
return reinterpret_cast<GrGLFuncPtr>(dlsym(fGLLibrary, procName));
}
-} // anonymous namespace
+} // anonymous namespace
-SkGLContext* SkCreatePlatformGLContext(GrGLStandard forcedGpuAPI, SkGLContext* shareContext) {
+namespace sk_gpu_test {
+GLContext* CreatePlatformGLContext(GrGLStandard forcedGpuAPI, GLContext* shareContext) {
SkASSERT(!shareContext);
if (shareContext) {
return nullptr;
@@ -124,5 +125,4 @@ SkGLContext* SkCreatePlatformGLContext(GrGLStandard forcedGpuAPI, SkGLContext* s
}
return ctx;
}
-
-#endif//defined(SK_BUILD_FOR_MAC)
+} // namespace sk_gpu_test
« no previous file with comments | « tools/gpu/gl/iOS/CreatePlatformGLContext_iOS.mm ('k') | tools/gpu/gl/mesa/GLContext_mesa.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698