lib shader stage

Signed-off-by: Ali Cheraghi <[email protected]>

Author: alichraghi

include/nbl/asset/IDescriptorSetLayout.h

@@ -330,7 +330,7 @@ class IDescriptorSetLayout : public IDescriptorSetLayoutBase
 				bindings[i].binding = i;
 				bindings[i].type = type;
 				bindings[i].createFlags = SBinding::E_CREATE_FLAGS::ECF_NONE;
-				bindings[i].stageFlags = stageAccessFlags ? stageAccessFlags[i]:asset::IShader::ESS_ALL;
+				bindings[i].stageFlags = stageAccessFlags ? stageAccessFlags[i]:asset::IShader::ESS_ALL_OR_LIBRARY;
 				bindings[i].count = counts ? counts[i]:1u;
 				bindings[i].samplers = nullptr;
 			}

include/nbl/asset/utils/IMeshPackerV2.h

@@ -380,7 +380,7 @@ class IMeshPackerV2 : public IMeshPacker<MeshBufferType,MDIStructType>, public I
             {
                 bnd->binding = binding;
                 bnd->count = count;
-                bnd->stageFlags = asset::ISpecializedShader::ESS_ALL;
+                bnd->stageFlags = asset::ISpecializedShader::ESS_ALL_OR_LIBRARY;
                 bnd->type = asset::IDescriptor::E_TYPE::ET_UNIFORM_TEXEL_BUFFER;
                 bnd->samplers = nullptr;
                 bnd++;
@@ -517,7 +517,7 @@ class IMeshPackerV2 : public IMeshPacker<MeshBufferType,MDIStructType>, public I
             {
                 bnd->binding = binding;
                 bnd->count = 1u;
-                bnd->stageFlags = asset::ISpecializedShader::ESS_ALL;
+                bnd->stageFlags = asset::ISpecializedShader::ESS_ALL_OR_LIBRARY;
                 bnd->type = asset::IDescriptor::E_TYPE::ET_STORAGE_BUFFER;
                 bnd->samplers = nullptr;
                 bnd++;

include/nbl/asset/utils/IVirtualTexture.h

@@ -1047,7 +1047,7 @@ class IVirtualTexture : public core::IReferenceCounted, public IVirtualTextureBa
         auto fillBinding = [](auto& bnd, uint32_t _binding, uint32_t _count, core::smart_refctd_ptr<sampler_t>* _samplers) {
             bnd.binding = _binding;
             bnd.count = _count;
-            bnd.stageFlags = asset::IShader::E_SHADER_STAGE::ESS_ALL;
+            bnd.stageFlags = asset::IShader::E_SHADER_STAGE::ESS_ALL_OR_LIBRARY;
             bnd.type = asset::IDescriptor::E_TYPE::ET_COMBINED_IMAGE_SAMPLER;
             bnd.immutableSamplers = _samplers;
         };

include/nbl/builtin/hlsl/enums.hlsl

@@ -29,7 +29,7 @@ enum ShaderStage : uint32_t
     ESS_INTERSECTION = 1 << 12,
     ESS_CALLABLE = 1 << 13,
     ESS_ALL_GRAPHICS = 0x0000001F,
-    ESS_ALL = 0x7fffffff
+    ESS_ALL_OR_LIBRARY = 0x7fffffff
 };
 
 enum SampleCountFlags : uint16_t

include/nbl/video/CVulkanCommon.h

@@ -464,7 +464,7 @@ inline VkShaderStageFlags getVkShaderStageFlagsFromShaderStage(const core::bitfl
     if(in.hasFlags(IGPUShader::E_SHADER_STAGE::ESS_INTERSECTION)) ret |= VK_SHADER_STAGE_INTERSECTION_BIT_KHR;
     if(in.hasFlags(IGPUShader::E_SHADER_STAGE::ESS_CALLABLE)) ret |= VK_SHADER_STAGE_CALLABLE_BIT_KHR;
     if(in.hasFlags(IGPUShader::E_SHADER_STAGE::ESS_ALL_GRAPHICS)) ret |= VK_SHADER_STAGE_ALL_GRAPHICS;
-    if(in.hasFlags(IGPUShader::E_SHADER_STAGE::ESS_ALL)) ret |= VK_SHADER_STAGE_ALL;
+    if(in.hasFlags(IGPUShader::E_SHADER_STAGE::ESS_ALL_OR_LIBRARY)) ret |= VK_SHADER_STAGE_ALL;
     return ret;
 }
 

src/nbl/asset/utils/CHLSLCompiler.cpp

@@ -42,6 +42,8 @@ static const wchar_t* ShaderStageToString(asset::IShader::E_SHADER_STAGE stage)
         return L"as";
     case asset::IShader::E_SHADER_STAGE::ESS_MESH:
         return L"ms";
+    case asset::IShader::E_SHADER_STAGE::ESS_ALL_OR_LIBRARY:
+        return L"lib";
     default:
         return nullptr;
     };
@@ -403,8 +405,10 @@ core::smart_refctd_ptr<ICPUShader> CHLSLCompiler::compileToSPIRV_impl(const std:
         arguments.push_back(L"-HV");
         arguments.push_back(L"202x");
         // TODO: add this to `CHLSLCompiler::SOptions` and handle it properly in `dxc_compile_flags.empty()`
-        arguments.push_back(L"-E");
-        arguments.push_back(L"main");
+        if (stage != asset::IShader::E_SHADER_STAGE::ESS_ALL_OR_LIBRARY) {
+            arguments.push_back(L"-E");
+            arguments.push_back(L"main");
+        }
         // If a custom SPIR-V optimizer is specified, use that instead of DXC's spirv-opt.
         // This is how we can get more optimizer options.
         // 

src/nbl/video/ILogicalDevice.cpp

@@ -291,8 +291,6 @@ core::smart_refctd_ptr<IGPUShader> ILogicalDevice::createShader(const SShaderCre
     // https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkPipelineShaderStageCreateInfo.html#VUID-VkPipelineShaderStageCreateInfo-stage-00706
     switch (shaderStage)
     {
-        case IGPUShader::E_SHADER_STAGE::ESS_VERTEX:
-            break;
         case IGPUShader::E_SHADER_STAGE::ESS_TESSELLATION_CONTROL: [[fallthrough]];
         case IGPUShader::E_SHADER_STAGE::ESS_TESSELLATION_EVALUATION:
             if (!features.tessellationShader)
@@ -308,6 +306,8 @@ core::smart_refctd_ptr<IGPUShader> ILogicalDevice::createShader(const SShaderCre
                 return nullptr;
             }
             break;
+        case IGPUShader::E_SHADER_STAGE::ESS_ALL_OR_LIBRARY: [[fallthrough]];
+        case IGPUShader::E_SHADER_STAGE::ESS_VERTEX: [[fallthrough]];
         case IGPUShader::E_SHADER_STAGE::ESS_FRAGMENT: [[fallthrough]];
         case IGPUShader::E_SHADER_STAGE::ESS_COMPUTE:
             break;