Skip to content

Commit

Permalink
igl | vulkan | Split branches for better readability
Browse files Browse the repository at this point in the history
Summary:
1) Split `if`-branches for better readability.
2) Removed `lint-ignore CLANGTIDY`.

Reviewed By: mmaurer

Differential Revision: D53294527

fbshipit-source-id: a9eae9e5476a3070a9c516a5b8240ced6006e56a
  • Loading branch information
corporateshark authored and facebook-github-bot committed Feb 2, 2024
1 parent 1a1b0b0 commit 23be5c7
Showing 1 changed file with 21 additions and 14 deletions.
35 changes: 21 additions & 14 deletions src/igl/vulkan/VulkanContext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1186,21 +1186,28 @@ void VulkanContext::checkAndUpdateDescriptorSets() {

for (const auto& entry : textures_.objects_) {
const VulkanTexture* texture = entry.obj_.get();
// multisampled images cannot be directly accessed from shaders
// @lint-ignore CLANGTIDY
const bool isTextureAvailable =
texture && ((texture->image_->samples_ & VK_SAMPLE_COUNT_1_BIT) == VK_SAMPLE_COUNT_1_BIT);
const bool isSampledImage = isTextureAvailable && texture->image_->isSampledImage();
const bool isStorageImage = isTextureAvailable && texture->image_->isStorageImage();
infoSampledImages.push_back(
{dummySampler,
isSampledImage ? texture->imageView_->getVkImageView() : dummyImageView,
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL});
if (texture) {
// multisampled images cannot be directly accessed from shaders
const bool isTextureAvailable =
(texture->image_->samples_ & VK_SAMPLE_COUNT_1_BIT) == VK_SAMPLE_COUNT_1_BIT;
const bool isSampledImage = isTextureAvailable && texture->image_->isSampledImage();
const bool isStorageImage = isTextureAvailable && texture->image_->isStorageImage();
infoSampledImages.push_back(
{dummySampler,
isSampledImage ? texture->imageView_->getVkImageView() : dummyImageView,
VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL});
infoStorageImages.push_back(VkDescriptorImageInfo{
VK_NULL_HANDLE,
isStorageImage ? texture->imageView_->getVkImageView() : dummyImageView,
VK_IMAGE_LAYOUT_GENERAL});
} else {
infoSampledImages.push_back(
{dummySampler, dummyImageView, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL});
infoStorageImages.push_back(
VkDescriptorImageInfo{VK_NULL_HANDLE, dummyImageView, VK_IMAGE_LAYOUT_GENERAL});
}
IGL_ASSERT(infoSampledImages.back().imageView != VK_NULL_HANDLE);
infoStorageImages.push_back(VkDescriptorImageInfo{
VK_NULL_HANDLE,
isStorageImage ? texture->imageView_->getVkImageView() : dummyImageView,
VK_IMAGE_LAYOUT_GENERAL});
IGL_ASSERT(infoStorageImages.back().imageView != VK_NULL_HANDLE);
}

// 2. Samplers
Expand Down

0 comments on commit 23be5c7

Please sign in to comment.