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

Unified Diff: include/gpu/gl/command_buffer/SkCommandBufferGLContext.h

Issue 1306823003: skia: add ability to load command_buffer_gles2 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: delete the display Created 5 years, 4 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
Index: include/gpu/gl/command_buffer/SkCommandBufferGLContext.h
diff --git a/include/gpu/gl/angle/SkANGLEGLContext.h b/include/gpu/gl/command_buffer/SkCommandBufferGLContext.h
similarity index 57%
copy from include/gpu/gl/angle/SkANGLEGLContext.h
copy to include/gpu/gl/command_buffer/SkCommandBufferGLContext.h
index 8850cd0bb5518f02dd92d5869cfb80ee0496d3ba..ac13bdb43f846c54eac6bdff1e93f1de8960694e 100644
--- a/include/gpu/gl/angle/SkANGLEGLContext.h
+++ b/include/gpu/gl/command_buffer/SkCommandBufferGLContext.h
@@ -1,26 +1,26 @@
/*
- * Copyright 2012 Google Inc.
+ * Copyright 2015 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
-#ifndef SkANGLEGLContext_DEFINED
-#define SkANGLEGLContext_DEFINED
+#ifndef SKCOMMANDBUFFERGLCONTEXT_DEFINED
+#define SKCOMMANDBUFFERGLCONTEXT_DEFINED
-#if SK_ANGLE
+#if SK_COMMAND_BUFFER
#include "gl/SkGLContext.h"
-class SkANGLEGLContext : public SkGLContext {
+class SkCommandBufferGLContext : public SkGLContext {
public:
- ~SkANGLEGLContext() override;
+ ~SkCommandBufferGLContext() override;
- static SkANGLEGLContext* Create(GrGLStandard forcedGpuAPI) {
+ static SkCommandBufferGLContext* Create(GrGLStandard forcedGpuAPI) {
if (kGL_GrGLStandard == forcedGpuAPI) {
return NULL;
}
- SkANGLEGLContext* ctx = SkNEW(SkANGLEGLContext);
+ SkCommandBufferGLContext* ctx = SkNEW(SkCommandBufferGLContext);
if (!ctx->isValid()) {
SkDELETE(ctx);
return NULL;
@@ -28,11 +28,8 @@ public:
return ctx;
}
- // The param is an EGLNativeDisplayType and the return is an EGLDispay.
- static void* GetD3DEGLDisplay(void* nativeDisplay);
-
private:
- SkANGLEGLContext();
+ SkCommandBufferGLContext();
void destroyGLContext();
void onPlatformMakeCurrent() const override;
@@ -44,6 +41,6 @@ private:
void* fSurface;
};
-#endif
+#endif // SK_COMMAND_BUFFER
#endif

Powered by Google App Engine
This is Rietveld 408576698