ab244f045a
This reverts commit9d5f66d9c2. Reason for revert: Leon landed Android fixes. Original change's description: > Revert "Reland: Remove SkLights include from SkCanvas.h" > > This reverts commitfed00319c9. > > Reason for revert: breaking the Android roll. > > Original change's description: > > Reland: Remove SkLights include from SkCanvas.h > > > > SkLights.h pulls in a bunch of other headers and is not needed (fwdecl > > works fine). > > > > Change-Id: I3ed97cd7861e51dcb7cfa7950a97b420dbc6fbfb > > TBR=reed@google.com > > Reviewed-on: https://skia-review.googlesource.com/15143 > > Commit-Queue: Florin Malita <fmalita@chromium.org> > > Reviewed-by: Florin Malita <fmalita@chromium.org> > > > > TBR=fmalita@chromium.org,reed@google.com > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > > Change-Id: I3b0e69f1d04d160f16a5567b09982d35cc9ca84e > Reviewed-on: https://skia-review.googlesource.com/15195 > Reviewed-by: Florin Malita <fmalita@chromium.org> > Commit-Queue: Florin Malita <fmalita@chromium.org> > TBR=msarett@google.com,reviews@skia.org,fmalita@chromium.org,reed@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: I0a1c2f9df61f16987ab72dfb4f3a205fbcc37667 Reviewed-on: https://skia-review.googlesource.com/15229 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
92 lines
2.8 KiB
C++
92 lines
2.8 KiB
C++
/*
|
|
* Copyright 2016 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file
|
|
*/
|
|
|
|
#include "SkBitmap.h"
|
|
#include "SkCanvas.h"
|
|
#include "SkSpecialImage.h"
|
|
#include "SkSpecialSurface.h"
|
|
#include "Test.h"
|
|
|
|
#if SK_SUPPORT_GPU
|
|
#include "GrContext.h"
|
|
#include "SkGr.h"
|
|
#endif
|
|
|
|
class TestingSpecialSurfaceAccess {
|
|
public:
|
|
static const SkIRect& Subset(const SkSpecialSurface* surf) {
|
|
return surf->subset();
|
|
}
|
|
};
|
|
|
|
// Both 'kSmallerSize' and 'kFullSize' need to be a non-power-of-2 to exercise
|
|
// the gpu's loose fit behavior
|
|
static const int kSmallerSize = 10;
|
|
static const int kPad = 5;
|
|
static const int kFullSize = kSmallerSize + 2 * kPad;
|
|
|
|
// Exercise the public API of SkSpecialSurface (e.g., getCanvas, newImageSnapshot)
|
|
static void test_surface(const sk_sp<SkSpecialSurface>& surf,
|
|
skiatest::Reporter* reporter,
|
|
int offset) {
|
|
|
|
const SkIRect surfSubset = TestingSpecialSurfaceAccess::Subset(surf.get());
|
|
REPORTER_ASSERT(reporter, offset == surfSubset.fLeft);
|
|
REPORTER_ASSERT(reporter, offset == surfSubset.fTop);
|
|
REPORTER_ASSERT(reporter, kSmallerSize == surfSubset.width());
|
|
REPORTER_ASSERT(reporter, kSmallerSize == surfSubset.height());
|
|
|
|
SkCanvas* canvas = surf->getCanvas();
|
|
SkASSERT_RELEASE(canvas);
|
|
|
|
canvas->clear(SK_ColorRED);
|
|
|
|
sk_sp<SkSpecialImage> img(surf->makeImageSnapshot());
|
|
REPORTER_ASSERT(reporter, img);
|
|
|
|
const SkIRect imgSubset = img->subset();
|
|
REPORTER_ASSERT(reporter, surfSubset == imgSubset);
|
|
|
|
// the canvas was invalidated by the newImageSnapshot call
|
|
REPORTER_ASSERT(reporter, !surf->getCanvas());
|
|
}
|
|
|
|
DEF_TEST(SpecialSurface_Raster, reporter) {
|
|
|
|
SkImageInfo info = SkImageInfo::MakeN32(kSmallerSize, kSmallerSize, kOpaque_SkAlphaType);
|
|
sk_sp<SkSpecialSurface> surf(SkSpecialSurface::MakeRaster(info));
|
|
|
|
test_surface(surf, reporter, 0);
|
|
}
|
|
|
|
DEF_TEST(SpecialSurface_Raster2, reporter) {
|
|
|
|
SkBitmap bm;
|
|
bm.allocN32Pixels(kFullSize, kFullSize, true);
|
|
|
|
const SkIRect subset = SkIRect::MakeXYWH(kPad, kPad, kSmallerSize, kSmallerSize);
|
|
|
|
sk_sp<SkSpecialSurface> surf(SkSpecialSurface::MakeFromBitmap(subset, bm));
|
|
|
|
test_surface(surf, reporter, kPad);
|
|
|
|
// TODO: check that the clear didn't escape the active region
|
|
}
|
|
|
|
#if SK_SUPPORT_GPU
|
|
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(SpecialSurface_Gpu1, reporter, ctxInfo) {
|
|
sk_sp<SkSpecialSurface> surf(SkSpecialSurface::MakeRenderTarget(ctxInfo.grContext(),
|
|
kSmallerSize, kSmallerSize,
|
|
kRGBA_8888_GrPixelConfig,
|
|
nullptr));
|
|
|
|
test_surface(surf, reporter, 0);
|
|
}
|
|
|
|
#endif
|