Skip to content

Commit 4682256

Browse files
committed
Add on-duplicate builtin resource error handle, update src/nbl/builtin/CMakeLists.txt - remove duplicated "hlsl/shapes/line.hlsl" request
1 parent f1d587a commit 4682256

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/nbl/builtin/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,8 @@ LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/shapes/rounded_line.hlsl")
277277
LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/shapes/beziers.hlsl")
278278
#barycentrics
279279
LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/barycentric/utils.hlsl")
280+
#scanning append
281+
LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/scanning_append.hlsl")
280282
#subgroup
281283
LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/subgroup/ballot.hlsl")
282284
LIST_BUILTIN_RESOURCE(NBL_RESOURCES_TO_EMBED "hlsl/subgroup/basic.hlsl")

src/nbl/builtin/utils.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ macro(LIST_BUILTIN_RESOURCE _BUNDLE_NAME_ _LBR_PATH_)
1414
endforeach()
1515
endif()
1616

17+
list(FIND ${_BUNDLE_NAME_} "${_LBR_PATH_}" _NBL_FOUND_)
18+
19+
if(NOT "${_NBL_FOUND_}" STREQUAL "-1")
20+
message(FATAL_ERROR "Duplicated \"${_LBR_PATH_}\" builtin resource list-request detected to \"${_BUNDLE_NAME_}\", remove the entry!")
21+
endif()
22+
1723
list(APPEND ${_BUNDLE_NAME_} "${_LBR_PATH_}")
1824
set(${_BUNDLE_NAME_} ${${_BUNDLE_NAME_}}) # override
1925

0 commit comments

Comments
 (0)