6bddf46375
This reverts commit 8005007e98
.
Reason for revert: text drop outs on D3D???
https://gold.skia.org/diff?test=xfermodes&left=1521937fb71ceb0615e8d369096ac180&right=b262b21be69db7b55b46106c0f60e9d7
Original change's description:
> Use SkImage_Raster's unique ID to cache textures.
>
> SkImages can share SkBitmaps and have different unique IDs/mipmap
> status. Currently we cache the texture version using the bitmap's
> unique ID. Instead use the image's ID so different images produce
> different textures (e.g. mipped and nonmipped).
>
> Bug: skia:11983
> Change-Id: Ic37564186f675277e5a9de1bcf36b40a19c3a3de
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/407356
> Commit-Queue: Brian Salomon <bsalomon@google.com>
> Reviewed-by: Robert Phillips <robertphillips@google.com>
TBR=bsalomon@google.com,robertphillips@google.com
Change-Id: I39422295840ecdf363d3541380e7a25ab91a198b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:11983
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/409298
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
136 lines
4.2 KiB
C++
136 lines
4.2 KiB
C++
/*
|
|
* Copyright 2017 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
// This is a GPU-backend specific test.
|
|
|
|
#include "tests/Test.h"
|
|
|
|
using namespace sk_gpu_test;
|
|
|
|
#include "tools/gpu/GrContextFactory.h"
|
|
|
|
#include "include/core/SkBitmap.h"
|
|
#include "include/core/SkCanvas.h"
|
|
#include "include/core/SkSurface.h"
|
|
#include "include/gpu/GrDirectContext.h"
|
|
#include "src/core/SkImagePriv.h"
|
|
|
|
static bool surface_is_expected_color(SkSurface* surf, const SkImageInfo& ii, SkColor color) {
|
|
SkBitmap bm;
|
|
bm.allocPixels(ii);
|
|
|
|
surf->readPixels(bm, 0, 0);
|
|
|
|
for (int y = 0; y < bm.height(); ++y) {
|
|
for (int x = 0; x < bm.width(); ++x) {
|
|
if (bm.getColor(x, y) != color) {
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
static void basic_test(skiatest::Reporter* reporter, GrRecordingContext* rContext) {
|
|
const SkImageInfo ii = SkImageInfo::Make(64, 64, kN32_SkColorType, kPremul_SkAlphaType);
|
|
|
|
SkBitmap bm;
|
|
bm.allocPixels(ii);
|
|
|
|
SkCanvas bmCanvas(bm);
|
|
bmCanvas.clear(SK_ColorRED);
|
|
|
|
// We start off with the raster image being all red.
|
|
sk_sp<SkImage> img = SkMakeImageFromRasterBitmap(bm, kNever_SkCopyPixelsMode);
|
|
|
|
sk_sp<SkSurface> gpuSurface = SkSurface::MakeRenderTarget(rContext, SkBudgeted::kYes, ii);
|
|
SkCanvas* canvas = gpuSurface->getCanvas();
|
|
|
|
// w/o pinning - the gpu draw always reflects the current state of the underlying bitmap
|
|
{
|
|
canvas->drawImage(img, 0, 0);
|
|
REPORTER_ASSERT(reporter, surface_is_expected_color(gpuSurface.get(), ii, SK_ColorRED));
|
|
|
|
bmCanvas.clear(SK_ColorGREEN);
|
|
|
|
canvas->drawImage(img, 0, 0);
|
|
REPORTER_ASSERT(reporter, surface_is_expected_color(gpuSurface.get(), ii, SK_ColorGREEN));
|
|
}
|
|
|
|
// w/ pinning - the gpu draw is stuck at the pinned state
|
|
{
|
|
SkImage_pinAsTexture(img.get(), rContext); // pin at blue
|
|
|
|
canvas->drawImage(img, 0, 0);
|
|
REPORTER_ASSERT(reporter, surface_is_expected_color(gpuSurface.get(), ii, SK_ColorGREEN));
|
|
|
|
bmCanvas.clear(SK_ColorBLUE);
|
|
|
|
canvas->drawImage(img, 0, 0);
|
|
REPORTER_ASSERT(reporter, surface_is_expected_color(gpuSurface.get(), ii, SK_ColorGREEN));
|
|
|
|
SkImage_unpinAsTexture(img.get(), rContext);
|
|
}
|
|
|
|
// once unpinned local changes will be picked up
|
|
{
|
|
canvas->drawImage(img, 0, 0);
|
|
REPORTER_ASSERT(reporter, surface_is_expected_color(gpuSurface.get(), ii, SK_ColorBLUE));
|
|
}
|
|
}
|
|
|
|
// Deleting the context while there are still pinned images shouldn't result in a crash.
|
|
static void cleanup_test(skiatest::Reporter* reporter) {
|
|
|
|
const SkImageInfo ii = SkImageInfo::Make(64, 64, kN32_SkColorType, kPremul_SkAlphaType);
|
|
|
|
SkBitmap bm;
|
|
bm.allocPixels(ii);
|
|
|
|
SkCanvas bmCanvas(bm);
|
|
bmCanvas.clear(SK_ColorRED);
|
|
|
|
GrMockOptions options;
|
|
sk_sp<GrDirectContext> mockContext = GrDirectContext::MakeMock(&options);
|
|
|
|
for (int i = 0; i < GrContextFactory::kContextTypeCnt; ++i) {
|
|
GrContextFactory::ContextType ctxType = (GrContextFactory::ContextType) i;
|
|
|
|
{
|
|
sk_sp<SkImage> img;
|
|
GrDirectContext* dContext = nullptr;
|
|
|
|
{
|
|
GrContextFactory testFactory;
|
|
ContextInfo info = testFactory.getContextInfo(ctxType);
|
|
dContext = info.directContext();
|
|
if (!dContext) {
|
|
continue;
|
|
}
|
|
|
|
img = SkMakeImageFromRasterBitmap(bm, kNever_SkCopyPixelsMode);
|
|
if (!SkImage_pinAsTexture(img.get(), dContext)) {
|
|
continue;
|
|
}
|
|
// Pinning on a second context should be blocked.
|
|
REPORTER_ASSERT(reporter, !SkImage_pinAsTexture(img.get(), mockContext.get()));
|
|
}
|
|
|
|
// The context used to pin the image is gone at this point!
|
|
// "context" isn't technically used in this call but it can't be null!
|
|
// We don't really want to support this use case but it currently happens.
|
|
SkImage_unpinAsTexture(img.get(), dContext);
|
|
}
|
|
}
|
|
}
|
|
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(PinnedImageTest, reporter, ctxInfo) {
|
|
basic_test(reporter, ctxInfo.directContext());
|
|
cleanup_test(reporter);
|
|
}
|