Temporary remove slang
This commit is contained in:
@@ -4,5 +4,3 @@
|
||||
[submodule "external/vcpkg"]
|
||||
path = external/vcpkg
|
||||
url = https://github.com/Microsoft/vcpkg.git
|
||||
[submodule "external/slang"]
|
||||
url = git@github.com:Dynamitos/slang.git
|
||||
|
||||
Vendored
+1
-12
@@ -6,23 +6,12 @@
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Editor",
|
||||
"type": "cppvsdbg",
|
||||
"type": "lldb",
|
||||
"request": "launch",
|
||||
"program": "${workspaceRoot}/build/Editor.exe",
|
||||
"args": [],
|
||||
"stopAtEntry": false,
|
||||
"cwd": "${workspaceRoot}/build",
|
||||
"console": "internalConsole",
|
||||
"environment": [],
|
||||
"symbolSearchPath": "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\VC\\Tools\\MSVC\\14.25.28610\\lib\\x64",
|
||||
"requireExactSource": false,
|
||||
"visualizerFile": "${workspaceRoot}/Seele.natvis",
|
||||
"logging": {
|
||||
"moduleLoad": false,
|
||||
"exceptions": true,
|
||||
"trace": true,
|
||||
"traceResponse": true
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Editor (Mac)",
|
||||
|
||||
@@ -48,6 +48,19 @@
|
||||
"buildRoot": "C:/Users/Dynamitos/Seele/build/",
|
||||
"installRoot": "C:/Program Files/Seele",
|
||||
"addressSanitizerEnabled": true
|
||||
},
|
||||
{
|
||||
"name": "MinSizeRel",
|
||||
"generator": "Visual Studio 17 2022 Win64",
|
||||
"configurationType": "MinSizeRel",
|
||||
"buildRoot": "C:/Users/Dynamitos/Seele/build/",
|
||||
"installRoot": "C:/Program Files/Seele",
|
||||
"cmakeCommandArgs": "-DCMAKE_DEBUG_POSTFIX=\"\" -DCMAKE_PLATFORM=x64",
|
||||
"buildCommandArgs": "",
|
||||
"ctestCommandArgs": "",
|
||||
"inheritEnvironments": [ "msvc_x64" ],
|
||||
"intelliSenseMode": "windows-msvc-x64",
|
||||
"variables": []
|
||||
}
|
||||
]
|
||||
}
|
||||
Vendored
-1
Submodule external/slang deleted from 484c1e618d
@@ -127,11 +127,15 @@ void MaterialLoader::import(MaterialImportArgs args, PMaterialAsset asset)
|
||||
}
|
||||
}
|
||||
uint32 uniformDataSize = uniformBufferOffset;
|
||||
auto referenceExpression = [&auxKey, &expressions](json obj) -> std::string
|
||||
auto referenceExpression = [¶meters, &auxKey, &expressions](json obj) -> std::string
|
||||
{
|
||||
if(obj.is_string())
|
||||
{
|
||||
std::string str = obj.get<std::string>();
|
||||
if (parameters.find(str) != parameters.end())
|
||||
{
|
||||
return str;
|
||||
}
|
||||
OConstantExpression c = new ConstantExpression(str, ExpressionType::UNKNOWN);
|
||||
std::string name = fmt::format("const_{0}", auxKey++);
|
||||
c->key = name;
|
||||
|
||||
Reference in New Issue
Block a user