From f7dcd76c552a4e93a75a3808289de69a997da169 Mon Sep 17 00:00:00 2001 From: Brian Salomon Date: Mon, 30 Jul 2018 14:48:15 -0400 Subject: Remove array of TextureSampler pointers from GrIOResourceProcessor. Instead store sampler count on base class and subclasses implement a virtual to get the ith sampler. Change-Id: I13e2447a6467a09761d8615acb4aa360b87b1476 Reviewed-on: https://skia-review.googlesource.com/141563 Commit-Queue: Brian Salomon Reviewed-by: Robert Phillips --- src/gpu/GrProcessor.cpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) (limited to 'src/gpu/GrProcessor.cpp') diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/GrProcessor.cpp index 1be97cf7c0..43b4213dc1 100644 --- a/src/gpu/GrProcessor.cpp +++ b/src/gpu/GrProcessor.cpp @@ -128,31 +128,27 @@ void GrProcessor::operator delete(void* target) { /////////////////////////////////////////////////////////////////////////////// -void GrResourceIOProcessor::addTextureSampler(const TextureSampler* access) { - fTextureSamplers.push_back(access); -} - void GrResourceIOProcessor::addPendingIOs() const { - for (const auto& sampler : fTextureSamplers) { - sampler->programProxy()->markPendingIO(); + for (int i = 0; i < fNumTextureSamplers; ++i) { + this->textureSampler(i).programProxy()->markPendingIO(); } } void GrResourceIOProcessor::removeRefs() const { - for (const auto& sampler : fTextureSamplers) { - sampler->programProxy()->removeRef(); + for (int i = 0; i < fNumTextureSamplers; ++i) { + this->textureSampler(i).programProxy()->removeRef(); } } void GrResourceIOProcessor::pendingIOComplete() const { - for (const auto& sampler : fTextureSamplers) { - sampler->programProxy()->pendingIOComplete(); + for (int i = 0; i < fNumTextureSamplers; ++i) { + this->textureSampler(i).programProxy()->pendingIOComplete(); } } bool GrResourceIOProcessor::instantiate(GrResourceProvider* resourceProvider) const { - for (const auto& sampler : fTextureSamplers) { - if (!sampler->instantiate(resourceProvider)) { + for (int i = 0; i < fNumTextureSamplers; ++i) { + if (!this->textureSampler(i).instantiate(resourceProvider)) { return false; } } -- cgit v1.2.3