commit 45c2c8166bbd84a87e29fdd344b39e36e8a28a3f
author kkinnunen <kkinnunen@nvidia.com> Thu Feb 25 02:03:43 2016 -0800
committer Commit bot <commit-bot@chromium.org> Thu Feb 25 02:03:43 2016 -0800
tree 9288929fb75ee43b3676964a6abe2f8cab7b5f6d
parent 3eed7ddb25408cdd1c437e65728bac115aeacbd1

Implement support for using GL ES 3.0 with command buffer

Adds a new 'api': --config gpu(api=commandbuffer3) for dm/nanobench.

BUG=skia:4943
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1684413003

Review URL: https://codereview.chromium.org/1684413003

samplecode/SampleApp.cpp

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 7ebac5f..5b13310 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -206,9 +206,9 @@
                 break;
 #endif // SK_ANGLE
 #if SK_COMMAND_BUFFER
-            case kCommandBuffer_DeviceType:
+            case kCommandBufferES2_DeviceType:
                 // Command buffer is really the only other odd man out :D
-                fBackend = kCommandBuffer_BackEndType;
+                fBackend = kCommandBufferES2_BackEndType;
                 break;
 #endif // SK_COMMAND_BUFFER
             default:
@@ -237,7 +237,7 @@
                 break;
 #endif // SK_ANGLE
 #if SK_COMMAND_BUFFER
-            case kCommandBuffer_DeviceType:
+            case kCommandBufferES2_DeviceType:
                 glInterface.reset(GrGLCreateCommandBufferInterface());
                 break;
 #endif // SK_COMMAND_BUFFER
@@ -692,7 +692,7 @@
         , SampleWindow::kANGLE_DeviceType
 #endif // SK_ANGLE
 #if SK_COMMAND_BUFFER
-        , SampleWindow::kCommandBuffer_DeviceType
+        , SampleWindow::kCommandBufferES2_DeviceType
 #endif // SK_COMMAND_BUFFER
 #endif // SK_SUPPORT_GPU
     };
@@ -859,7 +859,7 @@
     fDeviceType = kANGLE_DeviceType;
 #endif
 #if SK_COMMAND_BUFFER && DEFAULT_TO_COMMAND_BUFFER
-    fDeviceType = kCommandBuffer_DeviceType;
+    fDeviceType = kCommandBufferES2_DeviceType;
 #endif
 
     fUseClip = false;

samplecode/SampleApp.h

diff --git a/samplecode/SampleApp.h b/samplecode/SampleApp.h
index d4157fa..9bcb085 100644
--- a/samplecode/SampleApp.h
+++ b/samplecode/SampleApp.h
@@ -39,7 +39,7 @@
         kANGLE_DeviceType,
 #endif // SK_ANGLE
 #if SK_COMMAND_BUFFER
-        kCommandBuffer_DeviceType,
+        kCommandBufferES2_DeviceType,
 #endif // SK_COMMAND_BUFFER
 #endif // SK_SUPPORT_GPU
         kDeviceTypeCnt
@@ -53,7 +53,7 @@
             case kANGLE_DeviceType:
     #endif // SK_ANGLE
     #if SK_COMMAND_BUFFER
-            case kCommandBuffer_DeviceType:
+            case kCommandBufferES2_DeviceType:
     #endif // SK_COMMAND_BUFFER
                 return true;
             default: