diff options
author | Brian Salomon <bsalomon@google.com> | 2016-11-17 12:48:40 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-17 19:35:53 +0000 |
commit | db4183d227b764b219e9e314dd5387ded4c38797 (patch) | |
tree | b4b7e00004e18497418aa449b1b334bd800aa595 /src/gpu/vk | |
parent | 3a88725d582a8ad816db872d171aa7fdb9b85822 (diff) |
In GrProcessor::TextureSampler drop the "get", it's cleaner
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4962
Change-Id: I55e7f8d1b6e1097fdbe411e9989dd42a03dd5f33
Reviewed-on: https://skia-review.googlesource.com/4962
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/vk')
-rw-r--r-- | src/gpu/vk/GrVkGpuCommandBuffer.cpp | 4 | ||||
-rw-r--r-- | src/gpu/vk/GrVkPipelineState.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/vk/GrVkGpuCommandBuffer.cpp b/src/gpu/vk/GrVkGpuCommandBuffer.cpp index 3f0bd39d48..e94585f093 100644 --- a/src/gpu/vk/GrVkGpuCommandBuffer.cpp +++ b/src/gpu/vk/GrVkGpuCommandBuffer.cpp @@ -428,7 +428,7 @@ sk_sp<GrVkPipelineState> GrVkGpuCommandBuffer::prepareDrawState( static void prepare_sampled_images(const GrProcessor& processor, GrVkGpu* gpu) { for (int i = 0; i < processor.numTextureSamplers(); ++i) { const GrProcessor::TextureSampler& sampler = processor.textureSampler(i); - GrVkTexture* vkTexture = static_cast<GrVkTexture*>(sampler.getTexture()); + GrVkTexture* vkTexture = static_cast<GrVkTexture*>(sampler.texture()); SkASSERT(vkTexture); // We may need to resolve the texture first if it is also a render target @@ -437,7 +437,7 @@ static void prepare_sampled_images(const GrProcessor& processor, GrVkGpu* gpu) { gpu->onResolveRenderTarget(texRT); } - const GrTextureParams& params = sampler.getParams(); + const GrTextureParams& params = sampler.params(); // Check if we need to regenerate any mip maps if (GrTextureParams::kMipMap_FilterMode == params.filterMode()) { if (vkTexture->texturePriv().mipMapsAreDirty()) { diff --git a/src/gpu/vk/GrVkPipelineState.cpp b/src/gpu/vk/GrVkPipelineState.cpp index 2ca1aafdd4..48228e0b41 100644 --- a/src/gpu/vk/GrVkPipelineState.cpp +++ b/src/gpu/vk/GrVkPipelineState.cpp @@ -310,9 +310,9 @@ void GrVkPipelineState::writeSamplers( SkASSERT(fNumSamplers == textureBindings.count()); for (int i = 0; i < textureBindings.count(); ++i) { - const GrTextureParams& params = textureBindings[i]->getParams(); + const GrTextureParams& params = textureBindings[i]->params(); - GrVkTexture* texture = static_cast<GrVkTexture*>(textureBindings[i]->getTexture()); + GrVkTexture* texture = static_cast<GrVkTexture*>(textureBindings[i]->texture()); fSamplers.push(gpu->resourceProvider().findOrCreateCompatibleSampler(params, texture->texturePriv().maxMipMapLevel())); |