f9a1fdf01f
This reverts commit693bc2bae5
. Reason for revert: <INSERT REASONING HERE> Original change's description: > Revert "Add flush() to SkImage." > > This reverts commitd0503a72ac
. > > Reason for revert: <INSERT REASONING HERE> > > Original change's description: > > Add flush() to SkImage. > > > > This allows a client to ensure all uses of a texture-backed image have > > been flushed. > > > > Does nothing if the image isn't texture-backed. > > > > The implementation adds support for triggering a flush if any of a set > > of proxies are used rather than just a single proxy. > > > > Change-Id: I358882d9737e63c6e69b924c0767f49b8f8f36ec > > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/212405 > > Commit-Queue: Brian Salomon <bsalomon@google.com> > > Reviewed-by: Robert Phillips <robertphillips@google.com> > > TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com > > Change-Id: Ie376bf4225307f45b8fb3eb4a63bf84702365797 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/212884 > Reviewed-by: Brian Salomon <bsalomon@google.com> > Commit-Queue: Brian Salomon <bsalomon@google.com> TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com Change-Id: Idcba378ce2e3af0af9d0eef35737670055539ec5 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/212960 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
128 lines
4.7 KiB
C++
128 lines
4.7 KiB
C++
/*
|
|
* Copyright 2019 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "tests/Test.h"
|
|
|
|
#include <chrono>
|
|
#include "include/core/SkSurface.h"
|
|
#include "include/gpu/GrContext.h"
|
|
#include "src/gpu/GrContextPriv.h"
|
|
#include "src/gpu/GrGpu.h"
|
|
|
|
using namespace sk_gpu_test;
|
|
|
|
static void testing_finished_proc(void* ctx) {
|
|
int* count = (int*)ctx;
|
|
*count += 1;
|
|
}
|
|
|
|
static void busy_wait_for_callback(int* count, int expectedValue, GrContext* ctx,
|
|
skiatest::Reporter* reporter) {
|
|
// Busy waiting should detect that the work is done.
|
|
auto begin = std::chrono::steady_clock::now();
|
|
auto end = begin;
|
|
do {
|
|
ctx->checkAsyncWorkCompletion();
|
|
end = std::chrono::steady_clock::now();
|
|
} while (*count != expectedValue && (end - begin) < std::chrono::seconds(1));
|
|
if (*count != expectedValue) {
|
|
ERRORF(reporter, "Expected count failed to reach %d within 1 second of busy waiting.",
|
|
expectedValue);
|
|
}
|
|
}
|
|
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(FlushFinishedProcTest, reporter, ctxInfo) {
|
|
GrContext* ctx = ctxInfo.grContext();
|
|
|
|
SkImageInfo info =
|
|
SkImageInfo::Make(8, 8, kRGBA_8888_SkColorType, kPremul_SkAlphaType);
|
|
sk_sp<SkSurface> surface = SkSurface::MakeRenderTarget(ctx, SkBudgeted::kNo, info);
|
|
SkCanvas* canvas = surface->getCanvas();
|
|
|
|
canvas->clear(SK_ColorGREEN);
|
|
auto image = surface->makeImageSnapshot();
|
|
|
|
GrFlushInfo flushInfoSyncCpu;
|
|
flushInfoSyncCpu.fFlags = kSyncCpu_GrFlushFlag;
|
|
ctx->flush(flushInfoSyncCpu);
|
|
|
|
int count = 0;
|
|
|
|
GrFlushInfo flushInfoFinishedProc;
|
|
flushInfoFinishedProc.fFinishedProc = testing_finished_proc;
|
|
flushInfoFinishedProc.fFinishedContext = (void*)&count;
|
|
// There is no work on the surface so flushing may immediately call the finished proc.
|
|
surface->flush(SkSurface::BackendSurfaceAccess::kNoAccess, flushInfoFinishedProc);
|
|
REPORTER_ASSERT(reporter, count == 0 || count == 1);
|
|
// Busy waiting should detect that the work is done.
|
|
busy_wait_for_callback(&count, 1, ctx, reporter);
|
|
|
|
canvas->clear(SK_ColorRED);
|
|
|
|
surface->flush(SkSurface::BackendSurfaceAccess::kNoAccess, flushInfoFinishedProc);
|
|
|
|
bool expectAsyncCallback =
|
|
ctx->backend() == GrBackendApi::kVulkan ||
|
|
((ctx->backend() == GrBackendApi::kOpenGL) && ctx->priv().caps()->fenceSyncSupport());
|
|
if (expectAsyncCallback) {
|
|
// On Vulkan the command buffer we just submitted may or may not have finished immediately
|
|
// so the finish proc may not have been called.
|
|
REPORTER_ASSERT(reporter, count == 1 || count == 2);
|
|
} else {
|
|
REPORTER_ASSERT(reporter, count == 2);
|
|
}
|
|
ctx->flush(flushInfoSyncCpu);
|
|
REPORTER_ASSERT(reporter, count == 2);
|
|
|
|
// Test flushing via the SkImage
|
|
canvas->drawImage(image, 0, 0);
|
|
image->flush(ctx, flushInfoFinishedProc);
|
|
if (expectAsyncCallback) {
|
|
// On Vulkan the command buffer we just submitted may or may not have finished immediately
|
|
// so the finish proc may not have been called.
|
|
REPORTER_ASSERT(reporter, count == 2 || count == 3);
|
|
} else {
|
|
REPORTER_ASSERT(reporter, count == 3);
|
|
}
|
|
ctx->flush(flushInfoSyncCpu);
|
|
REPORTER_ASSERT(reporter, count == 3);
|
|
|
|
// Test flushing via the GrContext
|
|
canvas->clear(SK_ColorBLUE);
|
|
ctx->flush(flushInfoFinishedProc);
|
|
if (expectAsyncCallback) {
|
|
// On Vulkan the command buffer we just submitted may or may not have finished immediately
|
|
// so the finish proc may not have been called.
|
|
REPORTER_ASSERT(reporter, count == 3 || count == 4);
|
|
} else {
|
|
REPORTER_ASSERT(reporter, count == 4);
|
|
}
|
|
ctx->flush(flushInfoSyncCpu);
|
|
REPORTER_ASSERT(reporter, count == 4);
|
|
|
|
// There is no work on the surface so flushing may immediately call the finished proc.
|
|
ctx->flush(flushInfoFinishedProc);
|
|
REPORTER_ASSERT(reporter, count == 4 || count == 5);
|
|
busy_wait_for_callback(&count, 5, ctx, reporter);
|
|
|
|
count = 0;
|
|
int count2 = 0;
|
|
canvas->clear(SK_ColorGREEN);
|
|
surface->flush(SkSurface::BackendSurfaceAccess::kNoAccess, flushInfoFinishedProc);
|
|
// There is no work to be flushed here so this will return immediately, but make sure the
|
|
// finished call from this proc isn't called till the previous surface flush also is finished.
|
|
flushInfoFinishedProc.fFinishedContext = (void*)&count2;
|
|
ctx->flush(flushInfoFinishedProc);
|
|
REPORTER_ASSERT(reporter, count <= 1 && count2 <= count);
|
|
|
|
ctx->flush(flushInfoSyncCpu);
|
|
|
|
REPORTER_ASSERT(reporter, count == 1);
|
|
REPORTER_ASSERT(reporter, count == count2);
|
|
}
|
|
|