1d816b92bb
This reverts commit 88d99c6387
.
Reason for revert: Believed to be causing unit test failures in Chrome roll:
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_android_rel_ng/builds/364433
https://luci-logdog.appspot.com/v/?s=chromium%2Fbb%2Ftryserver.chromium.android%2Flinux_android_rel_ng%2F364433%2F%2B%2Frecipes%2Fsteps%2Fcontent_browsertests__with_patch__on_Android%2F0%2Flogs%2FWebRtcCaptureFromElementBrowserTest.VerifyCanvasWebGLCaptureColor%2F0
Original change's description:
> Switched highp float to highfloat and mediump float to half.
>
> The ultimate goal is to end up with "float" and "half", but this
> intermediate step uses "highfloat" so that it is clear if I missed a
> "float" somewhere. Once this lands, a subsequent CL will switch all
> "highfloats" back to "floats".
>
> Bug: skia:
> Change-Id: Ia13225c7a0a0a2901e07665891c473d2500ddcca
> Reviewed-on: https://skia-review.googlesource.com/31000
> Commit-Queue: Ethan Nicholas <ethannicholas@google.com>
> Reviewed-by: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,csmartdalton@google.com,ethannicholas@google.com
Change-Id: I8bfa97547ac3920d433665f161d27df3f15c83aa
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/35705
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
181 lines
7.6 KiB
C++
181 lines
7.6 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 "Test.h"
|
|
|
|
#if SK_SUPPORT_GPU
|
|
|
|
#include "GrClip.h"
|
|
#include "GrFragmentProcessor.h"
|
|
#include "GrRenderTargetContext.h"
|
|
#include "GrTexture.h"
|
|
#include "glsl/GrGLSLFragmentProcessor.h"
|
|
#include "glsl/GrGLSLFragmentShaderBuilder.h"
|
|
|
|
DEF_GPUTEST_FOR_RENDERING_CONTEXTS(ImageStorageLoad, reporter, ctxInfo) {
|
|
class TestFP : public GrFragmentProcessor {
|
|
public:
|
|
static std::unique_ptr<GrFragmentProcessor> Make(sk_sp<GrTextureProxy> proxy,
|
|
GrSLMemoryModel mm,
|
|
GrSLRestrict restrict) {
|
|
return std::unique_ptr<GrFragmentProcessor>(new TestFP(std::move(proxy), mm, restrict));
|
|
}
|
|
|
|
const char* name() const override { return "Image Load Test FP"; }
|
|
|
|
std::unique_ptr<GrFragmentProcessor> clone() const override {
|
|
return std::unique_ptr<GrFragmentProcessor>(new TestFP(*this));
|
|
}
|
|
|
|
private:
|
|
TestFP(sk_sp<GrTextureProxy> proxy, GrSLMemoryModel mm, GrSLRestrict restrict)
|
|
: INHERITED(kNone_OptimizationFlags)
|
|
, fImageStorageAccess(std::move(proxy), kRead_GrIOType, mm, restrict) {
|
|
this->initClassID<TestFP>();
|
|
this->addImageStorageAccess(&fImageStorageAccess);
|
|
}
|
|
|
|
explicit TestFP(const TestFP& that)
|
|
: INHERITED(that.optimizationFlags())
|
|
, fImageStorageAccess(that.fImageStorageAccess) {
|
|
this->initClassID<TestFP>();
|
|
this->addImageStorageAccess(&fImageStorageAccess);
|
|
}
|
|
|
|
void onGetGLSLProcessorKey(const GrShaderCaps&, GrProcessorKeyBuilder*) const override {}
|
|
|
|
bool onIsEqual(const GrFragmentProcessor& that) const override { return true; }
|
|
|
|
GrGLSLFragmentProcessor* onCreateGLSLInstance() const override {
|
|
class GLSLProcessor : public GrGLSLFragmentProcessor {
|
|
public:
|
|
GLSLProcessor() = default;
|
|
void emitCode(EmitArgs& args) override {
|
|
const TestFP& tfp = args.fFp.cast<TestFP>();
|
|
GrGLSLFPFragmentBuilder* fb = args.fFragBuilder;
|
|
SkString imageLoadStr;
|
|
fb->codeAppend("highp float2 coord = sk_FragCoord.xy;");
|
|
fb->appendImageStorageLoad(&imageLoadStr, args.fImageStorages[0],
|
|
"int2(coord)");
|
|
if (GrPixelConfigIsSint(tfp.fImageStorageAccess.peekTexture()->config())) {
|
|
// Map the signed bytes so that when then get read back as unorm values they
|
|
// will have their original bit pattern.
|
|
fb->codeAppendf("highp int4 ivals = %s;", imageLoadStr.c_str());
|
|
// NV gives a linker error for this:
|
|
// fb->codeAppend("ivals +=
|
|
// "mix(int4(0), int4(256), lessThan(ivals, int4(0)));");
|
|
fb->codeAppend("if (ivals.r < 0) { ivals.r += 256; }");
|
|
fb->codeAppend("if (ivals.g < 0) { ivals.g += 256; }");
|
|
fb->codeAppend("if (ivals.b < 0) { ivals.b += 256; }");
|
|
fb->codeAppend("if (ivals.a < 0) { ivals.a += 256; }");
|
|
fb->codeAppendf("%s = float4(ivals)/255;", args.fOutputColor);
|
|
} else {
|
|
fb->codeAppendf("%s = %s;", args.fOutputColor, imageLoadStr.c_str());
|
|
}
|
|
}
|
|
};
|
|
return new GLSLProcessor;
|
|
}
|
|
|
|
ImageStorageAccess fImageStorageAccess;
|
|
typedef GrFragmentProcessor INHERITED;
|
|
};
|
|
|
|
static constexpr int kS = 256;
|
|
GrContext* context = ctxInfo.grContext();
|
|
if (context->caps()->shaderCaps()->maxFragmentImageStorages() < 1) {
|
|
return;
|
|
}
|
|
|
|
std::unique_ptr<uint32_t[]> data(new uint32_t[kS * kS]);
|
|
for (int j = 0; j < kS; ++j) {
|
|
for (int i = 0; i < kS; ++i) {
|
|
data[i + kS * j] = GrColorPackRGBA(i, j, 0, 0);
|
|
}
|
|
}
|
|
|
|
std::unique_ptr<uint32_t[]> idata(new uint32_t[kS * kS]);
|
|
for (int j = 0; j < kS; ++j) {
|
|
for (int i = 0; i < kS; ++i) {
|
|
int8_t r = i - 128;
|
|
int8_t g = j - 128;
|
|
int8_t b = -128;
|
|
int8_t a = -128;
|
|
idata[i + kS * j] = ((uint8_t)a << 24) | ((uint8_t)b << 16) |
|
|
((uint8_t)g << 8) | (uint8_t)r;
|
|
}
|
|
}
|
|
|
|
// Currently image accesses always have "top left" semantics.
|
|
GrSurfaceDesc desc;
|
|
desc.fOrigin = kTopLeft_GrSurfaceOrigin;
|
|
desc.fWidth = kS;
|
|
desc.fHeight = kS;
|
|
struct {
|
|
GrPixelConfig fConfig;
|
|
std::unique_ptr<uint32_t[]> fData;
|
|
} tests[] = {
|
|
{
|
|
kRGBA_8888_GrPixelConfig,
|
|
std::move(data)
|
|
},
|
|
{
|
|
kRGBA_8888_sint_GrPixelConfig,
|
|
std::move(idata)
|
|
},
|
|
};
|
|
for (const auto& test : tests) {
|
|
// This test should work with any memory model and with or without restrict
|
|
for (auto mm : {GrSLMemoryModel::kNone,
|
|
GrSLMemoryModel::kCoherent,
|
|
GrSLMemoryModel::kVolatile}) {
|
|
for (auto restrict : {GrSLRestrict::kNo, GrSLRestrict::kYes}) {
|
|
if (!context->caps()->canConfigBeImageStorage(test.fConfig)) {
|
|
continue;
|
|
}
|
|
desc.fConfig = test.fConfig;
|
|
sk_sp<GrTextureProxy> imageStorageTexture =
|
|
GrSurfaceProxy::MakeDeferred(context->resourceProvider(), desc,
|
|
SkBudgeted::kYes, test.fData.get(), 0);
|
|
|
|
sk_sp<GrRenderTargetContext> rtContext =
|
|
context->makeDeferredRenderTargetContext(SkBackingFit::kExact, kS, kS,
|
|
kRGBA_8888_GrPixelConfig, nullptr);
|
|
// We make a clone to test that copying GrFragmentProcessor::ImageStorageAccess
|
|
// works.
|
|
std::unique_ptr<GrFragmentProcessor> fps[2];
|
|
fps[0] = TestFP::Make(imageStorageTexture, mm, restrict);
|
|
fps[1] = fps[0]->clone();
|
|
for (auto& fp : fps) {
|
|
GrPaint paint;
|
|
paint.setPorterDuffXPFactory(SkBlendMode::kSrc);
|
|
paint.addColorFragmentProcessor(std::move(fp));
|
|
rtContext->drawPaint(GrNoClip(), std::move(paint), SkMatrix::I());
|
|
std::unique_ptr<uint32_t[]> readData(new uint32_t[kS * kS]);
|
|
SkImageInfo info = SkImageInfo::Make(kS, kS, kRGBA_8888_SkColorType,
|
|
kPremul_SkAlphaType);
|
|
rtContext->readPixels(info, readData.get(), 0, 0, 0);
|
|
int failed = false;
|
|
for (int j = 0; j < kS && !failed; ++j) {
|
|
for (int i = 0; i < kS && !failed; ++i) {
|
|
uint32_t d = test.fData[j * kS + i];
|
|
uint32_t rd = readData[j * kS + i];
|
|
if (d != rd) {
|
|
failed = true;
|
|
ERRORF(reporter, "Expected 0x%08x, got 0x%08x at %d, %d.",
|
|
d, rd, i, j);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#endif
|