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 /include/views | |
| 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 'include/views')
| -rw-r--r-- | include/views/SkOSWindow_Mac.h | 2 | ||||
| -rw-r--r-- | include/views/SkOSWindow_SDL.h | 2 | ||||
| -rw-r--r-- | include/views/SkOSWindow_Unix.h | 2 | ||||
| -rw-r--r-- | include/views/SkOSWindow_Win.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/views/SkOSWindow_Mac.h b/include/views/SkOSWindow_Mac.h index 66f0cdfde7..6ce898321f 100644 --- a/include/views/SkOSWindow_Mac.h +++ b/include/views/SkOSWindow_Mac.h @@ -28,7 +28,7 @@ public: kANGLE_BackEndType, #endif // SK_ANGLE #if SK_COMMAND_BUFFER - kCommandBufferES2_BackEndType, + kCommandBuffer_BackEndType, #endif // SK_COMMAND_BUFFER }; diff --git a/include/views/SkOSWindow_SDL.h b/include/views/SkOSWindow_SDL.h index 65ef07eea0..e08108add4 100644 --- a/include/views/SkOSWindow_SDL.h +++ b/include/views/SkOSWindow_SDL.h @@ -24,7 +24,7 @@ public: kANGLE_BackEndType, #endif // SK_ANGLE #if SK_COMMAND_BUFFER - kCommandBufferES2_BackEndType, + kCommandBuffer_BackEndType, #endif // SK_COMMAND_BUFFER }; diff --git a/include/views/SkOSWindow_Unix.h b/include/views/SkOSWindow_Unix.h index 3395ab9d09..ecd0a14521 100644 --- a/include/views/SkOSWindow_Unix.h +++ b/include/views/SkOSWindow_Unix.h @@ -40,7 +40,7 @@ public: kANGLE_BackEndType, #endif // SK_ANGLE #if SK_COMMAND_BUFFER - kCommandBufferES2_BackEndType, + kCommandBuffer_BackEndType, #endif // SK_COMMAND_BUFFER }; diff --git a/include/views/SkOSWindow_Win.h b/include/views/SkOSWindow_Win.h index 9e771c2c6a..c1a68c621e 100644 --- a/include/views/SkOSWindow_Win.h +++ b/include/views/SkOSWindow_Win.h @@ -42,7 +42,7 @@ public: kANGLE_BackEndType, #endif // SK_ANGLE #if SK_COMMAND_BUFFER - kCommandBufferES2_BackEndType, + kCommandBuffer_BackEndType, #endif // SK_COMMAND_BUFFER #endif // SK_SUPPORT_GPU }; |