Skip to content

Commit 9765466

Browse files
get validation errors in non-Debug builds, and shut up the layer about image creation
1 parent 4a2c18c commit 9765466

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

include/nbl/video/CVulkanCommon.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -853,6 +853,7 @@ inline std::pair<VkDebugUtilsMessageSeverityFlagsEXT, VkDebugUtilsMessageTypeFla
853853
if ((logLevelMask & system::ILogger::ELL_ERROR).value)
854854
{
855855
sev |= VK_DEBUG_UTILS_MESSAGE_SEVERITY_ERROR_BIT_EXT;
856+
type |= VK_DEBUG_UTILS_MESSAGE_TYPE_VALIDATION_BIT_EXT;
856857
}
857858

858859
return result;

src/nbl/video/CVulkanLogicalDevice.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,11 +334,12 @@ core::smart_refctd_ptr<IGPUBufferView> CVulkanLogicalDevice::createBufferView_im
334334

335335
core::smart_refctd_ptr<IGPUImage> CVulkanLogicalDevice::createImage_impl(IGPUImage::SCreationParams&& params)
336336
{
337+
const bool hasStencil = asset::isDepthOrStencilFormat(params.format) && !asset::isDepthOnlyFormat(params.format);
337338
VkImageStencilUsageCreateInfo vk_stencilUsage = { VK_STRUCTURE_TYPE_IMAGE_STENCIL_USAGE_CREATE_INFO, nullptr };
338339
vk_stencilUsage.stencilUsage = getVkImageUsageFlagsFromImageUsageFlags(params.actualStencilUsage().value,true);
339340

340341
std::array<VkFormat,asset::E_FORMAT::EF_COUNT> vk_formatList;
341-
VkImageFormatListCreateInfo vk_formatListStruct = { VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO, &vk_stencilUsage };
342+
VkImageFormatListCreateInfo vk_formatListStruct = {VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO,hasStencil ? &vk_stencilUsage:nullptr};
342343
vk_formatListStruct.viewFormatCount = 0u;
343344
// if only there existed a nice iterator that would let me iterate over set bits 64 faster
344345
if (params.viewFormats.any())

0 commit comments

Comments
 (0)