diff options
| author | kkinnunen <kkinnunen@nvidia.com> | 2016-03-03 07:39:48 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-03 07:39:49 -0800 |
| commit | f655e9330e3e3cc3d56f19017c89d8309f2ddc36 (patch) | |
| tree | 71d25fb9377976ccfc9154d6ffb478c76986960b /samplecode/SampleApp.cpp | |
| parent | d0e0885d90cecd43b717d89b565d9a713cffd90c (diff) | |
Revert of Implement support for using GL ES 3.0 with command buffer (patchset #6 id:100001 of https://codereview.chromium.org/1684413003/ )
Reason for revert:
The dependency, ES3 implementation in command_buffer_gles2, got reverted.
Original issue's description:
> 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
>
> Committed: https://skia.googlesource.com/skia/+/45c2c8166bbd84a87e29fdd344b39e36e8a28a3f
TBR=bsalomon@google.com
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=skia:4943
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1744963002
Review URL: https://codereview.chromium.org/1744963002
Diffstat (limited to 'samplecode/SampleApp.cpp')
| -rw-r--r-- | samplecode/SampleApp.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp index 5b13310677..7ebac5f215 100644 --- a/samplecode/SampleApp.cpp +++ b/samplecode/SampleApp.cpp @@ -206,9 +206,9 @@ public: break; #endif // SK_ANGLE #if SK_COMMAND_BUFFER - case kCommandBufferES2_DeviceType: + case kCommandBuffer_DeviceType: // Command buffer is really the only other odd man out :D - fBackend = kCommandBufferES2_BackEndType; + fBackend = kCommandBuffer_BackEndType; break; #endif // SK_COMMAND_BUFFER default: @@ -237,7 +237,7 @@ public: break; #endif // SK_ANGLE #if SK_COMMAND_BUFFER - case kCommandBufferES2_DeviceType: + case kCommandBuffer_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::kCommandBufferES2_DeviceType + , SampleWindow::kCommandBuffer_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 = kCommandBufferES2_DeviceType; + fDeviceType = kCommandBuffer_DeviceType; #endif fUseClip = false; |