b3ecd560a2
This reverts commit 65a726bb49
.
Reason for revert: You cannot include a src file in an include file. This ends up using c++17 features in our includes. Breaks rolls.
Original change's description:
> Move GR_MAKE_BITFIELD_OPS and GrAlignTo to non-GPU files
>
> These have been renamed SK_MAKE_BITFIELD_OPS and SkAlignTo
> because nothing seemed particularly GPU/Ganesh specific to them.
>
> I moved the latter to SkTypes.h because we have other align
> code there and former to src/SkUtils.h because I didn't know
> where else it should go.
>
> The primary motivation was removing the GrTypesPriv.h
> include from src/core/SkBlockAllocator.h. I had attempted
> some amount of #if SK_SUPPORT_GPU, but that's not as clean
> here because both our CPU and GPU backends use the
> SkBlockAllocator (as far as I could tell).
>
> This also moves sk_memset* from SkUtils.h to SkOpts.h, because
> SkOpts.h requires bringing in RasterPipeline, which seemed
> like overkill.
>
> Change-Id: I5163ef5064ad3840a15b7e873930d60e2620bf9d
> Bug: skia:12584
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/464876
> Reviewed-by: Brian Osman <brianosman@google.com>
Bug: skia:12584
Change-Id: I1b772bbbc6f150d737bb53fa4e5f45d1581929fa
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/465376
Auto-Submit: Greg Daniel <egdaniel@google.com>
Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
164 lines
5.5 KiB
C++
164 lines
5.5 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 "include/core/SkBitmap.h"
|
|
#include "include/core/SkBlendMode.h"
|
|
#include "include/core/SkCanvas.h"
|
|
#include "include/core/SkColor.h"
|
|
#include "include/core/SkColorFilter.h"
|
|
#include "include/core/SkColorPriv.h"
|
|
#include "include/core/SkImageInfo.h"
|
|
#include "include/core/SkPaint.h"
|
|
#include "include/core/SkRefCnt.h"
|
|
#include "include/core/SkScalar.h"
|
|
#include "include/core/SkSurface.h"
|
|
#include "include/core/SkTypes.h"
|
|
#include "include/gpu/GrDirectContext.h"
|
|
#include "include/private/GrTypesPriv.h"
|
|
#include "include/private/SkTemplates.h"
|
|
#include "src/core/SkUtils.h"
|
|
#include "src/gpu/GrCaps.h"
|
|
#include "src/gpu/GrDirectContextPriv.h"
|
|
#include "src/gpu/GrShaderCaps.h"
|
|
#include "tests/Test.h"
|
|
#include "tools/gpu/GrContextFactory.h"
|
|
|
|
#include <math.h>
|
|
#include <initializer_list>
|
|
|
|
/** convert 0..1 linear value to 0..1 srgb */
|
|
static float linear_to_srgb(float linear) {
|
|
if (linear <= 0.0031308) {
|
|
return linear * 12.92f;
|
|
} else {
|
|
return 1.055f * powf(linear, 1.f / 2.4f) - 0.055f;
|
|
}
|
|
}
|
|
|
|
/** convert 0..1 srgb value to 0..1 linear */
|
|
static float srgb_to_linear(float srgb) {
|
|
if (srgb <= 0.04045f) {
|
|
return srgb / 12.92f;
|
|
} else {
|
|
return powf((srgb + 0.055f) / 1.055f, 2.4f);
|
|
}
|
|
}
|
|
|
|
bool check_gamma(uint32_t src, uint32_t dst, bool toSRGB, float error,
|
|
uint32_t* expected) {
|
|
bool result = true;
|
|
uint32_t expectedColor = src & 0xff000000;
|
|
|
|
// Alpha should always be exactly preserved.
|
|
if ((src & 0xff000000) != (dst & 0xff000000)) {
|
|
result = false;
|
|
}
|
|
|
|
// need to unpremul before we can perform srgb magic
|
|
float invScale = 0;
|
|
float alpha = SkGetPackedA32(src);
|
|
if (alpha) {
|
|
invScale = 255.0f / alpha;
|
|
}
|
|
|
|
for (int c = 0; c < 3; ++c) {
|
|
float srcComponent = ((src & (0xff << (c * 8))) >> (c * 8)) * invScale;
|
|
float lower = std::max(0.f, srcComponent - error);
|
|
float upper = std::min(255.f, srcComponent + error);
|
|
if (toSRGB) {
|
|
lower = linear_to_srgb(lower / 255.f);
|
|
upper = linear_to_srgb(upper / 255.f);
|
|
} else {
|
|
lower = srgb_to_linear(lower / 255.f);
|
|
upper = srgb_to_linear(upper / 255.f);
|
|
}
|
|
lower *= alpha;
|
|
upper *= alpha;
|
|
SkASSERT(lower >= 0.f && lower <= 255.f);
|
|
SkASSERT(upper >= 0.f && upper <= 255.f);
|
|
uint8_t dstComponent = (dst & (0xff << (c * 8))) >> (c * 8);
|
|
if (dstComponent < SkScalarFloorToInt(lower) ||
|
|
dstComponent > SkScalarCeilToInt(upper)) {
|
|
result = false;
|
|
}
|
|
uint8_t expectedComponent = SkScalarRoundToInt((lower + upper) * 0.5f);
|
|
expectedColor |= expectedComponent << (c * 8);
|
|
}
|
|
|
|
*expected = expectedColor;
|
|
return result;
|
|
}
|
|
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ApplyGamma, reporter, ctxInfo) {
|
|
auto context = ctxInfo.directContext();
|
|
static constexpr SkISize kBaseSize{256, 256};
|
|
static const size_t kRowBytes = sizeof(uint32_t) * kBaseSize.fWidth;
|
|
|
|
const SkImageInfo ii = SkImageInfo::MakeN32Premul(kBaseSize);
|
|
|
|
SkAutoTMalloc<uint32_t> srcPixels(kBaseSize.area());
|
|
for (int y = 0; y < kBaseSize.fHeight; ++y) {
|
|
for (int x = 0; x < kBaseSize.fWidth; ++x) {
|
|
srcPixels.get()[y*kBaseSize.fWidth+x] = SkPreMultiplyARGB(x, y, x, 0xFF);
|
|
}
|
|
}
|
|
|
|
SkBitmap bm;
|
|
bm.installPixels(ii, srcPixels.get(), kRowBytes);
|
|
auto img = bm.asImage();
|
|
|
|
SkAutoTMalloc<uint32_t> read(kBaseSize.area());
|
|
|
|
// We allow more error on GPUs with lower precision shader variables.
|
|
float error = context->priv().caps()->shaderCaps()->halfIs32Bits() ? 0.5f : 1.2f;
|
|
|
|
for (auto toSRGB : { false, true }) {
|
|
sk_sp<SkSurface> dst(SkSurface::MakeRenderTarget(context, SkBudgeted::kNo, ii));
|
|
|
|
if (!dst) {
|
|
ERRORF(reporter, "Could not create surfaces for copy surface test.");
|
|
continue;
|
|
}
|
|
|
|
SkCanvas* dstCanvas = dst->getCanvas();
|
|
|
|
dstCanvas->clear(SK_ColorRED);
|
|
dst->flushAndSubmit();
|
|
|
|
SkPaint gammaPaint;
|
|
gammaPaint.setBlendMode(SkBlendMode::kSrc);
|
|
gammaPaint.setColorFilter(toSRGB ? SkColorFilters::LinearToSRGBGamma()
|
|
: SkColorFilters::SRGBToLinearGamma());
|
|
|
|
dstCanvas->drawImage(img, 0, 0, SkSamplingOptions(), &gammaPaint);
|
|
dst->flushAndSubmit();
|
|
|
|
sk_memset32(read.get(), 0, kBaseSize.fWidth * kBaseSize.fHeight);
|
|
if (!dst->readPixels(ii, read.get(), kRowBytes, 0, 0)) {
|
|
ERRORF(reporter, "Error calling readPixels");
|
|
continue;
|
|
}
|
|
|
|
bool abort = false;
|
|
// Validate that pixels were copied/transformed correctly.
|
|
for (int y = 0; y < kBaseSize.fHeight && !abort; ++y) {
|
|
for (int x = 0; x < kBaseSize.fWidth && !abort; ++x) {
|
|
uint32_t r = read.get()[y * kBaseSize.fWidth + x];
|
|
uint32_t s = srcPixels.get()[y * kBaseSize.fWidth + x];
|
|
uint32_t expected;
|
|
if (!check_gamma(s, r, toSRGB, error, &expected)) {
|
|
ERRORF(reporter, "Expected dst %d,%d to contain 0x%08x "
|
|
"from src 0x%08x and mode %s. Got %08x", x, y, expected, s,
|
|
toSRGB ? "ToSRGB" : "ToLinear", r);
|
|
abort = true;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|