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

Unified Diff: tools/PictureRenderer.h

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 | « tests/SkpSkGrTest.cpp ('k') | tools/PictureRenderer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/PictureRenderer.h
diff --git a/tools/PictureRenderer.h b/tools/PictureRenderer.h
index 31398019101d51f79c152dec307318d9362d4451..e935f401700abd590c2f92bb10c12772e1c9f1df 100644
--- a/tools/PictureRenderer.h
+++ b/tools/PictureRenderer.h
@@ -45,6 +45,9 @@ public:
#if SK_ANGLE
kAngle_DeviceType,
#endif
+#if SK_COMMAND_BUFFER
+ kCommandBuffer_DeviceType,
+#endif
#if SK_MESA
kMesa_DeviceType,
#endif
@@ -196,6 +199,11 @@ public:
glContextType = GrContextFactory::kANGLE_GLContextType;
break;
#endif
+#if SK_COMMAND_BUFFER
+ case kCommandBuffer_DeviceType:
+ glContextType = GrContextFactory::kCommandBuffer_GLContextType;
+ break;
+#endif
#if SK_MESA
case kMesa_DeviceType:
glContextType = GrContextFactory::kMESA_GLContextType;
@@ -288,6 +296,11 @@ public:
config.append("_angle");
break;
#endif
+#if SK_COMMAND_BUFFER
+ case kCommandBuffer_DeviceType:
+ config.append("_commandbuffer");
+ break;
+#endif
#if SK_MESA
case kMesa_DeviceType:
config.append("_mesa");
@@ -337,6 +350,11 @@ public:
result["config"] = "angle";
break;
#endif
+#if SK_COMMAND_BUFFER
+ case kCommandBuffer_DeviceType:
+ result["config"] = "commandbuffer";
+ break;
+#endif
#if SK_MESA
case kMesa_DeviceType:
result["config"] = "mesa";
@@ -360,6 +378,10 @@ public:
case kAngle_DeviceType:
// fall through
#endif
+#if SK_COMMAND_BUFFER
+ case kCommandBuffer_DeviceType:
+ // fall through
+#endif
#if SK_MESA
case kMesa_DeviceType:
#endif
@@ -384,6 +406,11 @@ public:
glContextType = GrContextFactory::kANGLE_GLContextType;
break;
#endif
+#if SK_COMMAND_BUFFER
+ case kCommandBuffer_DeviceType:
+ glContextType = GrContextFactory::kCommandBuffer_GLContextType;
+ break;
+#endif
#if SK_MESA
case kMesa_DeviceType:
glContextType = GrContextFactory::kMESA_GLContextType;
« no previous file with comments | « tests/SkpSkGrTest.cpp ('k') | tools/PictureRenderer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698