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

Unified Diff: tools/gpu/gl/iOS/CreatePlatformGLContext_iOS.mm

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/glx/CreatePlatformGLContext_glx.cpp ('k') | tools/gpu/gl/mac/CreatePlatformGLContext_mac.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gpu/gl/iOS/CreatePlatformGLContext_iOS.mm
diff --git a/src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm b/tools/gpu/gl/iOS/CreatePlatformGLContext_iOS.mm
similarity index 89%
rename from src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm
rename to tools/gpu/gl/iOS/CreatePlatformGLContext_iOS.mm
index 54dc59af03462989f79973111b644132eb96c6ba..d6507f280facb14f88aae857aabb99584a996157 100644
--- a/src/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm
+++ b/tools/gpu/gl/iOS/CreatePlatformGLContext_iOS.mm
@@ -6,7 +6,7 @@
* found in the LICENSE file.
*/
-#include "gl/SkGLContext.h"
+#include "GLContext.h"
#import <OpenGLES/EAGL.h>
#include <dlfcn.h>
@@ -14,7 +14,7 @@
namespace {
-class IOSGLContext : public SkGLContext {
+class IOSGLContext : public sk_gpu_test::GLContext {
public:
IOSGLContext();
~IOSGLContext() override;
@@ -87,9 +87,10 @@ GrGLFuncPtr IOSGLContext::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 NULL;
@@ -97,10 +98,11 @@ SkGLContext* SkCreatePlatformGLContext(GrGLStandard forcedGpuAPI, SkGLContext* s
if (kGL_GrGLStandard == forcedGpuAPI) {
return NULL;
}
- IOSGLContext* ctx = new IOSGLContext;
+ IOSGLContext *ctx = new IOSGLContext;
if (!ctx->isValid()) {
delete ctx;
return NULL;
}
return ctx;
}
+}
« no previous file with comments | « tools/gpu/gl/glx/CreatePlatformGLContext_glx.cpp ('k') | tools/gpu/gl/mac/CreatePlatformGLContext_mac.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698