diff options
| author | Brian Salomon <bsalomon@google.com> | 2019-01-30 12:20:56 -0500 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2019-01-30 18:09:21 +0000 |
| commit | 59ef8c36c1d5b8f7d0484b8bc36201eafda2a0a0 (patch) | |
| tree | e096ac56792140690ecfb46eeb182b6a62ceb91b /tests | |
| parent | b0243b29cb67284b736ae35375259e516ba4a1ed (diff) | |
| download | skqp-59ef8c36c1d5b8f7d0484b8bc36201eafda2a0a0.tar.gz | |
Remove legacy texture-backed promise image interface.
No longer used by Chrome.
Change-Id: I842482490f132bb3aa3e85f847d8d4167f5595df
Reviewed-on: https://skia-review.googlesource.com/c/188029
Commit-Queue: Robert Phillips <robertphillips@google.com>
Auto-Submit: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/DeferredDisplayListTest.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/DeferredDisplayListTest.cpp b/tests/DeferredDisplayListTest.cpp index 8e49446408..e20bc82f21 100644 --- a/tests/DeferredDisplayListTest.cpp +++ b/tests/DeferredDisplayListTest.cpp @@ -5,8 +5,9 @@ * found in the LICENSE file. */ -#include "SkTypes.h" - +#include <initializer_list> +#include <memory> +#include <utility> #include "GrBackendSurface.h" #include "GrCaps.h" #include "GrContext.h" @@ -30,6 +31,7 @@ #include "SkImageInfo.h" #include "SkImage_Gpu.h" #include "SkPaint.h" +#include "SkPromiseImageTexture.h" #include "SkRect.h" #include "SkRefCnt.h" #include "SkSurface.h" @@ -40,15 +42,10 @@ #include "gl/GrGLCaps.h" #include "gl/GrGLDefines.h" #include "gl/GrGLTypes.h" - #ifdef SK_VULKAN #include <vulkan/vulkan_core.h> #endif -#include <initializer_list> -#include <memory> -#include <utility> - // Try to create a backend format from the provided colorType and config. Return an invalid // backend format if the combination is infeasible. static GrBackendFormat create_backend_format(GrContext* context, @@ -739,9 +736,12 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(DDLWrapBackendTest, reporter, ctxInfo) { params.cleanUpBackEnd(context, backend); } -static void dummy_fulfill_proc(void*, GrBackendTexture*) { SkASSERT(0); } +static sk_sp<SkPromiseImageTexture> dummy_fulfill_proc(void*) { + SkASSERT(0); + return nullptr; +} static void dummy_release_proc(void*) { SkASSERT(0); } -static void dummy_done_proc(void*) { } +static void dummy_done_proc(void*) {} //////////////////////////////////////////////////////////////////////////////// // Test out the behavior of an invalid DDLRecorder |