do not use core::bitflag or non HLSL stuff for the default values of device_limits.json or device_features.json

Also an alias screwed us over.

Author: devsh

include/nbl/asset/IRenderpass.h

@@ -165,11 +165,11 @@ class NBL_API2 IRenderpass
                     {
                         enum RESOLVE_MODE : uint8_t
                         {
-                            NONE = nbl::hlsl::ResolveModeFlags::NONE,
-                            SAMPLE_ZERO_BIT = nbl::hlsl::ResolveModeFlags::SAMPLE_ZERO_BIT,
-                            AVERAGE_BIT = nbl::hlsl::ResolveModeFlags::AVERAGE_BIT,
-                            MIN_BIT = nbl::hlsl::ResolveModeFlags::MIN_BIT,
-                            MAX_BIT = nbl::hlsl::ResolveModeFlags::MAX_BIT
+                            NONE = hlsl::ResolveModeFlags::NONE,
+                            SAMPLE_ZERO_BIT = hlsl::ResolveModeFlags::SAMPLE_ZERO_BIT,
+                            AVERAGE_BIT = hlsl::ResolveModeFlags::AVERAGE_BIT,
+                            MIN_BIT = hlsl::ResolveModeFlags::MIN_BIT,
+                            MAX_BIT = hlsl::ResolveModeFlags::MAX_BIT
                         };
                         struct ResolveMode
                         {

include/nbl/builtin/hlsl/enums.hlsl

@@ -93,7 +93,7 @@ enum SwapchainMode : uint16_t {
 NBL_ENUM_ADD_BITWISE_OPERATORS(ShaderStage)
 NBL_ENUM_ADD_BITWISE_OPERATORS(SampleCountFlags)
 NBL_ENUM_ADD_BITWISE_OPERATORS(ResolveModeFlags)
-NBL_ENUM_ADD_BITWISE_OPERATORS(SpirvVersion)
+NBL_ENUM_ADD_BITWISE_OPERATORS(SpirvVersion) // erm do we want this?
 NBL_ENUM_ADD_BITWISE_OPERATORS(PointClippingBehavior)
 NBL_ENUM_ADD_BITWISE_OPERATORS(SwapchainMode)
 #endif

include/nbl/video/SPhysicalDeviceLimits.h

@@ -23,7 +23,7 @@ struct SPhysicalDeviceLimits
         EPCB_ALL_CLIP_PLANES = nbl::hlsl::PointClippingBehavior::EPCB_ALL_CLIP_PLANES,
         EPCB_USER_CLIP_PLANES_ONLY = nbl::hlsl::PointClippingBehavior::EPCB_USER_CLIP_PLANES_ONLY
     };
-    using RESOLVE_MODE_FLAGS = asset::IRenderpass::SCreationParams::SSubpassDescription::SDepthStencilAttachmentsRef::RESOLVE_MODE;
+    using RESOLVE_MODE_FLAGS = nbl::hlsl::ResolveModeFlags;
 
 	#include "nbl/video/SPhysicalDeviceLimits_members.h"
 

src/nbl/video/CVulkanPhysicalDevice.cpp

@@ -443,8 +443,8 @@ std::unique_ptr<CVulkanPhysicalDevice> CVulkanPhysicalDevice::create(core::smart
         properties.limits.maxDescriptorSetUpdateAfterBindStorageImages            = vulkan12Properties.maxDescriptorSetUpdateAfterBindStorageImages;
         properties.limits.maxDescriptorSetUpdateAfterBindInputAttachments         = vulkan12Properties.maxDescriptorSetUpdateAfterBindInputAttachments;
 
-        properties.limits.supportedDepthResolveModes = static_cast<SPhysicalDeviceLimits::RESOLVE_MODE_FLAGS>(vulkan12Properties.supportedDepthResolveModes);
-        properties.limits.supportedStencilResolveModes = static_cast<SPhysicalDeviceLimits::RESOLVE_MODE_FLAGS>(vulkan12Properties.supportedStencilResolveModes);
+        properties.limits.supportedDepthResolveModes = static_cast<nbl::hlsl::ResolveModeFlags>(vulkan12Properties.supportedDepthResolveModes);
+        properties.limits.supportedStencilResolveModes = static_cast<nbl::hlsl::ResolveModeFlags>(vulkan12Properties.supportedStencilResolveModes);
 
         if (!vulkan12Properties.independentResolve || !vulkan12Properties.independentResolveNone)
             return nullptr;

src/nbl/video/ILogicalDevice.cpp

@@ -712,10 +712,9 @@ core::smart_refctd_ptr<IGPURenderpass> ILogicalDevice::createRenderpass(const IG
         {
             depthSamples = params.depthStencilAttachments[subpass.depthStencilAttachment.render.attachmentIndex].samples;
 
-            using resolve_flag_t = IGPURenderpass::SCreationParams::SSubpassDescription::SDepthStencilAttachmentsRef::RESOLVE_MODE;
             // TODO: seems like `multisampledRenderToSingleSampledEnable` needs resolve modes but not necessarily a resolve attachmen
-            const resolve_flag_t depthResolve = subpass.depthStencilAttachment.resolveMode.depth;
-            const resolve_flag_t stencilResolve = subpass.depthStencilAttachment.resolveMode.stencil;
+            const hlsl::ResolveModeFlags depthResolve = static_cast<hlsl::ResolveModeFlags>(subpass.depthStencilAttachment.resolveMode.depth);
+            const hlsl::ResolveModeFlags stencilResolve = static_cast<hlsl::ResolveModeFlags>(subpass.depthStencilAttachment.resolveMode.stencil);
             if (subpass.depthStencilAttachment.resolve.used() || /*multisampledToSingleSampledUsed*/false)
             {
                 const auto& attachment = params.depthStencilAttachments[(subpass.depthStencilAttachment.resolve.used() ? subpass.depthStencilAttachment.resolve : subpass.depthStencilAttachment.render).attachmentIndex];
@@ -739,7 +738,7 @@ core::smart_refctd_ptr<IGPURenderpass> ILogicalDevice::createRenderpass(const IG
                 }
 
                 // https://registry.khronos.org/vulkan/specs/1.3-extensions/html/vkspec.html#VUID-VkSubpassDescriptionDepthStencilResolve-pNext-06873
-                if (/*multisampledToSingleSampledUsed*/false && depthResolve == resolve_flag_t::NONE && stencilResolve == resolve_flag_t::NONE)
+                if (/*multisampledToSingleSampledUsed*/false && depthResolve == hlsl::ResolveModeFlags::NONE && stencilResolve == hlsl::ResolveModeFlags::NONE)
                 {
                     NBL_LOG_ERROR("Invalid stencil attachment's resolve mode (subpasses[%u])", i);
                     return nullptr;

src/nbl/video/device_capabilities/device_limits.json

@@ -1110,7 +1110,7 @@
                 {
                     "type": "core::bitflag<RESOLVE_MODE_FLAGS>",
                     "name": "supportedDepthResolveModes",
-                    "value": "core::bitflag<RESOLVE_MODE_FLAGS>(RESOLVE_MODE_FLAGS::SAMPLE_ZERO_BIT) | RESOLVE_MODE_FLAGS::MIN_BIT | RESOLVE_MODE_FLAGS::MAX_BIT"
+                    "value": "RESOLVE_MODE_FLAGS::SAMPLE_ZERO_BIT | RESOLVE_MODE_FLAGS::MIN_BIT | RESOLVE_MODE_FLAGS::MAX_BIT"
                 },
                 {
                     "type": "core::bitflag<RESOLVE_MODE_FLAGS>",