AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Graphite] Create Texture and Sampler arrays once in DrawPass command creation.

Browse Source 
Instead of allocating new texture and sampler arrays for each draw we can reuse
the memory by just creating them for the max size for any draws at the start.

Bug: skia:13357
Change-Id: Ibf0fc20cbbd3e03501f8e202cba5986e5e345cbe
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/558722
Auto-Submit: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Michael Ludwig <michaelludwig@google.com>
This commit is contained in:
Greg Daniel 2022-07-14 14:34:36 -04:00 committed by SkCQ
parent 23df8d2d73
commit 15b35e9a6b
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gpu/graphite/DrawPass.cpp
View File

@ -318,6 +318,8 @@ std::unique_ptr<DrawPass> DrawPass::Make(Recorder* recorder,
SkPaintParamsKeyBuilder builder(dict, SkBackend::kGraphite);
SkPipelineDataGatherer gatherer(Layout::kMetal); // TODO: get the layout from the recorder
int maxTexturesInSingleDraw = 0;
for (const DrawList::Draw& draw : draws->fDraws.items()) {
// If we have two different descriptors, such that the uniforms from the PaintParams can be
// bound independently of those used by the rest of the RenderStep, then we can upload now
@ -371,6 +373,13 @@ std::unique_ptr<DrawPass> DrawPass::Make(Recorder* recorder,
pipelineIndex = pipelineLookup->second;
}
if (stepTextureBindingIndex.isValid()) {
auto textureDataBlock = textureDataCache->lookup(stepTextureBindingIndex);
int numTextures = textureDataBlock->numTextures();
maxTexturesInSingleDraw = std::max(maxTexturesInSingleDraw, numTextures);
}
keys.push_back({&draw, stepIndex, pipelineIndex,
geometryUniformIndex,
stepShadingUniformIndex,
@ -401,6 +410,10 @@ std::unique_ptr<DrawPass> DrawPass::Make(Recorder* recorder,
TextureDataCache::Index lastTextureBindings;
UniformDataCache::Index lastGeometryUniforms;
SkIRect lastScissor = SkIRect::MakeSize(drawPass->fTarget->dimensions());
// We will reuse these vectors for all the draws as they are just meant for temporary storage
// as we are creating commands on the fCommandList.
std::vector<int> textureIndices(maxTexturesInSingleDraw);
std::vector<int> samplerIndices(maxTexturesInSingleDraw);
// Set viewport to the entire texture for now (eventually, we may have logically smaller bounds
// within an approx-sized texture). It is assumed that this also configures the sk_rtAdjust
@ -454,8 +467,7 @@ std::unique_ptr<DrawPass> DrawPass::Make(Recorder* recorder,
auto textureDataBlock = textureDataCache->lookup(key.textureBindings());
int numTextures = textureDataBlock->numTextures();
std::vector<int> textureIndices(numTextures);
std::vector<int> samplerIndices(numTextures);
SkASSERT(numTextures <= maxTexturesInSingleDraw);
for (int i = 0; i < numTextures; ++i) {
auto& info = textureDataBlock->texture(i);
std::tie(textureIndices[i], samplerIndices[i]) =