| Index: src/gpu/vk/GrVkPipelineState.cpp
|
| diff --git a/src/gpu/vk/GrVkPipelineState.cpp b/src/gpu/vk/GrVkPipelineState.cpp
|
| index f27916f714bc55adcd4df801333a9bf1ebb74bb4..8280e62c2a6ccbf5771e15a120ab47e6c9c13839 100644
|
| --- a/src/gpu/vk/GrVkPipelineState.cpp
|
| +++ b/src/gpu/vk/GrVkPipelineState.cpp
|
| @@ -294,12 +294,6 @@ void GrVkPipelineState::writeSamplers(GrVkGpu* gpu,
|
| const GrTextureParams& params = textureBindings[i]->getParams();
|
|
|
| GrVkTexture* texture = static_cast<GrVkTexture*>(textureBindings[i]->getTexture());
|
| - if (GrTextureParams::kMipMap_FilterMode == params.filterMode()) {
|
| - if (texture->texturePriv().mipMapsAreDirty()) {
|
| - gpu->generateMipmap(texture);
|
| - texture->texturePriv().dirtyMipMaps(false);
|
| - }
|
| - }
|
|
|
| fSamplers.push(gpu->resourceProvider().findOrCreateCompatibleSampler(params,
|
| texture->texturePriv().maxMipMapLevel()));
|
| @@ -312,13 +306,6 @@ void GrVkPipelineState::writeSamplers(GrVkGpu* gpu,
|
| textureView->ref();
|
| fTextureViews.push(textureView);
|
|
|
| - // Change texture layout so it can be read in shader
|
| - texture->setImageLayout(gpu,
|
| - VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
|
| - VK_ACCESS_SHADER_READ_BIT,
|
| - VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT,
|
| - false);
|
| -
|
| VkDescriptorImageInfo imageInfo;
|
| memset(&imageInfo, 0, sizeof(VkDescriptorImageInfo));
|
| imageInfo.sampler = fSamplers[i]->sampler();
|
|
|