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

Unified Diff: src/gpu/GrContextFactory.cpp

Issue 1306823003: skia: add ability to load command_buffer_gles2 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: and NULL->nullptr, just because. 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
« no previous file with comments | « src/gpu/GrContextFactory.h ('k') | src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrContextFactory.cpp
diff --git a/src/gpu/GrContextFactory.cpp b/src/gpu/GrContextFactory.cpp
index d84e589f843be3218988c9a8b90cd7c45d310408..0fe01df16b41963f45f7602b18eb0e706e3ac1ec 100755
--- a/src/gpu/GrContextFactory.cpp
+++ b/src/gpu/GrContextFactory.cpp
@@ -11,6 +11,9 @@
#if SK_ANGLE
#include "gl/angle/SkANGLEGLContext.h"
#endif
+#if SK_COMMAND_BUFFER
+ #include "gl/command_buffer/SkCommandBufferGLContext.h"
+#endif
#include "gl/debug/SkDebugGLContext.h"
#if SK_MESA
#include "gl/mesa/SkMesaGLContext.h"
@@ -43,6 +46,11 @@ GrContext* GrContextFactory::get(GLContextType type, GrGLStandard forcedGpuAPI)
glCtx.reset(SkANGLEGLContext::Create(forcedGpuAPI));
break;
#endif
+#ifdef SK_COMMAND_BUFFER
+ case kCommandBuffer_GLContextType:
+ glCtx.reset(SkCommandBufferGLContext::Create(forcedGpuAPI));
+ break;
+#endif
#ifdef SK_MESA
case kMESA_GLContextType:
glCtx.reset(SkMesaGLContext::Create(forcedGpuAPI));
« no previous file with comments | « src/gpu/GrContextFactory.h ('k') | src/gpu/gl/angle/GrGLCreateANGLEInterface.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698