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

Unified Diff: include/gpu/gl/angle/SkANGLEGLContext.h

Issue 1548683002: Revert of Add config options to run different GPU APIs to dm and nanobench (Closed) Base URL: https://skia.googlesource.com/skia.git@commandbuffer-as-api-03-context-factory-glcontext-type
Patch Set: Created 5 years 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 | « include/gpu/gl/SkNullGLContext.h ('k') | include/gpu/gl/command_buffer/SkCommandBufferGLContext.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/gpu/gl/angle/SkANGLEGLContext.h
diff --git a/include/gpu/gl/angle/SkANGLEGLContext.h b/include/gpu/gl/angle/SkANGLEGLContext.h
index ea5e877ca27e8b3bae4565bcd38e111e3f2cc9f3..7858fff9649de75f4296936760bab8a5a4c47dc0 100644
--- a/include/gpu/gl/angle/SkANGLEGLContext.h
+++ b/include/gpu/gl/angle/SkANGLEGLContext.h
@@ -15,25 +15,18 @@
class SkANGLEGLContext : public SkGLContext {
public:
~SkANGLEGLContext() override;
-#ifdef SK_BUILD_FOR_WIN
- static SkANGLEGLContext* CreateDirectX() {
- SkANGLEGLContext* ctx = new SkANGLEGLContext(false);
+
+ static SkANGLEGLContext* Create(GrGLStandard forcedGpuAPI, bool useGLBackend) {
+ if (kGL_GrGLStandard == forcedGpuAPI) {
+ return NULL;
+ }
+ SkANGLEGLContext* ctx = new SkANGLEGLContext(useGLBackend);
if (!ctx->isValid()) {
delete ctx;
return NULL;
}
return ctx;
}
-#endif
- static SkANGLEGLContext* CreateOpenGL() {
- SkANGLEGLContext* ctx = new SkANGLEGLContext(true);
- if (!ctx->isValid()) {
- delete ctx;
- return NULL;
- }
- return ctx;
- }
-
GrEGLImage texture2DToEGLImage(GrGLuint texID) const override;
void destroyEGLImage(GrEGLImage) const override;
GrGLuint eglImageToExternalTexture(GrEGLImage) const override;
« no previous file with comments | « include/gpu/gl/SkNullGLContext.h ('k') | include/gpu/gl/command_buffer/SkCommandBufferGLContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698