Revert "Make TextureOp use multitexturing to batch draws of different SkImages."
This reverts commit 2e50d0f5f93f1290341be02a1aa553b981f9774f.
Reason for revert: Shader compilation error
Original change's description:
> Make TextureOp use multitexturing to batch draws of different SkImages.
>
> On a benchmark drawing small texture backed images this shows a 50% improvement on a Pixel XL 2016 and a little better than that on a Z840.
>
> Change-Id: I5c307ef0d8615aeae67bae7393874ad7e52eb233
> Reviewed-on: https://skia-review.googlesource.com/42121
> Reviewed-by: Brian Osman <brianosman@google.com>
> Commit-Queue: Brian Salomon <bsalomon@google.com>
TBR=bsalomon@google.com,brianosman@google.com
Change-Id: I28b9a139627e2492a2af53dd82fc8c43be94464b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/43920
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
diff --git a/src/gpu/ops/GrTextureOp.cpp b/src/gpu/ops/GrTextureOp.cpp
index 9b9f4ae..3cb4dc0 100644
--- a/src/gpu/ops/GrTextureOp.cpp
+++ b/src/gpu/ops/GrTextureOp.cpp
@@ -7,7 +7,6 @@
#include "GrTextureOp.h"
#include "GrAppliedClip.h"
-#include "GrCaps.h"
#include "GrDrawOpTest.h"
#include "GrGeometryProcessor.h"
#include "GrMeshDrawOp.h"
@@ -16,10 +15,8 @@
#include "GrResourceProvider.h"
#include "GrShaderCaps.h"
#include "GrTexture.h"
-#include "GrTexturePriv.h"
#include "GrTextureProxy.h"
#include "SkGr.h"
-#include "SkMathPriv.h"
#include "glsl/GrGLSLColorSpaceXformHelper.h"
#include "glsl/GrGLSLGeometryProcessor.h"
#include "glsl/GrGLSLVarying.h"
@@ -38,42 +35,11 @@
SkPoint fTextureCoords;
GrColor fColor;
};
- struct MultiTextureVertex {
- SkPoint fPosition;
- int fTextureIdx;
- SkPoint fTextureCoords;
- GrColor fColor;
- };
-
- // Maximum number of textures supported by this op. Must also be checked against the caps
- // limit. These numbers were based on some limited experiments on a HP Z840 and Pixel XL 2016
- // and could probably use more tuning.
-#ifdef SK_BUILD_FOR_ANDROID
- static constexpr int kMaxTextures = 4;
-#else
- static constexpr int kMaxTextures = 8;
-#endif
-
- static int SupportsMultitexture(const GrShaderCaps& caps) { return caps.integerSupport(); }
-
- static sk_sp<GrGeometryProcessor> Make(sk_sp<GrTextureProxy> proxies[], int proxyCnt,
+ static sk_sp<GrGeometryProcessor> Make(sk_sp<GrTextureProxy> proxy,
sk_sp<GrColorSpaceXform> csxf,
- const GrSamplerState::Filter filters[],
- const GrShaderCaps& caps) {
- // We use placement new to avoid always allocating space for kMaxTextures TextureSampler
- // instances.
- int samplerCnt = NumSamplersToUse(proxyCnt, caps);
- size_t size = sizeof(TextureGeometryProcessor) + sizeof(TextureSampler) * (samplerCnt - 1);
- void* mem = GrGeometryProcessor::operator new(size);
- return sk_sp<TextureGeometryProcessor>(new (mem) TextureGeometryProcessor(
- proxies, proxyCnt, samplerCnt, std::move(csxf), filters, caps));
- }
-
- ~TextureGeometryProcessor() override {
- int cnt = this->numTextureSamplers();
- for (int i = 1; i < cnt; ++i) {
- fSamplers[i].~TextureSampler();
- }
+ GrSamplerState::Filter filter) {
+ return sk_sp<TextureGeometryProcessor>(
+ new TextureGeometryProcessor(std::move(proxy), std::move(csxf), filter));
}
const char* name() const override { return "TextureGeometryProcessor"; }
@@ -118,35 +84,12 @@
args.fFragBuilder->codeAppend("highp float2 texCoord;");
args.fVaryingHandler->addPassThroughAttribute(&textureGP.fTextureCoords, "texCoord",
kHigh_GrSLPrecision);
- if (textureGP.numTextureSamplers() > 1) {
- SkASSERT(args.fShaderCaps->integerSupport());
- args.fFragBuilder->codeAppend("int texIdx;");
- if (args.fShaderCaps->flatInterpolationSupport()) {
- args.fVaryingHandler->addFlatPassThroughAttribute(&textureGP.fTextureIdx,
- "texIdx");
- } else {
- args.fVaryingHandler->addPassThroughAttribute(&textureGP.fTextureIdx,
- "texIdx");
- }
- args.fFragBuilder->codeAppend("switch (texIdx) {");
- for (int i = 0; i < textureGP.numTextureSamplers(); ++i) {
- args.fFragBuilder->codeAppendf("case %d: %s = ", i, args.fOutputColor);
- args.fFragBuilder->appendTextureLookupAndModulate(args.fOutputColor,
- args.fTexSamplers[i],
- "texCoord",
- kVec2f_GrSLType,
- &fColorSpaceXformHelper);
- args.fFragBuilder->codeAppend("; break;");
- }
- args.fFragBuilder->codeAppend("}");
- } else {
- args.fFragBuilder->codeAppendf("%s = ", args.fOutputColor);
- args.fFragBuilder->appendTextureLookupAndModulate(args.fOutputColor,
- args.fTexSamplers[0],
- "texCoord",
- kVec2f_GrSLType,
- &fColorSpaceXformHelper);
- }
+ args.fFragBuilder->codeAppendf("%s = ", args.fOutputColor);
+ args.fFragBuilder->appendTextureLookupAndModulate(args.fOutputColor,
+ args.fTexSamplers[0],
+ "texCoord",
+ kVec2f_GrSLType,
+ &fColorSpaceXformHelper);
args.fFragBuilder->codeAppend(";");
args.fFragBuilder->codeAppendf("%s = float4(1);", args.fOutputCoverage);
}
@@ -156,60 +99,23 @@
}
private:
- // This exists to reduce the number of shaders generated. It does some rounding of sampler
- // counts.
- static int NumSamplersToUse(int numRealProxies, const GrShaderCaps& caps) {
- SkASSERT(numRealProxies > 0 && numRealProxies <= kMaxTextures &&
- numRealProxies <= caps.maxFragmentSamplers());
- if (1 == numRealProxies) {
- return 1;
- }
- if (numRealProxies <= 4) {
- return 4;
- }
- // Round to the next power of 2 and then clamp to kMaxTextures and the max allowed by caps.
- return SkTMin(SkNextPow2(numRealProxies), SkTMin(kMaxTextures, caps.maxFragmentSamplers()));
- }
-
- TextureGeometryProcessor(sk_sp<GrTextureProxy> proxies[], int proxyCnt, int samplerCnt,
- sk_sp<GrColorSpaceXform> csxf, const GrSamplerState::Filter filters[],
- const GrShaderCaps& caps)
- : fColorSpaceXform(std::move(csxf)) {
- SkASSERT(proxyCnt > 0 && samplerCnt >= proxyCnt);
+ TextureGeometryProcessor(sk_sp<GrTextureProxy> proxy, sk_sp<GrColorSpaceXform> csxf,
+ GrSamplerState::Filter filter)
+ : fSampler(std::move(proxy), filter), fColorSpaceXform(std::move(csxf)) {
this->initClassID<TextureGeometryProcessor>();
fPositions =
this->addVertexAttrib("position", kVec2f_GrVertexAttribType, kHigh_GrSLPrecision);
- fSamplers[0].reset(std::move(proxies[0]), filters[0]);
- this->addTextureSampler(&fSamplers[0]);
- for (int i = 1; i < proxyCnt; ++i) {
- // This class has one sampler built in, the rest come from memory this processor was
- // placement-newed into and so haven't been constructed.
- new (&fSamplers[i]) TextureSampler(std::move(proxies[i]), filters[i]);
- this->addTextureSampler(&fSamplers[i]);
- }
- if (samplerCnt > 1) {
- // Here we initialize any extra samplers by repeating the last one samplerCnt - proxyCnt
- // times.
- GrTextureProxy* dupeProxy = fSamplers[proxyCnt - 1].proxy();
- for (int i = proxyCnt; i < samplerCnt; ++i) {
- new (&fSamplers[i]) TextureSampler(sk_ref_sp(dupeProxy), filters[proxyCnt - 1]);
- this->addTextureSampler(&fSamplers[i]);
- }
- SkASSERT(caps.integerSupport());
- fTextureIdx = this->addVertexAttrib("textureIdx", kInt_GrVertexAttribType);
- }
-
fTextureCoords = this->addVertexAttrib("textureCoords", kVec2f_GrVertexAttribType,
kHigh_GrSLPrecision);
fColors = this->addVertexAttrib("color", kVec4ub_GrVertexAttribType);
+ this->addTextureSampler(&fSampler);
}
Attribute fPositions;
- Attribute fTextureIdx;
Attribute fTextureCoords;
Attribute fColors;
+ TextureSampler fSampler;
sk_sp<GrColorSpaceXform> fColorSpaceXform;
- TextureSampler fSamplers[1];
};
/**
@@ -228,41 +134,24 @@
allowSRBInputs));
}
- ~TextureOp() override {
- if (fFinalized) {
- auto proxies = this->proxies();
- for (int i = 0; i < fProxyCnt; ++i) {
- proxies[i]->completedRead();
- }
- if (fProxyCnt > 1) {
- delete[] reinterpret_cast<const char*>(proxies);
- }
- } else {
- SkASSERT(1 == fProxyCnt);
- fProxy0->unref();
- }
- }
+ ~TextureOp() override { fFinalized ? fProxy->completedRead() : fProxy->unref(); }
const char* name() const override { return "TextureOp"; }
SkString dumpInfo() const override {
SkString str;
- str.appendf("AllowSRGBInputs: %d\n", fAllowSRGBInputs);
+ str.appendf("Filter: %d AllowSRGBInputs: %d\n", static_cast<int>(fFilter),
+ fAllowSRGBInputs);
str.appendf("# draws: %d\n", fDraws.count());
- auto proxies = this->proxies();
- for (int i = 0; i < fProxyCnt; ++i) {
- str.appendf("Proxy ID %d: %d, Filter: %d\n", i, proxies[i]->uniqueID().asUInt(),
- static_cast<int>(this->filters()[i]));
- }
for (int i = 0; i < fDraws.count(); ++i) {
const Draw& draw = fDraws[i];
str.appendf(
- "%d: Color: 0x%08x, ProxyIdx: %d, TexRect [L: %.2f, T: %.2f, R: %.2f, B: %.2f] "
- "Quad [(%.2f, %.2f), (%.2f, %.2f), (%.2f, %.2f), (%.2f, %.2f)]\n",
- i, draw.fColor, draw.fTextureIdx, draw.fSrcRect.fLeft, draw.fSrcRect.fTop,
- draw.fSrcRect.fRight, draw.fSrcRect.fBottom, draw.fQuad.points()[0].fX,
- draw.fQuad.points()[0].fY, draw.fQuad.points()[1].fX, draw.fQuad.points()[1].fY,
- draw.fQuad.points()[2].fX, draw.fQuad.points()[2].fY, draw.fQuad.points()[3].fX,
+ "%d: Color: 0x%08x, TexRect [L: %.2f, T: %.2f, R: %.2f, B: %.2f] Quad [(%.2f, "
+ "%.2f), (%.2f, %.2f), (%.2f, %.2f), (%.2f, %.2f)]\n",
+ i, draw.fColor, draw.fSrcRect.fLeft, draw.fSrcRect.fTop, draw.fSrcRect.fRight,
+ draw.fSrcRect.fBottom, draw.fQuad.points()[0].fX, draw.fQuad.points()[0].fY,
+ draw.fQuad.points()[1].fX, draw.fQuad.points()[1].fY, draw.fQuad.points()[2].fX,
+ draw.fQuad.points()[2].fY, draw.fQuad.points()[3].fX,
draw.fQuad.points()[3].fY);
}
str += INHERITED::dumpInfo();
@@ -271,10 +160,9 @@
RequiresDstTexture finalize(const GrCaps& caps, const GrAppliedClip* clip) override {
SkASSERT(!fFinalized);
- SkASSERT(1 == fProxyCnt);
fFinalized = true;
- fProxy0->addPendingRead();
- fProxy0->unref();
+ fProxy->addPendingRead();
+ fProxy->unref();
return RequiresDstTexture::kNo;
}
@@ -283,21 +171,17 @@
DEFINE_OP_CLASS_ID
private:
- static constexpr int kMaxTextures = TextureGeometryProcessor::kMaxTextures;
-
TextureOp(sk_sp<GrTextureProxy> proxy, GrSamplerState::Filter filter, GrColor color,
const SkRect& srcRect, const SkRect& dstRect, const SkMatrix& viewMatrix,
sk_sp<GrColorSpaceXform> csxf, bool allowSRGBInputs)
: INHERITED(ClassID())
+ , fProxy(proxy.release())
+ , fFilter(filter)
, fColorSpaceXform(std::move(csxf))
- , fProxy0(proxy.release())
- , fFilter0(filter)
- , fProxyCnt(1)
, fFinalized(false)
, fAllowSRGBInputs(allowSRGBInputs) {
Draw& draw = fDraws.push_back();
draw.fSrcRect = srcRect;
- draw.fTextureIdx = 0;
draw.fColor = color;
draw.fQuad.setFromMappedRect(dstRect, viewMatrix);
SkRect bounds;
@@ -306,19 +190,11 @@
}
void onPrepareDraws(Target* target) override {
- sk_sp<GrTextureProxy> proxiesSPs[kMaxTextures];
- auto proxies = this->proxies();
- auto filters = this->filters();
- for (int i = 0; i < fProxyCnt; ++i) {
- if (!proxies[i]->instantiate(target->resourceProvider())) {
- return;
- }
- proxiesSPs[i] = sk_ref_sp(proxies[i]);
+ if (!fProxy->instantiate(target->resourceProvider())) {
+ return;
}
-
- sk_sp<GrGeometryProcessor> gp =
- TextureGeometryProcessor::Make(proxiesSPs, fProxyCnt, std::move(fColorSpaceXform),
- filters, *target->caps().shaderCaps());
+ sk_sp<GrGeometryProcessor> gp = TextureGeometryProcessor::Make(
+ sk_ref_sp(fProxy), std::move(fColorSpaceXform), fFilter);
GrPipeline::InitArgs args;
args.fProxy = target->proxy();
args.fCaps = &target->caps();
@@ -326,11 +202,15 @@
args.fFlags = fAllowSRGBInputs ? GrPipeline::kAllowSRGBInputs_Flag : 0;
const GrPipeline* pipeline = target->allocPipeline(args, GrProcessorSet::MakeEmptySet(),
target->detachAppliedClip());
+
+ using Vertex = TextureGeometryProcessor::Vertex;
+ SkASSERT(gp->getVertexStride() == sizeof(Vertex));
+
int vstart;
const GrBuffer* vbuffer;
- void* vdata = target->makeVertexSpace(gp->getVertexStride(), 4 * fDraws.count(), &vbuffer,
- &vstart);
- if (!vdata) {
+ auto vertices = (Vertex*)target->makeVertexSpace(sizeof(Vertex), 4 * fDraws.count(),
+ &vbuffer, &vstart);
+ if (!vertices) {
SkDebugf("Could not allocate vertices\n");
return;
}
@@ -342,75 +222,31 @@
return;
}
}
+ GrTexture* texture = fProxy->priv().peekTexture();
+ float iw = 1.f / texture->width();
+ float ih = 1.f / texture->height();
if (fDraws.count() > 1) {
- if (1 == fProxyCnt) {
- SkASSERT(gp->getVertexStride() == sizeof(TextureGeometryProcessor::Vertex));
- for (int i = 0; i < fDraws.count(); ++i) {
- auto vertices = static_cast<TextureGeometryProcessor::Vertex*>(vdata);
- GrTexture* texture = proxies[0]->priv().peekTexture();
- float iw = 1.f / texture->width();
- float ih = 1.f / texture->height();
- float tl = iw * fDraws[i].fSrcRect.fLeft;
- float tr = iw * fDraws[i].fSrcRect.fRight;
- float tt = ih * fDraws[i].fSrcRect.fTop;
- float tb = ih * fDraws[i].fSrcRect.fBottom;
- if (proxies[0]->origin() == kBottomLeft_GrSurfaceOrigin) {
- tt = 1.f - tt;
- tb = 1.f - tb;
- }
- vertices[0 + 4 * i].fPosition = fDraws[i].fQuad.points()[0];
- vertices[0 + 4 * i].fTextureCoords = {tl, tt};
- vertices[0 + 4 * i].fColor = fDraws[i].fColor;
- vertices[1 + 4 * i].fPosition = fDraws[i].fQuad.points()[1];
- vertices[1 + 4 * i].fTextureCoords = {tl, tb};
- vertices[1 + 4 * i].fColor = fDraws[i].fColor;
- vertices[2 + 4 * i].fPosition = fDraws[i].fQuad.points()[2];
- vertices[2 + 4 * i].fTextureCoords = {tr, tb};
- vertices[2 + 4 * i].fColor = fDraws[i].fColor;
- vertices[3 + 4 * i].fPosition = fDraws[i].fQuad.points()[3];
- vertices[3 + 4 * i].fTextureCoords = {tr, tt};
- vertices[3 + 4 * i].fColor = fDraws[i].fColor;
+ for (int i = 0; i < fDraws.count(); ++i) {
+ float tl = iw * fDraws[i].fSrcRect.fLeft;
+ float tr = iw * fDraws[i].fSrcRect.fRight;
+ float tt = ih * fDraws[i].fSrcRect.fTop;
+ float tb = ih * fDraws[i].fSrcRect.fBottom;
+ if (fProxy->origin() == kBottomLeft_GrSurfaceOrigin) {
+ tt = 1.f - tt;
+ tb = 1.f - tb;
}
- } else {
- SkASSERT(gp->getVertexStride() ==
- sizeof(TextureGeometryProcessor::MultiTextureVertex));
- GrTexture* textures[kMaxTextures];
- float iw[kMaxTextures];
- float ih[kMaxTextures];
- for (int t = 0; t < fProxyCnt; ++t) {
- textures[t] = proxies[t]->priv().peekTexture();
- iw[t] = 1.f / textures[t]->width();
- ih[t] = 1.f / textures[t]->height();
- }
- for (int i = 0; i < fDraws.count(); ++i) {
- int t = fDraws[i].fTextureIdx;
- auto vertices =
- static_cast<TextureGeometryProcessor::MultiTextureVertex*>(vdata);
- float tl = iw[t] * fDraws[i].fSrcRect.fLeft;
- float tr = iw[t] * fDraws[i].fSrcRect.fRight;
- float tt = ih[t] * fDraws[i].fSrcRect.fTop;
- float tb = ih[t] * fDraws[i].fSrcRect.fBottom;
- if (proxies[t]->origin() == kBottomLeft_GrSurfaceOrigin) {
- tt = 1.f - tt;
- tb = 1.f - tb;
- }
- vertices[0 + 4 * i].fPosition = fDraws[i].fQuad.points()[0];
- vertices[0 + 4 * i].fTextureIdx = t;
- vertices[0 + 4 * i].fTextureCoords = {tl, tt};
- vertices[0 + 4 * i].fColor = fDraws[i].fColor;
- vertices[1 + 4 * i].fPosition = fDraws[i].fQuad.points()[1];
- vertices[1 + 4 * i].fTextureIdx = t;
- vertices[1 + 4 * i].fTextureCoords = {tl, tb};
- vertices[1 + 4 * i].fColor = fDraws[i].fColor;
- vertices[2 + 4 * i].fPosition = fDraws[i].fQuad.points()[2];
- vertices[2 + 4 * i].fTextureIdx = t;
- vertices[2 + 4 * i].fTextureCoords = {tr, tb};
- vertices[2 + 4 * i].fColor = fDraws[i].fColor;
- vertices[3 + 4 * i].fPosition = fDraws[i].fQuad.points()[3];
- vertices[3 + 4 * i].fTextureIdx = t;
- vertices[3 + 4 * i].fTextureCoords = {tr, tt};
- vertices[3 + 4 * i].fColor = fDraws[i].fColor;
- }
+ vertices[0 + 4 * i].fPosition = fDraws[i].fQuad.points()[0];
+ vertices[0 + 4 * i].fTextureCoords = {tl, tt};
+ vertices[0 + 4 * i].fColor = fDraws[i].fColor;
+ vertices[1 + 4 * i].fPosition = fDraws[i].fQuad.points()[1];
+ vertices[1 + 4 * i].fTextureCoords = {tl, tb};
+ vertices[1 + 4 * i].fColor = fDraws[i].fColor;
+ vertices[2 + 4 * i].fPosition = fDraws[i].fQuad.points()[2];
+ vertices[2 + 4 * i].fTextureCoords = {tr, tb};
+ vertices[2 + 4 * i].fColor = fDraws[i].fColor;
+ vertices[3 + 4 * i].fPosition = fDraws[i].fQuad.points()[3];
+ vertices[3 + 4 * i].fTextureCoords = {tr, tt};
+ vertices[3 + 4 * i].fColor = fDraws[i].fColor;
}
GrMesh mesh(GrPrimitiveType::kTriangles);
mesh.setIndexedPatterned(ibuffer.get(), 6, 4, fDraws.count(),
@@ -418,18 +254,11 @@
mesh.setVertexData(vbuffer, vstart);
target->draw(gp.get(), pipeline, mesh);
} else {
- // If there is only one draw then there can only be one proxy.
- SkASSERT(1 == fProxyCnt);
- SkASSERT(gp->getVertexStride() == sizeof(TextureGeometryProcessor::Vertex));
- auto vertices = static_cast<TextureGeometryProcessor::Vertex*>(vdata);
- GrTexture* texture = proxies[0]->priv().peekTexture();
- float iw = 1.f / texture->width();
- float ih = 1.f / texture->height();
float tl = iw * fDraws[0].fSrcRect.fLeft;
float tr = iw * fDraws[0].fSrcRect.fRight;
float tt = ih * fDraws[0].fSrcRect.fTop;
float tb = ih * fDraws[0].fSrcRect.fBottom;
- if (proxies[0]->origin() == kBottomLeft_GrSurfaceOrigin) {
+ if (fProxy->origin() == kBottomLeft_GrSurfaceOrigin) {
tt = 1.f - tt;
tb = 1.f - tb;
}
@@ -454,148 +283,30 @@
bool onCombineIfPossible(GrOp* t, const GrCaps& caps) override {
const auto* that = t->cast<TextureOp>();
- if (!GrColorSpaceXform::Equals(fColorSpaceXform.get(), that->fColorSpaceXform.get())) {
+ if (fProxy->uniqueID() != that->fProxy->uniqueID() || fFilter != that->fFilter ||
+ !GrColorSpaceXform::Equals(fColorSpaceXform.get(), that->fColorSpaceXform.get())) {
return false;
}
- if (TextureGeometryProcessor::SupportsMultitexture(*caps.shaderCaps())) {
- int map[kMaxTextures];
- int numNewProxies = this->mergeProxies(that, map, *caps.shaderCaps());
- if (numNewProxies < 0) {
- return false;
- }
- if (1 == fProxyCnt && numNewProxies) {
- void* mem = new char[(sizeof(GrSamplerState::Filter) + sizeof(GrTextureProxy*)) *
- kMaxTextures];
- auto proxies = reinterpret_cast<GrTextureProxy**>(mem);
- auto filters = reinterpret_cast<GrSamplerState::Filter*>(proxies + kMaxTextures);
- proxies[0] = fProxy0;
- filters[0] = fFilter0;
- fProxyArray = proxies;
- }
- fProxyCnt += numNewProxies;
- auto thisProxies = fProxyArray;
- auto thatProxies = that->proxies();
- auto thatFilters = that->filters();
- auto thisFilters = reinterpret_cast<GrSamplerState::Filter*>(thisProxies +
- kMaxTextures);
- for (int i = 0; i < that->fProxyCnt; ++i) {
- if (map[i] < 0) {
- thatProxies[i]->addPendingRead();
- thisProxies[-map[i]] = thatProxies[i];
- thisFilters[-map[i]] = thatFilters[i];
- map[i] = -map[i];
- }
- }
- int firstNewDraw = fDraws.count();
- fDraws.push_back_n(that->fDraws.count(), that->fDraws.begin());
- for (int i = firstNewDraw; i < fDraws.count(); ++i) {
- fDraws[i].fTextureIdx = map[fDraws[i].fTextureIdx];
- }
- } else {
- if (fProxy0->uniqueID() != that->fProxy0->uniqueID() || fFilter0 != that->fFilter0) {
- return false;
- }
- fDraws.push_back_n(that->fDraws.count(), that->fDraws.begin());
- }
+ fDraws.push_back_n(that->fDraws.count(), that->fDraws.begin());
this->joinBounds(*that);
return true;
}
- /**
- * Determines a mapping of indices from that's proxy array to this's proxy array. A negative map
- * value means that's proxy should be added to this's proxy array at the absolute value of
- * the map entry. If it is determined that the ops shouldn't combine their proxies then a
- * negative value is returned. Otherwise, return value indicates the number of proxies that have
- * to be added to this op or, equivalently, the number of negative entries in map.
- */
- int mergeProxies(const TextureOp* that, int map[kMaxTextures], const GrShaderCaps& caps) const {
- std::fill_n(map, kMaxTextures, -kMaxTextures);
- int sharedProxyCnt = 0;
- auto thisProxies = this->proxies();
- auto thisFilters = this->filters();
- auto thatProxies = that->proxies();
- auto thatFilters = that->filters();
- for (int i = 0; i < fProxyCnt; ++i) {
- for (int j = 0; j < that->fProxyCnt; ++j) {
- if (thisProxies[i]->uniqueID() == thatProxies[j]->uniqueID()) {
- if (thisFilters[i] != thatFilters[j]) {
- // In GL we don't currently support using the same texture with different
- // samplers. If we added support for sampler objects and a cap bit to know
- // it's ok to use different filter modes then we could support this.
- // Otherwise, we could also only allow a single filter mode for each op
- // instance.
- return -1;
- }
- map[j] = i;
- ++sharedProxyCnt;
- break;
- }
- }
- }
- int actualMaxTextures = SkTMin(caps.maxFragmentImageStorages(), kMaxTextures);
- int newProxyCnt = that->fProxyCnt - sharedProxyCnt;
- if (newProxyCnt + fProxyCnt > actualMaxTextures) {
- return -1;
- }
- GrPixelConfig config = thisProxies[0]->config();
- int nextSlot = fProxyCnt;
- for (int j = 0; j < that->fProxyCnt; ++j) {
- // We want to avoid making many shaders because of different permutations of shader
- // based swizzle and sampler types. The approach taken here is to require the configs to
- // be the same and to only allow already instantiated proxies that have the most
- // common sampler type. Otherwise we don't merge.
- if (thatProxies[j]->config() != config) {
- return -1;
- }
- if (GrTexture* tex = thatProxies[j]->priv().peekTexture()) {
- if (tex->texturePriv().samplerType() != kTexture2DSampler_GrSLType) {
- return -1;
- }
- }
- if (map[j] < 0) {
- map[j] = -(nextSlot++);
- }
- }
- return newProxyCnt;
- }
-
- GrTextureProxy* const* proxies() const { return fProxyCnt > 1 ? fProxyArray : &fProxy0; }
-
- const GrSamplerState::Filter* filters() const {
- if (fProxyCnt > 1) {
- return reinterpret_cast<const GrSamplerState::Filter*>(fProxyArray + kMaxTextures);
- }
- return &fFilter0;
- }
-
struct Draw {
SkRect fSrcRect;
- int fTextureIdx;
GrQuad fQuad;
GrColor fColor;
};
SkSTArray<1, Draw, true> fDraws;
+ GrTextureProxy* fProxy;
+ GrSamplerState::Filter fFilter;
sk_sp<GrColorSpaceXform> fColorSpaceXform;
- // Initially we store a single proxy ptr and a single filter. If we grow to have more than
- // one proxy we instead store pointers to dynamically allocated arrays of size kMaxTextures
- // followed by kMaxTextures filters.
- union {
- GrTextureProxy* fProxy0;
- GrTextureProxy** fProxyArray;
- };
- // The next four members should pack.
- GrSamplerState::Filter fFilter0;
- uint8_t fProxyCnt;
// Used to track whether fProxy is ref'ed or has a pending IO after finalize() is called.
- uint8_t fFinalized;
- uint8_t fAllowSRGBInputs;
-
+ bool fFinalized : 1;
+ bool fAllowSRGBInputs : 1;
typedef GrMeshDrawOp INHERITED;
};
-constexpr int TextureGeometryProcessor::kMaxTextures;
-constexpr int TextureOp::kMaxTextures;
-
} // anonymous namespace
namespace GrTextureOp {