removing layout qualifier

This commit is contained in:
Dynamitos
2024-04-21 21:15:15 +02:00
parent 16c7fb5159
commit 8ea9c34ed4
5 changed files with 12 additions and 13 deletions
+1 -1
View File
@@ -5,4 +5,4 @@
path = external/vcpkg
url = https://github.com/Microsoft/vcpkg.git
[submodule "external/slang"]
url = https://github.com/shader-slang/slang.git
url = git@github.com:Dynamitos/slang.git
+1 -2
View File
@@ -10,8 +10,7 @@ struct ViewParameter
float4 cameraPos_WS;
float2 screenDimensions;
}
layout(set = 0)
ParameterBlock<ViewParameter> pViewParams;
uniform ParameterBlock<ViewParameter> pViewParams;
float4 clipToView(float4 clip)
{
+1 -1
View File
@@ -42,5 +42,5 @@ struct Scene
StructuredBuffer<uint32_t> primitiveIndices;
StructuredBuffer<uint32_t> vertexIndices;
};
ParameterBlock<Scene> pScene;
uniform ParameterBlock<Scene> pScene;
+2 -2
View File
@@ -10,5 +10,5 @@ interface IVertexData
{
VertexAttributes getAttributes(uint index);
};
layout(set = 1)
ParameterBlock<IVertexData> pVertexData;
uniform ParameterBlock<IVertexData> pVertexData;
+7 -7
View File
@@ -17,6 +17,13 @@ Slang::ComPtr<slang::IBlob> Seele::generateShader(const ShaderCreateInfo& create
}
slang::SessionDesc sessionDesc;
sessionDesc.flags = 0;
slang::CompilerOptionEntry option;
option.name = slang::CompilerOptionName::IgnoreCapabilities;
option.value = slang::CompilerOptionValue();
option.value.kind = slang::CompilerOptionValueKind::Int;
option.value.intValue0 = 1;
sessionDesc.compilerOptionEntries = &option;
sessionDesc.compilerOptionEntryCount = 1;
sessionDesc.defaultMatrixLayoutMode = SLANG_MATRIX_LAYOUT_COLUMN_MAJOR;
Array<slang::PreprocessorMacroDesc> macros;
for(const auto& [key, val] : createInfo.defines)
@@ -28,14 +35,7 @@ Slang::ComPtr<slang::IBlob> Seele::generateShader(const ShaderCreateInfo& create
}
sessionDesc.preprocessorMacroCount = macros.size();
sessionDesc.preprocessorMacros = macros.data();
slang::CompilerOptionEntry option;
option.name = slang::CompilerOptionName::IgnoreCapabilities;
option.value = slang::CompilerOptionValue();
option.value.kind = slang::CompilerOptionValueKind::Int;
option.value.intValue0 = 1;
slang::TargetDesc targetDesc;
targetDesc.compilerOptionEntries = &option;
targetDesc.compilerOptionEntryCount = 1;
targetDesc.profile = globalSession->findProfile("sm_6_6");
targetDesc.format = target;
targetDesc.compilerOptionEntryCount = 1;