Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 7d25230

Browse files
csmartdalton86Skia Commit-Bot
authored andcommitted
Remove "setData" operations from GrMtlPipelineState::setTextures
Change-Id: Iaba354865599097d562b29c2ba5e7da8112b22a0 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/272724 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
1 parent 108a494 commit 7d25230

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

src/gpu/mtl/GrMtlPipelineState.mm

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,20 @@
6262
GrFragmentProcessor::PipelineCoordTransformRange transformRange(programInfo.pipeline());
6363
fGeometryProcessor->setData(fDataManager, programInfo.primProc(), transformRange);
6464

65+
GrFragmentProcessor::CIter fpIter(programInfo.pipeline());
66+
GrGLSLFragmentProcessor::Iter glslIter(fFragmentProcessors.get(), fFragmentProcessorCnt);
67+
for (; fpIter && glslIter; ++fpIter, ++glslIter) {
68+
glslIter->setData(fDataManager, *fpIter);
69+
}
70+
SkASSERT(!fpIter && !glslIter);
71+
72+
{
73+
SkIPoint offset;
74+
GrTexture* dstTexture = programInfo.pipeline().peekDstTexture(&offset);
75+
fXferProcessor->setData(fDataManager, programInfo.pipeline().getXferProcessor(), dstTexture,
76+
offset);
77+
}
78+
6579
if (!programInfo.hasDynamicPrimProcTextures()) {
6680
auto proxies = programInfo.hasFixedPrimProcTextures() ? programInfo.fixedPrimProcTextures()
6781
: nullptr;
@@ -90,23 +104,12 @@
90104
}
91105

92106
GrFragmentProcessor::CIter fpIter(programInfo.pipeline());
93-
GrGLSLFragmentProcessor::Iter glslIter(fFragmentProcessors.get(), fFragmentProcessorCnt);
94-
for (; fpIter && glslIter; ++fpIter, ++glslIter) {
95-
glslIter->setData(fDataManager, *fpIter);
107+
for (; fpIter; ++fpIter) {
96108
for (int i = 0; i < fpIter->numTextureSamplers(); ++i) {
97109
const auto& sampler = fpIter->textureSampler(i);
98110
fSamplerBindings.emplace_back(sampler.samplerState(), sampler.peekTexture(), fGpu);
99111
}
100112
}
101-
SkASSERT(!fpIter && !glslIter);
102-
103-
{
104-
SkIPoint offset;
105-
GrTexture* dstTexture = programInfo.pipeline().peekDstTexture(&offset);
106-
107-
fXferProcessor->setData(fDataManager, programInfo.pipeline().getXferProcessor(),
108-
dstTexture, offset);
109-
}
110113

111114
if (GrTextureProxy* dstTextureProxy = programInfo.pipeline().dstProxyView().asTextureProxy()) {
112115
fSamplerBindings.emplace_back(

0 commit comments

Comments
 (0)