diff --git a/CHANGES b/CHANGES index bf55fff..5aeb959 100644 --- a/CHANGES +++ b/CHANGES @@ -5,24 +5,24 @@ Promotion history for /spvgen/external [glslang] -Commit: f8dd5add -Date: 2023/10/30 -f8dd5add Bump github/codeql-action from 2.22.4 to 2.22.5 +Commit: 57d86ab7 +Date: 2024/1/9 +57d86ab7 cmake: remove generation of deprecated *Targets.cmake files [SPIRV-tools] -Commit: 4f014aff -Date: 2023/10/26 -4f014aff Roll external/re2/ 601d9ea3e..a0b3bc60c (1 commit) (#5453) +Commit: c96fe8b9 +Date: 2024/1/18 +c96fe8b9 spirv-val: Re-enable OpControlBarrier VU (#5527) [SPIRV-headers] -Commit: 88bc5e3 -Date: 2023/10/18 -88bc5e3 Headers support for new FPGAMemoryAttributesINTEL (#384) +Commit: 7b030970 +Date: 2024/1/17 +7b030970 Register Zig Compiler tool (#405) [SPIRV-cross] -Commit: 637cff3d -Date: 2023/10/23 -637cff3d Merge pull request #2220 from KhronosGroup/pr-2208 +Commit: 64f64c83 +Date: 2024/1/16 +64f64c83 Merge pull request #2266 from KhronosGroup/pr-2257 diff --git a/CMakeLists.txt b/CMakeLists.txt index 8324f91..607d713 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ ## ####################################################################################################################### # - # Copyright (c) 2023 Advanced Micro Devices, Inc. All Rights Reserved. + # Copyright (c) 2024 Advanced Micro Devices, Inc. All Rights Reserved. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -56,16 +56,8 @@ set(SPIRV_SKIP_TESTS TRUE CACHE BOOL "" FORCE) set(SPIRV_SKIP_EXECUTABLES ON CACHE BOOL "OGLP override." FORCE) set(SPIRV_CROSS_ENABLE_TESTS OFF CACHE BOOL "OGLP override." FORCE) set(SPIRV_CROSS_CLI OFF CACHE BOOL "OGLP override." FORCE) -set(ENABLE_OPT OFF CACHE BOOL "" FORCE) # Build third party targets -if(EXISTS ${THIRD_PARTY_PATH}/glslang) - set(GLSLANG_PATH ${THIRD_PARTY_PATH}/glslang) -else() - set(GLSLANG_PATH ${PROJECT_SOURCE_DIR}/external/glslang) -endif() -add_subdirectory(${GLSLANG_PATH} external/glslang) - if(EXISTS ${THIRD_PARTY_PATH}/SPIRV-tools) set(SPIRV_TOOLS_PATH ${THIRD_PARTY_PATH}/SPIRV-tools) else() @@ -74,6 +66,13 @@ endif() set(SPIRV_WERROR ${SPVGEN_ENABLE_WERROR} CACHE BOOL "${PROJECT_NAME} override." FORCE) add_subdirectory(${SPIRV_TOOLS_PATH} external/SPIRV-tools) +if(EXISTS ${THIRD_PARTY_PATH}/glslang) + set(GLSLANG_PATH ${THIRD_PARTY_PATH}/glslang) +else() + set(GLSLANG_PATH ${PROJECT_SOURCE_DIR}/external/glslang) +endif() +add_subdirectory(${GLSLANG_PATH} external/glslang) + if(EXISTS ${THIRD_PARTY_PATH}/SPIRV-cross) set(SPIRV_CROSS_PATH ${THIRD_PARTY_PATH}/SPIRV-cross) else() @@ -98,7 +97,7 @@ PRIVATE ${SPIRV_CROSS_PATH} ) -target_link_libraries(spvgen_base glslang HLSL OGLCompiler SPIRV SPIRV-Tools SPIRV-Tools-opt spirv-cross-c) +target_link_libraries(spvgen_base glslang SPIRV SPIRV-Tools SPIRV-Tools-opt spirv-cross-c) # Touch an empty source file set(EMPTY_SOURCE_FILES ${CMAKE_CURRENT_BINARY_DIR}/empty.cpp) @@ -123,12 +122,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") set_property(TARGET spvgen_static PROPERTY FOLDER spvgen) set_property(TARGET glslang PROPERTY FOLDER spvgen/glslang) set_property(TARGET GenericCodeGen PROPERTY FOLDER spvgen/glslang) - set_property(TARGET MachineIndependent PROPERTY FOLDER spvgen/glslang) - set_property(TARGET OGLCompiler PROPERTY FOLDER spvgen/glslang) - set_property(TARGET OSDependent PROPERTY FOLDER spvgen/glslang) set_property(TARGET SPIRV PROPERTY FOLDER spvgen/glslang) - set_property(TARGET SPVRemapper PROPERTY FOLDER spvgen/glslang) - set_property(TARGET HLSL PROPERTY FOLDER spvgen/glslang) set_property(TARGET spirv-cross-c PROPERTY FOLDER spvgen/spirv-cross) set_property(TARGET spirv-cross-core PROPERTY FOLDER spvgen/spirv-cross) diff --git a/external/fetch_external_sources.py b/external/fetch_external_sources.py index af3dad1..00a4399 100644 --- a/external/fetch_external_sources.py +++ b/external/fetch_external_sources.py @@ -2,7 +2,7 @@ ## ####################################################################################################################### # - # Copyright (c) 2023 Advanced Micro Devices, Inc. All Rights Reserved. + # Copyright (c) 2024 Advanced Micro Devices, Inc. All Rights Reserved. # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal diff --git a/include/spvgen.h b/include/spvgen.h index 63fe2e9..b4df082 100644 --- a/include/spvgen.h +++ b/include/spvgen.h @@ -1,7 +1,7 @@ /* *********************************************************************************************************************** * - * Copyright (c) 2015-2023 Advanced Micro Devices, Inc. All Rights Reserved. + * Copyright (c) 2015-2024 Advanced Micro Devices, Inc. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/source/spvgen.cpp b/source/spvgen.cpp index b37db44..ec4859c 100644 --- a/source/spvgen.cpp +++ b/source/spvgen.cpp @@ -1,7 +1,7 @@ /* *********************************************************************************************************************** * - * Copyright (c) 2015-2023 Advanced Micro Devices, Inc. All Rights Reserved. + * Copyright (c) 2015-2024 Advanced Micro Devices, Inc. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal