diff options
| author |  kkinnunen <kkinnunen@nvidia.com> | 2016-02-25 02:03:43 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-25 02:03:43 -0800 |
| commit | 45c2c8166bbd84a87e29fdd344b39e36e8a28a3f (patch) | |
| tree | 9288929fb75ee43b3676964a6abe2f8cab7b5f6d /samplecode | |
| parent | 3eed7ddb25408cdd1c437e65728bac115aeacbd1 (diff) | |
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
Diffstat (limited to 'samplecode')
| -rw-r--r-- | samplecode/SampleApp.cpp | 10 | ||||
| -rw-r--r-- | samplecode/SampleApp.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 7ebac5f215..5b13310677 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -206,9 +206,9 @@ public: 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 @@ public: 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 @@ static inline SampleWindow::DeviceType cycle_devicetype(SampleWindow::DeviceType , 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 @@ SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* dev fDeviceType = kANGLE_DeviceType; #endif #if SK_COMMAND_BUFFER && DEFAULT_TO_COMMAND_BUFFER - fDeviceType = kCommandBuffer_DeviceType; + fDeviceType = kCommandBufferES2_DeviceType; #endif fUseClip = false; diff --git a/samplecode/SampleApp.h b/samplecode/SampleApp.h index d4157fa415..9bcb085efa 100644 --- a/samplecode/SampleApp.h +++ b/samplecode/SampleApp.h @@ -39,7 +39,7 @@ public: 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 @@ public: case kANGLE_DeviceType: #endif // SK_ANGLE #if SK_COMMAND_BUFFER - case kCommandBuffer_DeviceType: + case kCommandBufferES2_DeviceType: #endif // SK_COMMAND_BUFFER return true; default: |