Skip to content

Commit e751d08

Browse files
committed
Reverted making add_subdirectory(examples_tests) unconditional
1 parent cc8c793 commit e751d08

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,9 @@ add_subdirectory(${THIRD_PARTY_SOURCE_DIR})
352352

353353
add_subdirectory(src/nbl)
354354
add_subdirectory("${NBL_PYTHON_MODULE_ROOT_PATH}" tests) # Python Framework
355-
add_subdirectory(examples_tests)
355+
if(NBL_BUILD_EXAMPLES)
356+
add_subdirectory(examples_tests)
357+
endif()
356358
add_subdirectory(tools)
357359

358360
if(NBL_BUILD_DOCS)

src/nbl/asset/interchange/CHLSLLoader.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ SAssetBundle CHLSLLoader::loadAsset(system::IFile* _file, const IAssetLoader::SA
3434
{".tese.hlsl",IShader::ESS_TESSELLATION_EVALUATION},
3535
{".geom.hlsl",IShader::ESS_GEOMETRY},
3636
{".frag.hlsl",IShader::ESS_FRAGMENT},
37-
{".comp.hlsl",IShader::ESS_COMPUTE}
37+
{".comp.hlsl",IShader::ESS_COMPUTE},
38+
{".mesh.hlsl",IShader::ESS_MESH},
39+
{".task.hlsl",IShader::ESS_TASK},
3840
};
3941
auto shaderStage = IShader::ESS_UNKNOWN;
4042
for (auto& it : typeFromExt) {

0 commit comments

Comments
 (0)