Skip to content

Commit 172d9b3

Browse files
committed
update SPIRV tool, add KEY json field and update examples_tests submodule
1 parent 6dec863 commit 172d9b3

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

cmake/common.cmake

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1316,6 +1316,7 @@ struct DeviceConfigCaps
13161316

13171317
foreach(INDEX RANGE ${LAST_INDEX})
13181318
string(JSON INPUT GET "${IMPL_INPUTS}" ${INDEX} INPUT)
1319+
string(JSON BASE_KEY GET "${IMPL_INPUTS}" ${INDEX} KEY)
13191320
string(JSON COMPILE_OPTIONS_LENGTH LENGTH "${IMPL_INPUTS}" ${INDEX} COMPILE_OPTIONS)
13201321

13211322
set(COMPILE_OPTIONS "")
@@ -1338,10 +1339,6 @@ struct DeviceConfigCaps
13381339
endif()
13391340
endif()
13401341

1341-
get_filename_component(INPUT_NOEXT "${INPUT}" NAME_WLE)
1342-
get_filename_component(INPUT_DIR "${INPUT}" DIRECTORY)
1343-
set(BASE_KEY "${INPUT_DIR}/${INPUT_NOEXT}.spv")
1344-
13451342
set(HAS_CAPS FALSE)
13461343
set(CAPS_LENGTH 0)
13471344
string(JSON CAPS_TYPE TYPE "${IMPL_INPUTS}" ${INDEX} CAPS)
@@ -1375,7 +1372,11 @@ struct DeviceConfigCaps
13751372
endif()
13761373

13771374
list(LENGTH CAP_NAMES NUM_CAPS)
1378-
set(TARGET_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/${INPUT}")
1375+
1376+
set(TARGET_INPUT "${INPUT}")
1377+
if(NOT IS_ABSOLUTE "${TARGET_INPUT}")
1378+
set(TARGET_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/${TARGET_INPUT}")
1379+
endif()
13791380

13801381
function(GENERATE_KEYS PREFIX CAP_INDEX CAPS_EVAL_PART)
13811382
if(NUM_CAPS EQUAL 0 OR CAP_INDEX EQUAL ${NUM_CAPS})

0 commit comments

Comments
 (0)