Skip to content

Commit f707e9c

Browse files
egdanielSkia Commit-Bot
authored andcommitted
Don't set vk sampler on desc set if using immutable samplers.
This appeases a validation layer error. Its unclear if the validation is correct saying this was an error before (since sampler param isn't used when we have immutable samplers), but this isn't wrong either and makes the layers not complain. Change-Id: I88e8017df203965af0030b153ff933384a6215d6 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/324698 Commit-Queue: Greg Daniel <egdaniel@google.com> Auto-Submit: Greg Daniel <egdaniel@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com>
1 parent d5fec17 commit f707e9c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/gpu/vk/GrVkPipelineState.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ bool GrVkPipelineState::setAndBindTextures(GrVkGpu* gpu,
177177

178178
VkDescriptorImageInfo imageInfo;
179179
memset(&imageInfo, 0, sizeof(VkDescriptorImageInfo));
180-
imageInfo.sampler = sampler->sampler();
180+
imageInfo.sampler = fImmutableSamplers[i] ? VK_NULL_HANDLE : sampler->sampler();
181181
imageInfo.imageView = textureView->imageView();
182182
imageInfo.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
183183

0 commit comments

Comments
 (0)