From 81471bb08624b3f1e0eca3c1efd3f1154cb58e53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Mon, 10 Jun 2019 17:51:37 +0200 Subject: [PATCH 01/55] Release 2019.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- .gitignore | 1 + ...p-third-party-code-in-CMakeLists.txt.patch | 36 +- ...t-Add-support-for-SPV_NV_mesh_shader.patch | 521 ------------------ shaderc.spec | 36 +- sources | 2 +- 5 files changed, 34 insertions(+), 562 deletions(-) delete mode 100644 0001-Revert-Add-support-for-SPV_NV_mesh_shader.patch diff --git a/.gitignore b/.gitignore index 1221df9..0d7072c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /shaderc-7a23a01.tar.gz /shaderc-7d8582b.tar.gz +/shaderc-34c412f.tar.gz diff --git a/0001-Drop-third-party-code-in-CMakeLists.txt.patch b/0001-Drop-third-party-code-in-CMakeLists.txt.patch index 8425d34..32ea680 100644 --- a/0001-Drop-third-party-code-in-CMakeLists.txt.patch +++ b/0001-Drop-third-party-code-in-CMakeLists.txt.patch @@ -1,36 +1,24 @@ -From f3e0470ccf96a48f6e5701aa64aa831d51769d8e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= -Date: Sun, 30 Sep 2018 20:53:08 +0200 -Subject: [PATCH] Drop third party code in CMakeLists.txt -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Robert-André Mauchin ---- - CMakeLists.txt | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b9bd0df..bd2c9f7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -52,15 +52,9 @@ endif(MSVC) +diff -up shaderc-34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4/CMakeLists.txt.unbundle shaderc-34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4/CMakeLists.txt +--- shaderc-34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4/CMakeLists.txt.unbundle 2019-06-10 00:30:41.954316517 +0200 ++++ shaderc-34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4/CMakeLists.txt 2019-06-10 01:10:11.672758769 +0200 +@@ -70,7 +70,6 @@ endif(MSVC) # Configure subdirectories. # We depend on these for later projects, so they should come first. -add_subdirectory(third_party) - add_subdirectory(libshaderc_util) - add_subdirectory(libshaderc) + if(SHADERC_ENABLE_SPVC) + add_subdirectory(libshaderc_spvc) +@@ -81,12 +80,6 @@ add_subdirectory(libshaderc) add_subdirectory(glslc) add_subdirectory(examples) -add_custom_target(build-version -- ${PYTHON_EXE} +- ${PYTHON_EXECUTABLE} - ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py - ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} - COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).") --- -2.19.0 - +- + function(define_pkg_config_file NAME LIBS) + add_custom_target(${NAME}-pkg-config ALL + COMMAND ${CMAKE_COMMAND} diff --git a/0001-Revert-Add-support-for-SPV_NV_mesh_shader.patch b/0001-Revert-Add-support-for-SPV_NV_mesh_shader.patch deleted file mode 100644 index 083858b..0000000 --- a/0001-Revert-Add-support-for-SPV_NV_mesh_shader.patch +++ /dev/null @@ -1,521 +0,0 @@ -From 7867887019541322b08cc31257c447d20e79a40c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= -Date: Wed, 3 Oct 2018 16:37:42 +0200 -Subject: [PATCH] Revert "Add-support-for-SPV_NV_mesh_shader" - -This reverts commit e8ffa069fa40f79824cb1499eaa78cb56af84d0a. ---- - CMakeLists.txt | 8 -- - glslc/src/shader_stage.cc | 23 +----- - glslc/src/stage_test.cc | 25 ------ - libshaderc/include/shaderc/shaderc.h | 27 ------- - libshaderc/src/common_shaders_for_test.h | 38 ---------- - libshaderc/src/shaderc.cc | 57 -------------- - libshaderc/src/shaderc_private.h | 18 ----- - libshaderc/src/shaderc_private_test.cc | 18 ----- - libshaderc/src/shaderc_test.cc | 76 ------------------- - .../include/libshaderc_util/compiler.h | 34 +-------- - libshaderc_util/src/resources.cc | 10 --- - 11 files changed, 5 insertions(+), 329 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b982eab..422d9c2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -19,19 +19,11 @@ else() - message(STATUS "Configuring Shaderc to avoid building tests.") - endif() - --set (CMAKE_CXX_STANDARD 11) -- --option(SHADERC_ENABLE_NV_EXTENSIONS "Enables support of Nvidia-specific extensions" ON) - - include(GNUInstallDirs) - include(cmake/setup_build.cmake) - include(cmake/utils.cmake) - -- --if(SHADERC_ENABLE_NV_EXTENSIONS) -- add_definitions(-DNV_EXTENSIONS) --endif(SHADERC_ENABLE_NV_EXTENSIONS) -- - add_custom_target(check-copyright ALL - ${PYTHON_EXE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/add_copyright.py - --check -diff --git a/glslc/src/shader_stage.cc b/glslc/src/shader_stage.cc -index 3e4716d..142195a 100644 ---- a/glslc/src/shader_stage.cc -+++ b/glslc/src/shader_stage.cc -@@ -43,18 +43,7 @@ shaderc_shader_kind MapStageNameToForcedKind(const string_piece& stage_name) { - {"geometry", shaderc_glsl_geometry_shader}, - {"geom", shaderc_glsl_geometry_shader}, - {"compute", shaderc_glsl_compute_shader}, -- {"comp", shaderc_glsl_compute_shader}, --#ifdef NV_EXTENSIONS -- {"rgen", shaderc_glsl_raygen_shader }, -- {"rahit", shaderc_glsl_anyhit_shader }, -- {"rchit", shaderc_glsl_closesthit_shader }, -- {"rmiss", shaderc_glsl_miss_shader }, -- {"rint", shaderc_glsl_intersection_shader }, -- {"rcall", shaderc_glsl_callable_shader }, -- {"task", shaderc_glsl_task_shader }, -- {"mesh", shaderc_glsl_mesh_shader }, --#endif -- }; -+ {"comp", shaderc_glsl_compute_shader}}; - for (const auto& entry : string_to_kind) { - if (stage_name == entry.id) return entry.stage; - } -@@ -79,16 +68,6 @@ shaderc_shader_kind DeduceDefaultShaderKindFromFileName( - {"geom", shaderc_glsl_default_geometry_shader}, - {"comp", shaderc_glsl_default_compute_shader}, - {"spvasm", shaderc_spirv_assembly}, --#ifdef NV_EXTENSIONS -- {"rgen", shaderc_glsl_default_raygen_shader }, -- {"rahit", shaderc_glsl_default_anyhit_shader }, -- {"rchit", shaderc_glsl_default_closesthit_shader }, -- {"rmiss", shaderc_glsl_default_miss_shader }, -- {"rint", shaderc_glsl_default_intersection_shader }, -- {"rcall", shaderc_glsl_default_callable_shader }, -- {"task", shaderc_glsl_default_task_shader }, -- {"mesh", shaderc_glsl_default_mesh_shader }, --#endif - }; - - const string_piece extension = glslc::GetFileExtension(file_name); -diff --git a/glslc/src/stage_test.cc b/glslc/src/stage_test.cc -index 80eef92..2ee0271 100644 ---- a/glslc/src/stage_test.cc -+++ b/glslc/src/stage_test.cc -@@ -49,31 +49,6 @@ TEST(DeduceDefaultShaderKindFromFileName, ValidStage) { - EXPECT_EQ(shaderc_glsl_default_compute_shader, - glslc::DeduceDefaultShaderKindFromFileName("a.comp")); - --#ifdef NV_EXTENSIONS -- EXPECT_EQ(shaderc_glsl_default_raygen_shader, -- glslc::DeduceDefaultShaderKindFromFileName("a.rgen")); -- -- EXPECT_EQ(shaderc_glsl_default_anyhit_shader, -- glslc::DeduceDefaultShaderKindFromFileName("a.rahit")); -- -- EXPECT_EQ(shaderc_glsl_default_closesthit_shader, -- glslc::DeduceDefaultShaderKindFromFileName("a.rchit")); -- -- EXPECT_EQ(shaderc_glsl_default_miss_shader, -- glslc::DeduceDefaultShaderKindFromFileName("a.rmiss")); -- -- EXPECT_EQ(shaderc_glsl_default_intersection_shader, -- glslc::DeduceDefaultShaderKindFromFileName("a.rint")); -- -- EXPECT_EQ(shaderc_glsl_default_callable_shader, -- glslc::DeduceDefaultShaderKindFromFileName("a.rcall")); -- -- EXPECT_EQ(shaderc_glsl_default_task_shader, -- glslc::DeduceDefaultShaderKindFromFileName("a.task")); -- -- EXPECT_EQ(shaderc_glsl_default_mesh_shader, -- glslc::DeduceDefaultShaderKindFromFileName("a.mesh")); --#endif - } - - TEST(DeduceDefaultShaderKindFromFileName, InvalidStage) { -diff --git a/libshaderc/include/shaderc/shaderc.h b/libshaderc/include/shaderc/shaderc.h -index 6addebf..093bb12 100644 ---- a/libshaderc/include/shaderc/shaderc.h -+++ b/libshaderc/include/shaderc/shaderc.h -@@ -64,7 +64,6 @@ typedef enum { - shaderc_glsl_geometry_shader = shaderc_geometry_shader, - shaderc_glsl_tess_control_shader = shaderc_tess_control_shader, - shaderc_glsl_tess_evaluation_shader = shaderc_tess_evaluation_shader, -- - // Deduce the shader kind from #pragma annotation in the source code. Compiler - // will emit error if #pragma annotation is not found. - shaderc_glsl_infer_from_source, -@@ -78,32 +77,6 @@ typedef enum { - shaderc_glsl_default_tess_control_shader, - shaderc_glsl_default_tess_evaluation_shader, - shaderc_spirv_assembly, --#ifdef NV_EXTENSIONS -- shaderc_raygen_shader, -- shaderc_anyhit_shader, -- shaderc_closesthit_shader, -- shaderc_miss_shader, -- shaderc_intersection_shader, -- shaderc_callable_shader, -- shaderc_glsl_raygen_shader = shaderc_raygen_shader, -- shaderc_glsl_anyhit_shader = shaderc_anyhit_shader, -- shaderc_glsl_closesthit_shader = shaderc_closesthit_shader, -- shaderc_glsl_miss_shader = shaderc_miss_shader, -- shaderc_glsl_intersection_shader = shaderc_intersection_shader, -- shaderc_glsl_callable_shader = shaderc_callable_shader, -- shaderc_glsl_default_raygen_shader, -- shaderc_glsl_default_anyhit_shader, -- shaderc_glsl_default_closesthit_shader, -- shaderc_glsl_default_miss_shader, -- shaderc_glsl_default_intersection_shader, -- shaderc_glsl_default_callable_shader, -- shaderc_task_shader, -- shaderc_mesh_shader, -- shaderc_glsl_task_shader = shaderc_task_shader, -- shaderc_glsl_mesh_shader = shaderc_mesh_shader, -- shaderc_glsl_default_task_shader, -- shaderc_glsl_default_mesh_shader, --#endif - } shaderc_shader_kind; - - typedef enum { -diff --git a/libshaderc/src/common_shaders_for_test.h b/libshaderc/src/common_shaders_for_test.h -index e1e52be..d4e15c1 100644 ---- a/libshaderc/src/common_shaders_for_test.h -+++ b/libshaderc/src/common_shaders_for_test.h -@@ -259,44 +259,6 @@ const char kGlslShaderComputeSubgroupBarrier[] = - #extension GL_KHR_shader_subgroup_basic : enable - void main() { subgroupBarrier(); })"; - --#ifdef NV_EXTENSIONS --// A GLSL task shader using a regular barrier. --const char kGlslShaderTaskBarrier[] = -- R"(#version 450 -- #extension GL_NV_mesh_shader : enable -- layout(local_size_x = 32) in; -- void main() { barrier(); })"; -- --// A GLSL task shader using the Subgroups feature. --const char kGlslShaderTaskSubgroupBarrier[] = -- R"(#version 450 -- #extension GL_NV_mesh_shader : enable -- #extension GL_KHR_shader_subgroup_basic : enable -- layout(local_size_x = 32) in; -- void main() { subgroupBarrier(); })"; -- --// A GLSL mesh shader using a regular barrier. --const char kGlslShaderMeshBarrier[] = -- R"(#version 450 -- #extension GL_NV_mesh_shader : enable -- layout(local_size_x = 32) in; -- layout(max_vertices=81) out; -- layout(max_primitives=32) out; -- layout(triangles) out; -- void main() { barrier(); })"; -- --// A GLSL mesh shader using the Subgroups feature. --const char kGlslShaderMeshSubgroupBarrier[] = -- R"(#version 450 -- #extension GL_NV_mesh_shader : enable -- #extension GL_KHR_shader_subgroup_basic : enable -- layout(local_size_x = 32) in; -- layout(max_vertices=81) out; -- layout(max_primitives=32) out; -- layout(triangles) out; -- void main() { subgroupBarrier(); })"; --#endif -- - const char kGlslMultipleFnShader[] = - R"(#version 450 - layout(location=0) flat in int inVal; -diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc -index 5f5db16..17a6562 100644 ---- a/libshaderc/src/shaderc.cc -+++ b/libshaderc/src/shaderc.cc -@@ -56,26 +56,6 @@ EShLanguage GetForcedStage(shaderc_shader_kind kind) { - return EShLangTessControl; - case shaderc_glsl_tess_evaluation_shader: - return EShLangTessEvaluation; -- --#ifdef NV_EXTENSIONS -- case shaderc_glsl_raygen_shader: -- return EShLangRayGenNV; -- case shaderc_glsl_anyhit_shader: -- return EShLangAnyHitNV; -- case shaderc_glsl_closesthit_shader: -- return EShLangClosestHitNV; -- case shaderc_glsl_miss_shader: -- return EShLangMissNV; -- case shaderc_glsl_intersection_shader: -- return EShLangIntersectNV; -- case shaderc_glsl_callable_shader: -- return EShLangCallableNV; -- case shaderc_glsl_task_shader: -- return EShLangTaskNV; -- case shaderc_glsl_mesh_shader: -- return EShLangMeshNV; --#endif -- - case shaderc_glsl_infer_from_source: - case shaderc_glsl_default_vertex_shader: - case shaderc_glsl_default_fragment_shader: -@@ -83,16 +63,6 @@ EShLanguage GetForcedStage(shaderc_shader_kind kind) { - case shaderc_glsl_default_geometry_shader: - case shaderc_glsl_default_tess_control_shader: - case shaderc_glsl_default_tess_evaluation_shader: --#ifdef NV_EXTENSIONS -- case shaderc_glsl_default_raygen_shader: -- case shaderc_glsl_default_anyhit_shader: -- case shaderc_glsl_default_closesthit_shader: -- case shaderc_glsl_default_miss_shader: -- case shaderc_glsl_default_intersection_shader: -- case shaderc_glsl_default_callable_shader: -- case shaderc_glsl_default_task_shader: -- case shaderc_glsl_default_mesh_shader: --#endif - case shaderc_spirv_assembly: - return EShLangCount; - } -@@ -150,16 +120,6 @@ class StageDeducer { - case shaderc_glsl_tess_control_shader: - case shaderc_glsl_tess_evaluation_shader: - case shaderc_glsl_infer_from_source: --#ifdef NV_EXTENSIONS -- case shaderc_glsl_raygen_shader: -- case shaderc_glsl_anyhit_shader: -- case shaderc_glsl_closesthit_shader: -- case shaderc_glsl_miss_shader: -- case shaderc_glsl_intersection_shader: -- case shaderc_glsl_callable_shader: -- case shaderc_glsl_task_shader: -- case shaderc_glsl_mesh_shader: --#endif - return EShLangCount; - case shaderc_glsl_default_vertex_shader: - return EShLangVertex; -@@ -173,23 +133,6 @@ class StageDeducer { - return EShLangTessControl; - case shaderc_glsl_default_tess_evaluation_shader: - return EShLangTessEvaluation; --#ifdef NV_EXTENSIONS -- case shaderc_glsl_default_raygen_shader: -- return EShLangRayGenNV; -- case shaderc_glsl_default_anyhit_shader: -- return EShLangAnyHitNV; -- case shaderc_glsl_default_closesthit_shader: -- return EShLangClosestHitNV; -- case shaderc_glsl_default_miss_shader: -- return EShLangMissNV; -- case shaderc_glsl_default_intersection_shader: -- return EShLangIntersectNV; -- case shaderc_glsl_default_callable_shader: -- return EShLangCallableNV; -- case shaderc_glsl_default_task_shader: -- return EShLangTaskNV; -- case shaderc_glsl_default_mesh_shader: --#endif - case shaderc_spirv_assembly: - return EShLangCount; - } -diff --git a/libshaderc/src/shaderc_private.h b/libshaderc/src/shaderc_private.h -index 30dc863..47de8f5 100644 ---- a/libshaderc/src/shaderc_private.h -+++ b/libshaderc/src/shaderc_private.h -@@ -111,24 +111,6 @@ inline shaderc_util::Compiler::Stage shaderc_convert_specific_stage( - return shaderc_util::Compiler::Stage::Geometry; - case shaderc_compute_shader: - return shaderc_util::Compiler::Stage::Compute; --#if NV_EXTENSIONS -- case shaderc_raygen_shader: -- return shaderc_util::Compiler::Stage::RayGenNV; -- case shaderc_intersection_shader: -- return shaderc_util::Compiler::Stage::IntersectNV; -- case shaderc_anyhit_shader: -- return shaderc_util::Compiler::Stage::AnyHitNV; -- case shaderc_closesthit_shader: -- return shaderc_util::Compiler::Stage::ClosestHitNV; -- case shaderc_miss_shader: -- return shaderc_util::Compiler::Stage::MissNV; -- case shaderc_callable_shader: -- return shaderc_util::Compiler::Stage::CallableNV; -- case shaderc_task_shader: -- return shaderc_util::Compiler::Stage::TaskNV; -- case shaderc_mesh_shader: -- return shaderc_util::Compiler::Stage::MeshNV; --#endif - default: - // We don't care about the other kinds. - break; -diff --git a/libshaderc/src/shaderc_private_test.cc b/libshaderc/src/shaderc_private_test.cc -index 3b64551..2d6ebf8 100644 ---- a/libshaderc/src/shaderc_private_test.cc -+++ b/libshaderc/src/shaderc_private_test.cc -@@ -30,23 +30,5 @@ TEST(ConvertSpecificStage, Exhaustive) { - shaderc_convert_specific_stage(shaderc_geometry_shader)); - EXPECT_EQ(shaderc_util::Compiler::Stage::Compute, - shaderc_convert_specific_stage(shaderc_compute_shader)); --#ifdef NV_EXTENSIONS -- EXPECT_EQ(shaderc_util::Compiler::Stage::RayGenNV, -- shaderc_convert_specific_stage(shaderc_raygen_shader)); -- EXPECT_EQ(shaderc_util::Compiler::Stage::AnyHitNV, -- shaderc_convert_specific_stage(shaderc_anyhit_shader)); -- EXPECT_EQ(shaderc_util::Compiler::Stage::ClosestHitNV, -- shaderc_convert_specific_stage(shaderc_closesthit_shader)); -- EXPECT_EQ(shaderc_util::Compiler::Stage::IntersectNV, -- shaderc_convert_specific_stage(shaderc_intersection_shader)); -- EXPECT_EQ(shaderc_util::Compiler::Stage::MissNV, -- shaderc_convert_specific_stage(shaderc_miss_shader)); -- EXPECT_EQ(shaderc_util::Compiler::Stage::CallableNV, -- shaderc_convert_specific_stage(shaderc_callable_shader)); -- EXPECT_EQ(shaderc_util::Compiler::Stage::TaskNV, -- shaderc_convert_specific_stage(shaderc_task_shader)); -- EXPECT_EQ(shaderc_util::Compiler::Stage::MeshNV, -- shaderc_convert_specific_stage(shaderc_mesh_shader)); --#endif - } - } // anonymous namespace -diff --git a/libshaderc/src/shaderc_test.cc b/libshaderc/src/shaderc_test.cc -index e68ebcb..93acc09 100644 ---- a/libshaderc/src/shaderc_test.cc -+++ b/libshaderc/src/shaderc_test.cc -@@ -1198,82 +1198,6 @@ TEST_F(CompileStringWithOptionsTest, - shaderc_glsl_compute_shader, options_.get())); - } - --#ifdef NV_EXTENSIONS --// task shader --TEST_F(CompileStringWithOptionsTest, -- TargetEnvRespectedWhenCompilingVulkan1_0TaskShaderToVulkan1_0Succeeds) { -- shaderc_compile_options_set_target_env(options_.get(), -- shaderc_target_env_vulkan, -- shaderc_env_version_vulkan_1_0); -- EXPECT_TRUE(CompilesToValidSpv(compiler_, kGlslShaderTaskBarrier, -- shaderc_glsl_task_shader, options_.get())); --} -- --TEST_F(CompileStringWithOptionsTest, -- TargetEnvRespectedWhenCompilingVulkan1_0TaskShaderToVulkan1_1Succeeds) { -- shaderc_compile_options_set_target_env(options_.get(), -- shaderc_target_env_vulkan, -- shaderc_env_version_vulkan_1_1); -- EXPECT_TRUE(CompilesToValidSpv(compiler_, kGlslShaderTaskBarrier, -- shaderc_glsl_task_shader, options_.get())); --} -- --TEST_F(CompileStringWithOptionsTest, -- TargetEnvRespectedWhenCompilingVulkan1_1TaskShaderToVulkan1_0Fails) { -- shaderc_compile_options_set_target_env(options_.get(), -- shaderc_target_env_vulkan, -- shaderc_env_version_vulkan_1_0); -- EXPECT_FALSE(CompilesToValidSpv(compiler_, kGlslShaderTaskSubgroupBarrier, -- shaderc_glsl_task_shader, options_.get())); --} -- --TEST_F(CompileStringWithOptionsTest, -- TargetEnvRespectedWhenCompilingVulkan1_1TaskShaderToVulkan1_1Succeeds) { -- shaderc_compile_options_set_target_env(options_.get(), -- shaderc_target_env_vulkan, -- shaderc_env_version_vulkan_1_1); -- EXPECT_TRUE(CompilesToValidSpv(compiler_, kGlslShaderTaskSubgroupBarrier, -- shaderc_glsl_task_shader, options_.get())); --} -- --// mesh shader --TEST_F(CompileStringWithOptionsTest, -- TargetEnvRespectedWhenCompilingVulkan1_0MeshShaderToVulkan1_0Succeeds) { -- shaderc_compile_options_set_target_env(options_.get(), -- shaderc_target_env_vulkan, -- shaderc_env_version_vulkan_1_0); -- EXPECT_TRUE(CompilesToValidSpv(compiler_, kGlslShaderMeshBarrier, -- shaderc_glsl_mesh_shader, options_.get())); --} -- --TEST_F(CompileStringWithOptionsTest, -- TargetEnvRespectedWhenCompilingVulkan1_0MeshShaderToVulkan1_1Succeeds) { -- shaderc_compile_options_set_target_env(options_.get(), -- shaderc_target_env_vulkan, -- shaderc_env_version_vulkan_1_1); -- EXPECT_TRUE(CompilesToValidSpv(compiler_, kGlslShaderMeshBarrier, -- shaderc_glsl_mesh_shader, options_.get())); --} -- --TEST_F(CompileStringWithOptionsTest, -- TargetEnvRespectedWhenCompilingVulkan1_1MeshShaderToVulkan1_0Fails) { -- shaderc_compile_options_set_target_env(options_.get(), -- shaderc_target_env_vulkan, -- shaderc_env_version_vulkan_1_0); -- EXPECT_FALSE(CompilesToValidSpv(compiler_, kGlslShaderMeshSubgroupBarrier, -- shaderc_glsl_mesh_shader, options_.get())); --} -- --TEST_F(CompileStringWithOptionsTest, -- TargetEnvRespectedWhenCompilingVulkan1_1MeshShaderToVulkan1_1Succeeds) { -- shaderc_compile_options_set_target_env(options_.get(), -- shaderc_target_env_vulkan, -- shaderc_env_version_vulkan_1_1); -- EXPECT_TRUE(CompilesToValidSpv(compiler_, kGlslShaderMeshSubgroupBarrier, -- shaderc_glsl_mesh_shader, options_.get())); --} --#endif -- - TEST_F(CompileStringWithOptionsTest, - DISABLED_TargetEnvIgnoredWhenPreprocessing) { - // This test is disabled since some versions of glslang may refuse to compile -diff --git a/libshaderc_util/include/libshaderc_util/compiler.h b/libshaderc_util/include/libshaderc_util/compiler.h -index f36a97f..bbbab86 100644 ---- a/libshaderc_util/include/libshaderc_util/compiler.h -+++ b/libshaderc_util/include/libshaderc_util/compiler.h -@@ -171,40 +171,14 @@ class Compiler { - Geometry, - Fragment, - Compute, --#ifdef NV_EXTENSIONS -- RayGenNV, -- IntersectNV, -- AnyHitNV, -- ClosestHitNV, -- MissNV, -- CallableNV, -- TaskNV, -- MeshNV, --#endif -- StageEnd, - }; -- enum { kNumStages = int(Stage::StageEnd) }; -+ enum { kNumStages = int(Stage::Compute) + 1 }; - - // Returns a std::array of all the Stage values. - const std::array& stages() const { -- static std::array values{{ -- Stage::Vertex, -- Stage::TessEval, -- Stage::TessControl, -- Stage::Geometry, -- Stage::Fragment, -- Stage::Compute, --#ifdef NV_EXTENSIONS -- Stage::RayGenNV, -- Stage::IntersectNV, -- Stage::AnyHitNV, -- Stage::ClosestHitNV, -- Stage::MissNV, -- Stage::CallableNV, -- Stage::TaskNV, -- Stage::MeshNV, --#endif -- }}; -+ static std::array values{ -+ {Stage::Vertex, Stage::TessEval, Stage::TessControl, Stage::Geometry, -+ Stage::Fragment, Stage::Compute}}; - return values; - } - -diff --git a/libshaderc_util/src/resources.cc b/libshaderc_util/src/resources.cc -index 458a63f..1617b0a 100644 ---- a/libshaderc_util/src/resources.cc -+++ b/libshaderc_util/src/resources.cc -@@ -116,16 +116,6 @@ const TBuiltInResource kDefaultTBuiltInResource = { - /*.maxCullDistances = */ 8, // ARB_cull_distance. - /*.maxCombinedClipAndCullDistances = */ 8, // ARB_cull_distance. - /*.maxSamples = */ 4, -- /* .maxMeshOutputVerticesNV = */ 256, -- /* .maxMeshOutputPrimitivesNV = */ 512, -- /* .maxMeshWorkGroupSizeX_NV = */ 32, -- /* .maxMeshWorkGroupSizeY_NV = */ 1, -- /* .maxMeshWorkGroupSizeZ_NV = */ 1, -- /* .maxTaskWorkGroupSizeX_NV = */ 32, -- /* .maxTaskWorkGroupSizeY_NV = */ 1, -- /* .maxTaskWorkGroupSizeZ_NV = */ 1, -- /* .maxMeshViewCountNV = */ 4, -- - // This is the glslang TLimits structure. - // It defines whether or not the following features are enabled. - // We want them to all be enabled. --- -2.19.0 - diff --git a/shaderc.spec b/shaderc.spec index 81ce50c..f6e3797 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,15 +1,16 @@ -# Release 2018.0 -%global commit 7d8582bb10c94889f0fc603cb10728faa58b93e1 +# Release 2019.0 +%global commit 34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20181003 -%global gitversion v2018.0 +%global snapshotdate 20190609 +%global gitversion v2019.0 # Need to keep this in sync with spirv-tools -%global spirv_commit 26a698c34788bb69123a1f3789970a16cf4d9641 +%global spirv_commit 2297d4a3dfcbfd2a8b4312fab055ae26e3289fd3 +%global spirv_version v2019.1 Name: shaderc -Version: 2018.0 -Release: 2%{?dist} +Version: 2019.0 +Release: 1%{?dist} Summary: A collection of tools, libraries, and tests for Vulkan shader compilation License: ASL 2.0 @@ -20,9 +21,6 @@ Source0: %url/archive/%{commit}/%{name}-%{shortcommit}.tar.gz Patch0: https://patch-diff.githubusercontent.com/raw/google/shaderc/pull/463.patch#/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch # Patch to unbundle 3rd party code Patch1: 0001-Drop-third-party-code-in-CMakeLists.txt.patch -# SPV_NV_mesh_shader is only available in theGIT master of glslang -# Delaying inclusion until neyt glslang release -Patch2: 0001-Revert-Add-support-for-SPV_NV_mesh_shader.patch BuildRequires: cmake3 BuildRequires: gcc-c++ @@ -34,13 +32,13 @@ BuildRequires: spirv-tools BuildRequires: spirv-tools-devel %description -A collection of tools, libraries and tests for shader compilation. +A collection of tools, libraries and tests for shader compilation. Shaderc aims to to provide: - - a command line compiler with GCC- and Clang-like usage, for better + - a command line compiler with GCC- and Clang-like usage, for better integration with build systems - an API where functionality can be added without breaking existing clients - - an API supporting standard concurrency patterns across multiple + - an API supporting standard concurrency patterns across multiple operating systems - increased functionality such as file #include support @@ -84,11 +82,11 @@ Static libraries for libshaderc. rm -rf third_party # Stolen from Gentoo -# Create build-version.inc since we want to use our packaged +# Create build-version.inc since we want to use our packaged # SPIRV-Tools and glslang echo \"shaderc $(grep -m1 -o '^v[[:digit:]]\{4\}\.[[:digit:]]\(-dev\)\?' CHANGES) %{gitversion}\" \ > glslc/src/build-version.inc -echo \"spirv-tools $(grep -m1 -o '^v[[:digit:]]\{4\}\.[[:digit:]]\(-dev\)\?' /usr/share/doc/spirv-tools/CHANGES) %{spirv_commit}\" \ +echo \"spirv-tools $(grep -m1 -o '^v[[:digit:]]\{4\}\.[[:digit:]]\(-dev\)\?' /usr/share/doc/spirv-tools/CHANGES) %{spirv_version}\" \ >> glslc/src/build-version.inc echo \"glslang \'\'\" >> glslc/src/build-version.inc @@ -129,16 +127,22 @@ ctest -V %files -n libshaderc-devel %{_includedir}/%{name}/ %{_libdir}/libshaderc_shared.so +%{_libdir}/pkgconfig/shaderc.pc %files -n libshaderc-static %license LICENSE %{_libdir}/libshaderc.a %{_libdir}/libshaderc_combined.a -%{_libdir}/libshaderc_util.a +%{_libdir}/pkgconfig/shaderc_static.pc +%{_libdir}/pkgconfig/shaderc_combined.pc + %changelog +* Mon Jun 10 00:18:18 CEST 2019 Robert-André Mauchin - 2019.0-1 +- Release 2019.0 + * Sat Feb 02 2019 Fedora Release Engineering - 2018.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 4a56ba0..1728654 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shaderc-7d8582b.tar.gz) = 20c77170265bb5dba61a47df7c369fdbece1d7a457f78f04c0a1ee4c728802b673857da8f91456de35627832781d2064ba2daf2b6859a4f1b14bfd53fc6e8588 +SHA512 (shaderc-34c412f.tar.gz) = bbc17c350e094230c53b22f80eef95d9dfac3716d3653764862fffe210f3d0fbaa60f204c9aa93e91390f60b4a8a5f153d940ba1e450eff89ff53b587f295ce7 From 64f3b94f91e9e3bfb38a4d84c68f21cacab7a0a5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 23:10:28 +0000 Subject: [PATCH 02/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shaderc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shaderc.spec b/shaderc.spec index f6e3797..3898430 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -10,7 +10,7 @@ Name: shaderc Version: 2019.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A collection of tools, libraries, and tests for Vulkan shader compilation License: ASL 2.0 @@ -140,6 +140,9 @@ ctest -V %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 2019.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Jun 10 00:18:18 CEST 2019 Robert-André Mauchin - 2019.0-1 - Release 2019.0 From 10c026689004b04dd0e765d47ae86ecea34c5521 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 23:20:15 +0000 Subject: [PATCH 03/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shaderc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shaderc.spec b/shaderc.spec index 3898430..c670c2d 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -10,7 +10,7 @@ Name: shaderc Version: 2019.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A collection of tools, libraries, and tests for Vulkan shader compilation License: ASL 2.0 @@ -140,6 +140,9 @@ ctest -V %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 2019.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jul 26 2019 Fedora Release Engineering - 2019.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 9eed86af39ce9f2222e4f1200393167a331973a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 2 Feb 2020 23:26:12 +0100 Subject: [PATCH 04/55] Update to 2019.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- .gitignore | 1 + ...p-third-party-code-in-CMakeLists.txt.patch | 15 ++-- 0001-Fix-SPIRV-includes-location.patch | 73 +++++++++++++++++++ ...link-order-of-libglslang-and-libHLSL.patch | 2 +- ...e-new-Glslang-profile-enum-in-switch.patch | 22 ++++++ shaderc.spec | 37 ++++------ sources | 2 +- 7 files changed, 120 insertions(+), 32 deletions(-) create mode 100644 0001-Fix-SPIRV-includes-location.patch create mode 100644 0001-Handle-new-Glslang-profile-enum-in-switch.patch diff --git a/.gitignore b/.gitignore index 0d7072c..91cbb3d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /shaderc-7a23a01.tar.gz /shaderc-7d8582b.tar.gz /shaderc-34c412f.tar.gz +/shaderc-f76bb2f.tar.gz diff --git a/0001-Drop-third-party-code-in-CMakeLists.txt.patch b/0001-Drop-third-party-code-in-CMakeLists.txt.patch index 32ea680..189afe1 100644 --- a/0001-Drop-third-party-code-in-CMakeLists.txt.patch +++ b/0001-Drop-third-party-code-in-CMakeLists.txt.patch @@ -1,7 +1,7 @@ -diff -up shaderc-34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4/CMakeLists.txt.unbundle shaderc-34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4/CMakeLists.txt ---- shaderc-34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4/CMakeLists.txt.unbundle 2019-06-10 00:30:41.954316517 +0200 -+++ shaderc-34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4/CMakeLists.txt 2019-06-10 01:10:11.672758769 +0200 -@@ -70,7 +70,6 @@ endif(MSVC) +diff -up shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt +--- shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig 2020-01-22 21:15:53.000000000 +0100 ++++ shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt 2020-02-02 21:06:15.193583552 +0100 +@@ -92,7 +92,6 @@ endif(MSVC) # Configure subdirectories. # We depend on these for later projects, so they should come first. @@ -9,16 +9,15 @@ diff -up shaderc-34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4/CMakeLists.txt.unbundl if(SHADERC_ENABLE_SPVC) add_subdirectory(libshaderc_spvc) -@@ -81,12 +80,6 @@ add_subdirectory(libshaderc) +@@ -103,11 +102,6 @@ add_subdirectory(libshaderc) add_subdirectory(glslc) add_subdirectory(examples) -add_custom_target(build-version - ${PYTHON_EXECUTABLE} - ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py -- ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} +- ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc - COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).") -- + function(define_pkg_config_file NAME LIBS) add_custom_target(${NAME}-pkg-config ALL - COMMAND ${CMAKE_COMMAND} diff --git a/0001-Fix-SPIRV-includes-location.patch b/0001-Fix-SPIRV-includes-location.patch new file mode 100644 index 0000000..1b9307f --- /dev/null +++ b/0001-Fix-SPIRV-includes-location.patch @@ -0,0 +1,73 @@ +From eb3e5917134ec42590e6a27dea7b75b870b22d38 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= +Date: Sun, 2 Feb 2020 23:03:53 +0100 +Subject: [PATCH] Fix SPIRV includes location +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +SPIRV includes have been moved under glslang/ in the latest version. + +Signed-off-by: Robert-André Mauchin +--- + libshaderc/src/shaderc.cc | 2 +- + libshaderc/src/shaderc_cpp_test.cc | 2 +- + libshaderc/src/shaderc_test.cc | 2 +- + libshaderc_util/src/compiler.cc | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc +index fe57c76..82c47ef 100644 +--- a/libshaderc/src/shaderc.cc ++++ b/libshaderc/src/shaderc.cc +@@ -20,7 +20,7 @@ + #include + #include + +-#include "SPIRV/spirv.hpp" ++#include "glslang/SPIRV/spirv.hpp" + + #include "libshaderc_util/compiler.h" + #include "libshaderc_util/counting_includer.h" +diff --git a/libshaderc/src/shaderc_cpp_test.cc b/libshaderc/src/shaderc_cpp_test.cc +index 407d8f4..addb347 100644 +--- a/libshaderc/src/shaderc_cpp_test.cc ++++ b/libshaderc/src/shaderc_cpp_test.cc +@@ -18,7 +18,7 @@ + #include + #include + +-#include "SPIRV/spirv.hpp" ++#include "glslang/SPIRV/spirv.hpp" + #include "spirv-tools/libspirv.hpp" + + #include "common_shaders_for_test.h" +diff --git a/libshaderc/src/shaderc_test.cc b/libshaderc/src/shaderc_test.cc +index a54b87c..cab5224 100644 +--- a/libshaderc/src/shaderc_test.cc ++++ b/libshaderc/src/shaderc_test.cc +@@ -18,7 +18,7 @@ + #include + #include + +-#include "SPIRV/spirv.hpp" ++#include "glslang/SPIRV/spirv.hpp" + + #include "common_shaders_for_test.h" + #include "shaderc/shaderc.h" +diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc +index 1809eab..a485b12 100644 +--- a/libshaderc_util/src/compiler.cc ++++ b/libshaderc_util/src/compiler.cc +@@ -19,7 +19,7 @@ + #include + #include + +-#include "SPIRV/GlslangToSpv.h" ++#include "glslang/SPIRV/GlslangToSpv.h" + #include "libshaderc_util/format.h" + #include "libshaderc_util/io.h" + #include "libshaderc_util/message.h" +-- +2.24.1 + diff --git a/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch b/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch index ad7de1f..d243144 100644 --- a/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch +++ b/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch @@ -31,7 +31,7 @@ diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt index 873540a..6d0c465 100644 --- a/libshaderc_util/CMakeLists.txt +++ b/libshaderc_util/CMakeLists.txt -@@ -34,8 +34,8 @@ endif(SHADERC_ENABLE_INSTALL) +@@ -32,8 +32,8 @@ add_definitions(-DENABLE_HLSL) find_package(Threads) target_link_libraries(shaderc_util PRIVATE diff --git a/0001-Handle-new-Glslang-profile-enum-in-switch.patch b/0001-Handle-new-Glslang-profile-enum-in-switch.patch new file mode 100644 index 0000000..4400bac --- /dev/null +++ b/0001-Handle-new-Glslang-profile-enum-in-switch.patch @@ -0,0 +1,22 @@ +From 3d99fad173cc0c00d370eeb6663784fc67efd480 Mon Sep 17 00:00:00 2001 +From: David Neto +Date: Fri, 24 Jan 2020 15:41:21 -0500 +Subject: [PATCH] Handle new Glslang profile enum in switch (#973) + +* Handle new Glslang profile enum in switch +--- + libshaderc/src/shaderc.cc | 1 + + 1 files changed, 1 insertions(+), 0 deletion(-) + +diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc +index abbab548..fe57c76b 100644 +--- a/libshaderc/src/shaderc.cc ++++ b/libshaderc/src/shaderc.cc +@@ -779,6 +779,7 @@ bool shaderc_parse_version_profile(const char* str, int* version, + *profile = shaderc_profile_none; + return true; + case EBadProfile: ++ case EProfileCount: + return false; + } + diff --git a/shaderc.spec b/shaderc.spec index c670c2d..e8fd0c0 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,16 +1,16 @@ -# Release 2019.0 -%global commit 34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4 +# Release 2019.1 +%global commit f76bb2f09f858c3014b329961d836964e515095d %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20190609 -%global gitversion v2019.0 +%global snapshotdate 20200202 +%global gitversion v2019.1 # Need to keep this in sync with spirv-tools -%global spirv_commit 2297d4a3dfcbfd2a8b4312fab055ae26e3289fd3 -%global spirv_version v2019.1 +%global spirv_commit dc77030acc9c6fe7ca21fff54c5a9d7b532d7da6 +%global spirv_version v1.5.1 Name: shaderc -Version: 2019.0 -Release: 3%{?dist} +Version: 2019.1 +Release: 1%{?dist} Summary: A collection of tools, libraries, and tests for Vulkan shader compilation License: ASL 2.0 @@ -21,6 +21,10 @@ Source0: %url/archive/%{commit}/%{name}-%{shortcommit}.tar.gz Patch0: https://patch-diff.githubusercontent.com/raw/google/shaderc/pull/463.patch#/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch # Patch to unbundle 3rd party code Patch1: 0001-Drop-third-party-code-in-CMakeLists.txt.patch +# SPIRV includes have been moved under glslang/ in the latest version. +Patch2: 0001-Fix-SPIRV-includes-location.patch +# Handle new Glslang profile enum in switch +Patch3: 0001-Handle-new-Glslang-profile-enum-in-switch.patch BuildRequires: cmake3 BuildRequires: gcc-c++ @@ -42,21 +46,18 @@ Shaderc aims to to provide: operating systems - increased functionality such as file #include support - %package -n glslc Summary: A command line compiler for GLSL/HLSL to SPIR-V %description -n glslc A command line compiler for GLSL/HLSL to SPIR-V. - %package -n libshaderc Summary: A library for compiling shader strings into SPIR-V %description -n libshaderc A library for compiling shader strings into SPIR-V. - %package -n libshaderc-devel Summary: Development files for libshaderc Requires: libshaderc%{?_isa} = %{version}-%{release} @@ -66,7 +67,6 @@ A library for compiling shader strings into SPIR-V. Development files for libshaderc. - %package -n libshaderc-static Summary: A library for compiling shader strings into SPIR-V (static libraries) @@ -75,7 +75,6 @@ A library for compiling shader strings into SPIR-V. Static libraries for libshaderc. - %prep %autosetup -p1 -n %{name}-%{commit} @@ -90,7 +89,6 @@ echo \"spirv-tools $(grep -m1 -o '^v[[:digit:]]\{4\}\.[[:digit:]]\(-dev\)\?' /us >> glslc/src/build-version.inc echo \"glslang \'\'\" >> glslc/src/build-version.inc - %build mkdir %_target_platform cd %_target_platform @@ -103,33 +101,27 @@ cd %_target_platform -GNinja .. %ninja_build - %install %ninja_install -C %_target_platform - %check ctest -V - %files -n glslc %doc glslc/README.asciidoc %license LICENSE %{_bindir}/glslc - %files -n libshaderc %doc AUTHORS CHANGES CONTRIBUTORS README.md %license LICENSE %{_libdir}/libshaderc_shared.so.1* - %files -n libshaderc-devel %{_includedir}/%{name}/ %{_libdir}/libshaderc_shared.so %{_libdir}/pkgconfig/shaderc.pc - %files -n libshaderc-static %license LICENSE %{_libdir}/libshaderc.a @@ -137,9 +129,10 @@ ctest -V %{_libdir}/pkgconfig/shaderc_static.pc %{_libdir}/pkgconfig/shaderc_combined.pc - - %changelog +* Sun Feb 02 20:53:01 CET 2020 Robert-André Mauchin - 2019.1-1 +- Update to 2019.1 + * Thu Jan 30 2020 Fedora Release Engineering - 2019.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 1728654..27dc491 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shaderc-34c412f.tar.gz) = bbc17c350e094230c53b22f80eef95d9dfac3716d3653764862fffe210f3d0fbaa60f204c9aa93e91390f60b4a8a5f153d940ba1e450eff89ff53b587f295ce7 +SHA512 (shaderc-f76bb2f.tar.gz) = 50a4385056e59cf28c9422edf77604aa2f770d9c68d2779751ccd62b666dbdf5ac67782b820e843bb1986ca96907222f9935bebc7b39dffb4543e4775508e33d From 180856cf7dec74a2cba8130aededc8deb90c20b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Wed, 17 Jun 2020 21:21:06 +0200 Subject: [PATCH 05/55] Update to 2020.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- .gitignore | 1 + 0001-Fix-SPIRV-includes-location.patch | 73 ------ ...e-new-Glslang-profile-enum-in-switch.patch | 22 -- ...ling-5-dependencies-and-fixing-build.patch | 25 ++ CHANGES | 223 ++++++++++++++++++ shaderc.spec | 32 +-- sources | 2 +- 7 files changed, 267 insertions(+), 111 deletions(-) delete mode 100644 0001-Fix-SPIRV-includes-location.patch delete mode 100644 0001-Handle-new-Glslang-profile-enum-in-switch.patch create mode 100644 0001-Rolling-5-dependencies-and-fixing-build.patch create mode 100644 CHANGES diff --git a/.gitignore b/.gitignore index 91cbb3d..2a1cdce 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /shaderc-7d8582b.tar.gz /shaderc-34c412f.tar.gz /shaderc-f76bb2f.tar.gz +/shaderc-7c2aa93.tar.gz diff --git a/0001-Fix-SPIRV-includes-location.patch b/0001-Fix-SPIRV-includes-location.patch deleted file mode 100644 index 1b9307f..0000000 --- a/0001-Fix-SPIRV-includes-location.patch +++ /dev/null @@ -1,73 +0,0 @@ -From eb3e5917134ec42590e6a27dea7b75b870b22d38 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= -Date: Sun, 2 Feb 2020 23:03:53 +0100 -Subject: [PATCH] Fix SPIRV includes location -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -SPIRV includes have been moved under glslang/ in the latest version. - -Signed-off-by: Robert-André Mauchin ---- - libshaderc/src/shaderc.cc | 2 +- - libshaderc/src/shaderc_cpp_test.cc | 2 +- - libshaderc/src/shaderc_test.cc | 2 +- - libshaderc_util/src/compiler.cc | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc -index fe57c76..82c47ef 100644 ---- a/libshaderc/src/shaderc.cc -+++ b/libshaderc/src/shaderc.cc -@@ -20,7 +20,7 @@ - #include - #include - --#include "SPIRV/spirv.hpp" -+#include "glslang/SPIRV/spirv.hpp" - - #include "libshaderc_util/compiler.h" - #include "libshaderc_util/counting_includer.h" -diff --git a/libshaderc/src/shaderc_cpp_test.cc b/libshaderc/src/shaderc_cpp_test.cc -index 407d8f4..addb347 100644 ---- a/libshaderc/src/shaderc_cpp_test.cc -+++ b/libshaderc/src/shaderc_cpp_test.cc -@@ -18,7 +18,7 @@ - #include - #include - --#include "SPIRV/spirv.hpp" -+#include "glslang/SPIRV/spirv.hpp" - #include "spirv-tools/libspirv.hpp" - - #include "common_shaders_for_test.h" -diff --git a/libshaderc/src/shaderc_test.cc b/libshaderc/src/shaderc_test.cc -index a54b87c..cab5224 100644 ---- a/libshaderc/src/shaderc_test.cc -+++ b/libshaderc/src/shaderc_test.cc -@@ -18,7 +18,7 @@ - #include - #include - --#include "SPIRV/spirv.hpp" -+#include "glslang/SPIRV/spirv.hpp" - - #include "common_shaders_for_test.h" - #include "shaderc/shaderc.h" -diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc -index 1809eab..a485b12 100644 ---- a/libshaderc_util/src/compiler.cc -+++ b/libshaderc_util/src/compiler.cc -@@ -19,7 +19,7 @@ - #include - #include - --#include "SPIRV/GlslangToSpv.h" -+#include "glslang/SPIRV/GlslangToSpv.h" - #include "libshaderc_util/format.h" - #include "libshaderc_util/io.h" - #include "libshaderc_util/message.h" --- -2.24.1 - diff --git a/0001-Handle-new-Glslang-profile-enum-in-switch.patch b/0001-Handle-new-Glslang-profile-enum-in-switch.patch deleted file mode 100644 index 4400bac..0000000 --- a/0001-Handle-new-Glslang-profile-enum-in-switch.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 3d99fad173cc0c00d370eeb6663784fc67efd480 Mon Sep 17 00:00:00 2001 -From: David Neto -Date: Fri, 24 Jan 2020 15:41:21 -0500 -Subject: [PATCH] Handle new Glslang profile enum in switch (#973) - -* Handle new Glslang profile enum in switch ---- - libshaderc/src/shaderc.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletion(-) - -diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc -index abbab548..fe57c76b 100644 ---- a/libshaderc/src/shaderc.cc -+++ b/libshaderc/src/shaderc.cc -@@ -779,6 +779,7 @@ bool shaderc_parse_version_profile(const char* str, int* version, - *profile = shaderc_profile_none; - return true; - case EBadProfile: -+ case EProfileCount: - return false; - } - diff --git a/0001-Rolling-5-dependencies-and-fixing-build.patch b/0001-Rolling-5-dependencies-and-fixing-build.patch new file mode 100644 index 0000000..9c68d57 --- /dev/null +++ b/0001-Rolling-5-dependencies-and-fixing-build.patch @@ -0,0 +1,25 @@ +From e27b4381be1af80b4cadd74b7357a1895721121a Mon Sep 17 00:00:00 2001 +From: Ryan Harrison +Date: Mon, 4 May 2020 14:17:34 -0400 +Subject: [PATCH] Rolling 5 dependencies and fixing build + +Roll third_party/glslang/ f03cb290a..b5f003d7a (7 commits) + +Fixes #1056 +--- + libshaderc_util/src/resources.cc | 2 +- + 2 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/libshaderc_util/src/resources.cc b/libshaderc_util/src/resources.cc +index 458a63f5..d64e47fa 100644 +--- a/libshaderc_util/src/resources.cc ++++ b/libshaderc_util/src/resources.cc +@@ -125,7 +125,7 @@ const TBuiltInResource kDefaultTBuiltInR + /* .maxTaskWorkGroupSizeY_NV = */ 1, + /* .maxTaskWorkGroupSizeZ_NV = */ 1, + /* .maxMeshViewCountNV = */ 4, +- /* .maxDualSourceDrawBuffersEXT = */ 1, ++ + // This is the glslang TLimits structure. + // It defines whether or not the following features are enabled. + // We want them to all be enabled. diff --git a/CHANGES b/CHANGES new file mode 100644 index 0000000..ff3ef43 --- /dev/null +++ b/CHANGES @@ -0,0 +1,223 @@ +Revision history for Shaderc + +v2020.1 2020-06-09 + This is the last version that officially supports VS2013. + + - General: + - Added warning signs about unsupported downloads (#1041) + - Added .NET bindings to README.md (#1060) + - Only add -fPIC if supported by the compiler. (#1061) + + - glslc, libshaderc: + - Removed Singleton pattern around access to glslang (#1059) + + - spvc: + - Added concept of comparison sampler to API (#1036) + - Added support for options.hlsl.nonwritable_uav_texture_as_srv (#1048) + - Support forcing storage buffers to be always declared as UAV. (#1076) + +v2020.0 2020-03-06 + - General: + - Getting spirv.hpp from SPIRV-Headers instead of not glslang (#992) + - Added clarification about status of artifacts in downloads.md (#1012) + + - glslc, libshaderc: + - Added support for new Glslang profile enum, EProfileCount (#973) + - Updated user documentation for -S in glslc (#978) + - Add documentation for Vulkan 1.2 and SPIR-V 1.5 (#980) + - Removed NV_EXTENSIONS conditionals (#1003) + - Added support for generating WebGPU SPIR-V to libshaderc (#1021) + - Rolled in all DEPS for provisional SPIR-V extensions for raytracing + + - spvc: + - Normalized API behaviour (#967) + - Added source_set target for libshaderc_spvc (#976) + - Added in support for spvc logging to the terminal (#981) + - Internal refactoring to reduce boiler plate in API implementations (#984) + - Added newline to logging messages to make them readable (#985) + - Added reflection support for Dawn: + - storage textures (#1001) + - storage texture format (#1005) + - texture dimension for storage textures (#1008) + - is storage texture declared as multisampled texture (#1011) + - Converted compile options to require explicit environments (#1019) + - Added knob to control force_zero_initialized_variables in SPIRV-Cross (#1028) + +v2019.1 2020-01-22 + - glslc, libshaderc: + - Add -fnan-clamp: Generate code for max and min builtins so that, + given a NaN operand, will return the other operand. Similarly, the + clamp builtin favours non-NaN operands, as if clamp was implemented + as the composition of max and min. + - Add -finvert-y + - Using SetBeforeHlslLegalization for more relaxed validation rules + - Added support for SPIR-V 1.5 + - Add --emit-line-directive option + - Added support for Vulkan 1.2 + - spvc: + - Add many options: + --flatten-multidimensional-arrays + --es + --no-es + --glsl-emit-push-constant-as-ubo + --msl-swizzle-texture-samples + --msl-platform=ios|macos + --msl-pad-fragment-output + --msl-capture-output + --msl-domain-lower-left + --msl-argument-buffers + --msl-discrete-descriptor-set= + --hlsl-enable-compat + - Reintroduce shaderc_spvc_compile_options_set_shader_model + - Added option to inject robust buffer access code + - Added support for emitting ToVulkan shaders + - Added spirv-opt based IR generation as alternative to built in spirv_cross IR gen + - Added API for specifying source and target execution environments + - Added option & reflection API methods neede by Dawn + - Substantial internal refactoring and code cleanup + - Large number of breaking changes to the API + - Replaced shaderc_spvc_compile_options_set_shader_model with + shaderc_spvc_compile_options_set_hlsl_shader_model + - Compiler initialization and shader generation moved into seperate calls + - Seperated return codes from shaderc ones + - Many small API changes + - Improvements to testing + - Refactoring and clean up of run_spirv_cross_tests.py + - Seperation of expectations into known failures, known invalids, and cases + that need investigation + - Tweaks and fixes to substantially increase passing cases + - Added support for running tests using spvc IR generation + - Infrastructure + - Update DEPS with cross-verified commits from associated repos. + - Add utils/roll-deps + - Infrastructure: + - Removed Appveyor artifacts link + - Improvements and clean up of DEPS rolling scripts + - Enabled warnings about implicit fallthrough + - Enabled improper semicolon warnings + - Restricted -fPIC to platforms that support it + - Converted remaining scripts to use Python 3 + - Replaced nosetest with unittest + - Removed assumptions aabout location of spirv-tools, effcee, and RE2 + - Migrated BUILD.gn spirv_cross dependency to local repo + - Fixes: + - Fix duplicate install paths when using VisualStudio + - Fixed BUILD.gn for Chromium, Dawn & Fuchsia + - Explicitly enabled HLSL support in glslang + - Added installing necessary headers in Android.mk + - Removed unsupported Unicode characters + - Fixed detection of spirv-headers directory + #666: Update Docker file to use Python3 + +v2019.0 2019-06-04 + - Add optional spvc, libshaderc_spvc as wrapper around SPIRV-Cross: + - Rejects bad modules by running the SPIR-V validator first + - Skips exception-heavy SPIRV-Cross SPIR-V parser + - Support NV extensions for shader stages + - Require SPIRV-Tools and SPIRV-Headers with SPIR-V 1.4 support + Build support: + - Use KhronosGroup/glslang instead of google/glslang + - Stop running tests on VS 2013 (googletest no longer supports VS2013) + - Require Python3 for building + - Support Chromium's GN build system + - Kokoro build fixes + - Cmake build fixes: Only build subdirs if those targets are not yet defined + - Use Android.mk from Glslang + - Dockerfile gets re2 and effcee sources + - Fixes for newer googletest + - Add address sanitizer presubmit bot + - Generate config files for pkg-config + Spvc: + - Add option to specify source environment. Spvc will transform from source + to target environment if they are different. This only works for WebGPU0 + and Vulkan 1.1. + Fixes: + #499: In HLSL compilation, relax layout and logical pointer validation rules + prior to running the legalization recipe. + +v2018.0 2018-10-01 + - Support -fhlsl_functionality1 (also -fhlsl-functionality1) + - Support NVIDIA Turing extensions. Requires updated Glslang and SPIRV-Tools. + - Use SPIR-V optimization and HLSL legalization recipes from SPIRV-Tools. + - Pass target environment into SPIRV-Tools code, e.g. from --target-env vulkan1.1 + - Add SONAME=1 property to shared library + - Support GN build for Chromium + Fixes: + #469: Add virtual dtor to classes with virtual functions. + #457: Fix writing SPIR-V binaries to standard output on Windows. + +v2017.2 2018-02-27 + - Add a shared library version of libshaderc + - Support GLSL 4.6 and ESSL 3.2 + - Fail compilation if a resource does not have a binding. + - Add options for automatically setting bindings for (uniform) resources that + don't have bindings set in shader source. + - Add options for automatically setting locations for pipline inputs and outputs. + - Add option for using HLSL IO mappings as expressed in source. + - Add options for setting resource binding base numbers. + - Add option to use HLSL resource register numbers for bindings. + - HLSL compilation now defaults to HLSL packing rules. + (This change is inherited from Glslang commit 7cca140.) + - HLSL compilation runs SPIR-V "legalization" transforms to reduce + manipulation of opaque handles (e.g. images), to satisfy Vulkan rules. + - Adapt to Glslang generator version numbers: + - To 2: a fix for code generation for atomicCounterDecrement. + - To 3: change memory barrier semantics masks + - To 4: generate more access chains for swizzles + - CMake install rules uses GNUInstallDirs. For example, install to lib64 + when that is the norm for the target system. + +v2017.1 2017-03-10 + - Add option to automatically assign bindings to uniform variables + that don't have an explicit 'binding' layout in the shader source. + - Enable NVIDIA extensions by default in GLSL compilation + - README mentions language bindings provided by 3rd parties. + - README describes the known-good branch on GitHub + - Fixed examples in shaderc.h; added C API use to examples/online-compile + - Fixes issues: + #289: Don't output an object file when compilation fails. + #296: Enable use of the CMake in Android Studio. + +v2016.2 2016-12-13 + - Describe Shaderc's level of stability. + - Support HLSL compilation, exposing functionality in Glslang. + - Supported in C, C++ API + - glslc accepts "-x hlsl", and assumes .hlsl files are HLSL. + - glslc accepts "-fentry-point=" to set entry point name, + overriding default value "main". + - Support setting shader resource limits in C, C++ APIs, and in + glslc + - glslc adds -flimit= + - glslc adds --show-limits to display defaults and valid resource + limit syntax. + - glslc adds "-flimit-file " support to read Glslang resource + configuration files, i.e. the output of "glslangValidator -c". + - Enable AMD extensions by default in GLSL compilation + - Fixes issues: + #281: Work around Android build issue with abspath on Windows + #283: Increase default maxDrawBuffers to 4, to match Vulkan/GLES3.0 + +v2016.1 2016-10-12 + - C API for assembling now takes an options object + - Support compilation options to optimize for size. + - Maintain compatibility with recent SPIRV-Tools and Glslang versions. + - Update examples. + - Build cleanups. + - Fixes issues: + #238: Fix invocation of python scripts during build + +v2016.0 2016-07-07 + + - Adds v. versioning, with "-dev" suffix to indicate work in + progress. The intent is to summarize and report functionalities more easily + for incorporating into downstream projects. + + - Summary of functionalities (See the README.md for more details): + - Provides libraries and command line tools for generating SPIR-V modules + - Supports GLSL source code or SPIR-V assembly as input + - Supports SPIR-V binary or assembly text as output + - Command line options follow GCC/Clang conventions + - Supports various semantics (OpenGL, OpenGL Compatible and Vulkan) + - Supports #include + - Supports user-defined macros + - Supports dependency information dumping diff --git a/shaderc.spec b/shaderc.spec index e8fd0c0..528e7a5 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,15 +1,13 @@ -# Release 2019.1 -%global commit f76bb2f09f858c3014b329961d836964e515095d +# Release 2020.1 +%global commit 7c2aa93903558f017f31b35df163bce5fe849f45 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20200202 -%global gitversion v2019.1 +%global snapshotdate 20200617 -# Need to keep this in sync with spirv-tools -%global spirv_commit dc77030acc9c6fe7ca21fff54c5a9d7b532d7da6 -%global spirv_version v1.5.1 +# Glslang revision from packaged version +%global glslang_version SDK-candidate-2-11-gc9b28b9f Name: shaderc -Version: 2019.1 +Version: 2020.1 Release: 1%{?dist} Summary: A collection of tools, libraries, and tests for Vulkan shader compilation @@ -21,10 +19,8 @@ Source0: %url/archive/%{commit}/%{name}-%{shortcommit}.tar.gz Patch0: https://patch-diff.githubusercontent.com/raw/google/shaderc/pull/463.patch#/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch # Patch to unbundle 3rd party code Patch1: 0001-Drop-third-party-code-in-CMakeLists.txt.patch -# SPIRV includes have been moved under glslang/ in the latest version. -Patch2: 0001-Fix-SPIRV-includes-location.patch -# Handle new Glslang profile enum in switch -Patch3: 0001-Handle-new-Glslang-profile-enum-in-switch.patch +# Fix bug in latest version (to drop in next version) +Patch2: 0001-Rolling-5-dependencies-and-fixing-build.patch BuildRequires: cmake3 BuildRequires: gcc-c++ @@ -83,11 +79,14 @@ rm -rf third_party # Stolen from Gentoo # Create build-version.inc since we want to use our packaged # SPIRV-Tools and glslang -echo \"shaderc $(grep -m1 -o '^v[[:digit:]]\{4\}\.[[:digit:]]\(-dev\)\?' CHANGES) %{gitversion}\" \ +echo \"shaderc $(grep -m1 -o '^v[[:digit:]]\{4\}\.[[:digit:]]\(-dev\)\? [[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}$' CHANGES)\" \ > glslc/src/build-version.inc -echo \"spirv-tools $(grep -m1 -o '^v[[:digit:]]\{4\}\.[[:digit:]]\(-dev\)\?' /usr/share/doc/spirv-tools/CHANGES) %{spirv_version}\" \ +echo \"spirv-tools $(grep -m1 -o '^v[[:digit:]]\{4\}\.[[:digit:]]\(-dev\)\? [[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}$' /usr/share/doc/spirv-tools/CHANGES)\" \ >> glslc/src/build-version.inc -echo \"glslang \'\'\" >> glslc/src/build-version.inc +echo \"glslang %{glslang_version}\" >> glslc/src/build-version.inc + +# Point to correct include +sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/src/compiler.cc %build mkdir %_target_platform @@ -130,6 +129,9 @@ ctest -V %{_libdir}/pkgconfig/shaderc_combined.pc %changelog +* Wed Jun 17 20:15:27 CEST 2020 Robert-André Mauchin - 2020.1-1 +- Update to 2020.1 + * Sun Feb 02 20:53:01 CET 2020 Robert-André Mauchin - 2019.1-1 - Update to 2019.1 diff --git a/sources b/sources index 27dc491..2f94e46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shaderc-f76bb2f.tar.gz) = 50a4385056e59cf28c9422edf77604aa2f770d9c68d2779751ccd62b666dbdf5ac67782b820e843bb1986ca96907222f9935bebc7b39dffb4543e4775508e33d +SHA512 (shaderc-7c2aa93.tar.gz) = 4ec9a88e3790c3d3482a35111019d12d4d15a4b77c715f0659e52d35872f4a05fbd3182dd573b0c198e483548c4b08a98da5bc28427438fc4a67942da0452702 From 268e1560c368a061605c6f41e3109f715791cc6c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 10:37:34 +0000 Subject: [PATCH 06/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shaderc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shaderc.spec b/shaderc.spec index 528e7a5..13d6582 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -8,7 +8,7 @@ Name: shaderc Version: 2020.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A collection of tools, libraries, and tests for Vulkan shader compilation License: ASL 2.0 @@ -129,6 +129,9 @@ ctest -V %{_libdir}/pkgconfig/shaderc_combined.pc %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2020.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jun 17 20:15:27 CEST 2020 Robert-André Mauchin - 2020.1-1 - Update to 2020.1 From fac86748827a32bd742c99e7c6f242c6c29d5d2e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:02:43 +0000 Subject: [PATCH 07/55] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shaderc.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/shaderc.spec b/shaderc.spec index 13d6582..cdc204e 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -8,7 +8,7 @@ Name: shaderc Version: 2020.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A collection of tools, libraries, and tests for Vulkan shader compilation License: ASL 2.0 @@ -129,6 +129,10 @@ ctest -V %{_libdir}/pkgconfig/shaderc_combined.pc %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 2020.1-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 2020.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From dcdcb8c38aa110b78cbc6df27af94f6185e06b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 8 Aug 2020 17:10:01 +0200 Subject: [PATCH 08/55] Fix cmake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- .gitignore | 1 + ...ling-5-dependencies-and-fixing-build.patch | 25 ------------------- shaderc.spec | 19 +++++++------- 3 files changed, 10 insertions(+), 35 deletions(-) delete mode 100644 0001-Rolling-5-dependencies-and-fixing-build.patch diff --git a/.gitignore b/.gitignore index 2a1cdce..e49bb4b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /shaderc-34c412f.tar.gz /shaderc-f76bb2f.tar.gz /shaderc-7c2aa93.tar.gz +/shaderc-4162bb1.tar.gz diff --git a/0001-Rolling-5-dependencies-and-fixing-build.patch b/0001-Rolling-5-dependencies-and-fixing-build.patch deleted file mode 100644 index 9c68d57..0000000 --- a/0001-Rolling-5-dependencies-and-fixing-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e27b4381be1af80b4cadd74b7357a1895721121a Mon Sep 17 00:00:00 2001 -From: Ryan Harrison -Date: Mon, 4 May 2020 14:17:34 -0400 -Subject: [PATCH] Rolling 5 dependencies and fixing build - -Roll third_party/glslang/ f03cb290a..b5f003d7a (7 commits) - -Fixes #1056 ---- - libshaderc_util/src/resources.cc | 2 +- - 2 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/libshaderc_util/src/resources.cc b/libshaderc_util/src/resources.cc -index 458a63f5..d64e47fa 100644 ---- a/libshaderc_util/src/resources.cc -+++ b/libshaderc_util/src/resources.cc -@@ -125,7 +125,7 @@ const TBuiltInResource kDefaultTBuiltInR - /* .maxTaskWorkGroupSizeY_NV = */ 1, - /* .maxTaskWorkGroupSizeZ_NV = */ 1, - /* .maxMeshViewCountNV = */ 4, -- /* .maxDualSourceDrawBuffersEXT = */ 1, -+ - // This is the glslang TLimits structure. - // It defines whether or not the following features are enabled. - // We want them to all be enabled. diff --git a/shaderc.spec b/shaderc.spec index cdc204e..2bfc8f2 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,14 +1,17 @@ +# Force out of source build +%undefine __cmake_in_source_build + # Release 2020.1 %global commit 7c2aa93903558f017f31b35df163bce5fe849f45 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20200617 +%global snapshotdate 20200808 # Glslang revision from packaged version %global glslang_version SDK-candidate-2-11-gc9b28b9f Name: shaderc Version: 2020.1 -Release: 3%{?dist} +Release: 1%{?dist} Summary: A collection of tools, libraries, and tests for Vulkan shader compilation License: ASL 2.0 @@ -16,11 +19,9 @@ URL: https://github.com/google/shaderc Source0: %url/archive/%{commit}/%{name}-%{shortcommit}.tar.gz # https://github.com/google/shaderc/pull/463 -Patch0: https://patch-diff.githubusercontent.com/raw/google/shaderc/pull/463.patch#/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch +Patch0: 0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch # Patch to unbundle 3rd party code Patch1: 0001-Drop-third-party-code-in-CMakeLists.txt.patch -# Fix bug in latest version (to drop in next version) -Patch2: 0001-Rolling-5-dependencies-and-fixing-build.patch BuildRequires: cmake3 BuildRequires: gcc-c++ @@ -89,19 +90,17 @@ echo \"glslang %{glslang_version}\" >> glslc/src/build-version.inc sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/src/compiler.cc %build -mkdir %_target_platform -cd %_target_platform # We disable the tests because they don't work with our unbundling of 3rd party. # See https://github.com/google/shaderc/issues/470 %cmake3 -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_SKIP_RPATH=True \ -DSHADERC_SKIP_TESTS=True \ -DPYTHON_EXE=%{__python3} \ - -GNinja .. -%ninja_build + -GNinja +%cmake3_build %install -%ninja_install -C %_target_platform +%cmake3_install %check ctest -V From d9cd5063158ebcae919143f49ad1e13bcbb1a0a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 8 Aug 2020 23:59:51 +0200 Subject: [PATCH 09/55] Update to 2020.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- ...p-third-party-code-in-CMakeLists.txt.patch | 10 +++-- ...link-order-of-libglslang-and-libHLSL.patch | 44 ------------------- shaderc.spec | 14 +++--- sources | 2 +- 4 files changed, 14 insertions(+), 56 deletions(-) delete mode 100644 0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch diff --git a/0001-Drop-third-party-code-in-CMakeLists.txt.patch b/0001-Drop-third-party-code-in-CMakeLists.txt.patch index 189afe1..541bcc0 100644 --- a/0001-Drop-third-party-code-in-CMakeLists.txt.patch +++ b/0001-Drop-third-party-code-in-CMakeLists.txt.patch @@ -1,7 +1,7 @@ diff -up shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt --- shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig 2020-01-22 21:15:53.000000000 +0100 +++ shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt 2020-02-02 21:06:15.193583552 +0100 -@@ -92,7 +92,6 @@ endif(MSVC) +@@ -98,7 +98,6 @@ endif(MSVC) # Configure subdirectories. # We depend on these for later projects, so they should come first. @@ -9,10 +9,12 @@ diff -up shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig sh if(SHADERC_ENABLE_SPVC) add_subdirectory(libshaderc_spvc) -@@ -103,11 +102,6 @@ add_subdirectory(libshaderc) +@@ -107,13 +106,6 @@ endif() + add_subdirectory(libshaderc_util) + add_subdirectory(libshaderc) add_subdirectory(glslc) - add_subdirectory(examples) - +-add_subdirectory(examples) +- -add_custom_target(build-version - ${PYTHON_EXECUTABLE} - ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py diff --git a/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch b/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch deleted file mode 100644 index d243144..0000000 --- a/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 21c8be385b3fab5edcb934a6d99f69fd389c4e67 Mon Sep 17 00:00:00 2001 -From: Niklas Haas -Date: Tue, 29 May 2018 07:34:00 +0200 -Subject: [PATCH] Fix the link order of libglslang and libHLSL - -libglslang depends on libHLSL, so the latter needs to be specified last. -This fixes an issue when trying to build shaderc against system-wide -versions of libglslang/libHLSL, rather than the in-tree versions from -third_party. - -Additionally, libshaderc_util also depends on SPIRV-Tools ---- - glslc/CMakeLists.txt | 2 +- - libshaderc_util/CMakeLists.txt | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt -index acf6fb0..0f5d888 100644 ---- a/glslc/CMakeLists.txt -+++ b/glslc/CMakeLists.txt -@@ -18,7 +18,7 @@ add_library(glslc STATIC - shaderc_default_compile_options(glslc) - target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR}) - target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler -- HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT}) -+ glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT}) - target_link_libraries(glslc PRIVATE shaderc_util shaderc) - - add_executable(glslc_exe src/main.cc) -diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt -index 873540a..6d0c465 100644 ---- a/libshaderc_util/CMakeLists.txt -+++ b/libshaderc_util/CMakeLists.txt -@@ -32,8 +32,8 @@ add_definitions(-DENABLE_HLSL) - - find_package(Threads) - target_link_libraries(shaderc_util PRIVATE -- glslang OSDependent OGLCompiler HLSL glslang SPIRV -- SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) -+ glslang OSDependent OGLCompiler glslang HLSL SPIRV -+ SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT}) - - shaderc_add_tests( - TEST_PREFIX shaderc_util diff --git a/shaderc.spec b/shaderc.spec index 2bfc8f2..9e50134 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,8 +1,8 @@ # Force out of source build %undefine __cmake_in_source_build -# Release 2020.1 -%global commit 7c2aa93903558f017f31b35df163bce5fe849f45 +# Release 2020.2 +%global commit 4162bb13b426dab68ebe411ea7ef05f6343bea95 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global snapshotdate 20200808 @@ -10,16 +10,13 @@ %global glslang_version SDK-candidate-2-11-gc9b28b9f Name: shaderc -Version: 2020.1 +Version: 2020.2 Release: 1%{?dist} Summary: A collection of tools, libraries, and tests for Vulkan shader compilation License: ASL 2.0 URL: https://github.com/google/shaderc Source0: %url/archive/%{commit}/%{name}-%{shortcommit}.tar.gz - -# https://github.com/google/shaderc/pull/463 -Patch0: 0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch # Patch to unbundle 3rd party code Patch1: 0001-Drop-third-party-code-in-CMakeLists.txt.patch @@ -103,7 +100,7 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr %cmake3_install %check -ctest -V +%ctest3 %files -n glslc %doc glslc/README.asciidoc @@ -128,6 +125,9 @@ ctest -V %{_libdir}/pkgconfig/shaderc_combined.pc %changelog +* Sat Aug 08 19:00:03 CEST 2020 Robert-André Mauchin - 2020.2-1 +- Update to 2020.2 + * Sat Aug 01 2020 Fedora Release Engineering - 2020.1-3 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 2f94e46..b28928c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shaderc-7c2aa93.tar.gz) = 4ec9a88e3790c3d3482a35111019d12d4d15a4b77c715f0659e52d35872f4a05fbd3182dd573b0c198e483548c4b08a98da5bc28427438fc4a67942da0452702 +SHA512 (shaderc-4162bb1.tar.gz) = 30be976ed1d366428eae4592a201260e2b310350c181000c2fb2099553a7bcd4f964191973bbcbe96968fd6c37c18cc4819f642938e3d772dbffc28d0abc4fe7 From 1987df224e598b69529d5c0bc21540bdb112db89 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 10 Aug 2020 15:25:15 +0100 Subject: [PATCH 10/55] Fix FTBFS with new glslang --- glslang_linker_flags.patch | 24 ++++++++++++++++++++++++ shaderc.spec | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 glslang_linker_flags.patch diff --git a/glslang_linker_flags.patch b/glslang_linker_flags.patch new file mode 100644 index 0000000..9324f21 --- /dev/null +++ b/glslang_linker_flags.patch @@ -0,0 +1,24 @@ +--- a/libshaderc_util/CMakeLists.txt ++++ b/libshaderc_util/CMakeLists.txt +@@ -47,7 +47,7 @@ + find_package(Threads) + target_link_libraries(shaderc_util PRIVATE + glslang OSDependent OGLCompiler HLSL glslang SPIRV +- SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) ++ SPIRV-Tools-opt MachineIndependent GenericCodeGen ${CMAKE_THREAD_LIBS_INIT}) + + shaderc_add_tests( + TEST_PREFIX shaderc_util + +--- a/glslc/CMakeLists.txt ++++ b/glslc/CMakeLists.txt +@@ -43,7 +43,7 @@ + endif(SHADERC_ENABLE_WGSL_OUTPUT) + + target_link_libraries(glslc PRIVATE +- glslang OSDependent OGLCompiler HLSL glslang SPIRV # Glslang libraries ++ glslang OSDependent OGLCompiler HLSL glslang SPIRV MachineIndependent GenericCodeGen # Glslang libraries + $<$:libtint> # Tint libraries, optional + shaderc_util shaderc # internal Shaderc libraries + ${CMAKE_THREAD_LIBS_INIT}) + diff --git a/shaderc.spec b/shaderc.spec index 9e50134..19a2ee2 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -19,6 +19,7 @@ URL: https://github.com/google/shaderc Source0: %url/archive/%{commit}/%{name}-%{shortcommit}.tar.gz # Patch to unbundle 3rd party code Patch1: 0001-Drop-third-party-code-in-CMakeLists.txt.patch +Patch2: glslang_linker_flags.patch BuildRequires: cmake3 BuildRequires: gcc-c++ @@ -125,7 +126,7 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr %{_libdir}/pkgconfig/shaderc_combined.pc %changelog -* Sat Aug 08 19:00:03 CEST 2020 Robert-André Mauchin - 2020.2-1 +* Sat Aug 08 2020 Robert-André Mauchin - 2020.2-1 - Update to 2020.2 * Sat Aug 01 2020 Fedora Release Engineering - 2020.1-3 From e8a095770942e8874282dc8ca1c687bcca552c6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 5 Dec 2020 14:22:45 +0100 Subject: [PATCH 11/55] Update to 2020.3 Close: rhbz#1875183 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- .gitignore | 1 + shaderc.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e49bb4b..db66ab2 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /shaderc-f76bb2f.tar.gz /shaderc-7c2aa93.tar.gz /shaderc-4162bb1.tar.gz +/shaderc-1fce597.tar.gz diff --git a/shaderc.spec b/shaderc.spec index 19a2ee2..889b0c6 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,16 +1,16 @@ # Force out of source build %undefine __cmake_in_source_build -# Release 2020.2 -%global commit 4162bb13b426dab68ebe411ea7ef05f6343bea95 +# Release 2020.3 +%global commit 1fce59794079f90ceb091190adbbb5499acd4e95 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20200808 +%global snapshotdate 20200902 # Glslang revision from packaged version -%global glslang_version SDK-candidate-2-11-gc9b28b9f +%global glslang_version d550bebee919179c9e332a0ab28a67f8fe3ca239 Name: shaderc -Version: 2020.2 +Version: 2020.3 Release: 1%{?dist} Summary: A collection of tools, libraries, and tests for Vulkan shader compilation @@ -126,6 +126,10 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr %{_libdir}/pkgconfig/shaderc_combined.pc %changelog +* Sat Dec 05 2020 Robert-André Mauchin - 2020.3-1 +- Update to 2020.3 +- Close: rhbz#1875183 + * Sat Aug 08 2020 Robert-André Mauchin - 2020.2-1 - Update to 2020.2 diff --git a/sources b/sources index b28928c..504597e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shaderc-4162bb1.tar.gz) = 30be976ed1d366428eae4592a201260e2b310350c181000c2fb2099553a7bcd4f964191973bbcbe96968fd6c37c18cc4819f642938e3d772dbffc28d0abc4fe7 +SHA512 (shaderc-1fce597.tar.gz) = 7622bedab115645da353f63443e1ab3d3e30d4a80ac5bc0dad82019b35d41c64ec20ff8846f8611d9f6598103cb902289f25597cf54887af2c838aaa6d18726d From 8ad38eb6506ecdaf552daa9a39e58f26cceb8463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 26 Dec 2020 15:38:17 +0100 Subject: [PATCH 12/55] Update to 2020.4 Close: rhbz#1906260 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- .gitignore | 1 + 0001-Drop-third-party-code-in-CMakeLists.txt.patch | 11 ++++------- shaderc.spec | 12 ++++++++---- sources | 2 +- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index db66ab2..373df20 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /shaderc-7c2aa93.tar.gz /shaderc-4162bb1.tar.gz /shaderc-1fce597.tar.gz +/shaderc-0dbd899.tar.gz diff --git a/0001-Drop-third-party-code-in-CMakeLists.txt.patch b/0001-Drop-third-party-code-in-CMakeLists.txt.patch index 541bcc0..52697f5 100644 --- a/0001-Drop-third-party-code-in-CMakeLists.txt.patch +++ b/0001-Drop-third-party-code-in-CMakeLists.txt.patch @@ -1,15 +1,12 @@ diff -up shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt --- shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig 2020-01-22 21:15:53.000000000 +0100 +++ shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt 2020-02-02 21:06:15.193583552 +0100 -@@ -98,7 +98,6 @@ endif(MSVC) - +@@ -102,18 +102,10 @@ endif(MSVC) + # Configure subdirectories. # We depend on these for later projects, so they should come first. -add_subdirectory(third_party) - - if(SHADERC_ENABLE_SPVC) - add_subdirectory(libshaderc_spvc) -@@ -107,13 +106,6 @@ endif() + add_subdirectory(libshaderc_util) add_subdirectory(libshaderc) add_subdirectory(glslc) @@ -20,6 +17,6 @@ diff -up shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig sh - ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py - ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc - COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).") - + function(define_pkg_config_file NAME LIBS) add_custom_target(${NAME}-pkg-config ALL diff --git a/shaderc.spec b/shaderc.spec index 889b0c6..e518fb2 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,16 +1,16 @@ # Force out of source build %undefine __cmake_in_source_build -# Release 2020.3 -%global commit 1fce59794079f90ceb091190adbbb5499acd4e95 +# Release 2020.4 +%global commit 0dbd899941a43ffd55df527d65128b3b66e75c9c %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20200902 +%global snapshotdate 20201226 # Glslang revision from packaged version %global glslang_version d550bebee919179c9e332a0ab28a67f8fe3ca239 Name: shaderc -Version: 2020.3 +Version: 2020.4 Release: 1%{?dist} Summary: A collection of tools, libraries, and tests for Vulkan shader compilation @@ -126,6 +126,10 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr %{_libdir}/pkgconfig/shaderc_combined.pc %changelog +* Sat Dec 26 15:21:39 CET 2020 Robert-André Mauchin - 2020.4-1 +- Update to 2020.4 +- Close: rhbz#1906260 + * Sat Dec 05 2020 Robert-André Mauchin - 2020.3-1 - Update to 2020.3 - Close: rhbz#1875183 diff --git a/sources b/sources index 504597e..12bde10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shaderc-1fce597.tar.gz) = 7622bedab115645da353f63443e1ab3d3e30d4a80ac5bc0dad82019b35d41c64ec20ff8846f8611d9f6598103cb902289f25597cf54887af2c838aaa6d18726d +SHA512 (shaderc-0dbd899.tar.gz) = fe85aa633abaff22ae2a52af474cc45d068d018aa2821efd1e7c1016be598eb29085be1822400865826aa4d481ae0286a93c5925cc83f364070815fc1172d027 From aab6525b62f292c22aafb798e07b2eb7b35f2665 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 20:17:39 +0000 Subject: [PATCH 13/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shaderc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shaderc.spec b/shaderc.spec index e518fb2..ee1e899 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -11,7 +11,7 @@ Name: shaderc Version: 2020.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A collection of tools, libraries, and tests for Vulkan shader compilation License: ASL 2.0 @@ -126,6 +126,9 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr %{_libdir}/pkgconfig/shaderc_combined.pc %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 2020.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Dec 26 15:21:39 CET 2020 Robert-André Mauchin - 2020.4-1 - Update to 2020.4 - Close: rhbz#1906260 From 3b1492aaeff6bedab22ddfafdd47ca950d4d5c6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Fri, 5 Mar 2021 13:53:55 +0100 Subject: [PATCH 14/55] Update to 2020.5 Close: rhbz#1931006 --- .gitignore | 1 + ...op-third-party-code-in-CMakeLists.txt.patch | 18 ++++++++++-------- shaderc.spec | 14 +++++++++----- sources | 2 +- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 373df20..b33a375 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /shaderc-4162bb1.tar.gz /shaderc-1fce597.tar.gz /shaderc-0dbd899.tar.gz +/shaderc-24275a1.tar.gz diff --git a/0001-Drop-third-party-code-in-CMakeLists.txt.patch b/0001-Drop-third-party-code-in-CMakeLists.txt.patch index 52697f5..b49b925 100644 --- a/0001-Drop-third-party-code-in-CMakeLists.txt.patch +++ b/0001-Drop-third-party-code-in-CMakeLists.txt.patch @@ -1,22 +1,24 @@ -diff -up shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt ---- shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig 2020-01-22 21:15:53.000000000 +0100 -+++ shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt 2020-02-02 21:06:15.193583552 +0100 -@@ -102,18 +102,10 @@ endif(MSVC) - +diff -up shaderc-24275a11d81a6b33ef345878f8a4ef929c95a116/CMakeLists.txt.orig shaderc-24275a11d81a6b33ef345878f8a4ef929c95a116/CMakeLists.txt +--- shaderc-24275a11d81a6b33ef345878f8a4ef929c95a116/CMakeLists.txt.orig 2021-03-05 13:50:35.469018657 +0100 ++++ shaderc-24275a11d81a6b33ef345878f8a4ef929c95a116/CMakeLists.txt 2021-03-05 13:52:02.679524176 +0100 +@@ -112,20 +112,10 @@ endif(MSVC) + # Configure subdirectories. # We depend on these for later projects, so they should come first. -add_subdirectory(third_party) - + add_subdirectory(libshaderc_util) add_subdirectory(libshaderc) add_subdirectory(glslc) --add_subdirectory(examples) +-if(${SHADERC_ENABLE_EXAMPLES}) +- add_subdirectory(examples) +-endif() - -add_custom_target(build-version - ${PYTHON_EXECUTABLE} - ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py - ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc - COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).") - + function(define_pkg_config_file NAME LIBS) add_custom_target(${NAME}-pkg-config ALL diff --git a/shaderc.spec b/shaderc.spec index ee1e899..4620465 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -2,16 +2,16 @@ %undefine __cmake_in_source_build # Release 2020.4 -%global commit 0dbd899941a43ffd55df527d65128b3b66e75c9c +%global commit 24275a11d81a6b33ef345878f8a4ef929c95a116 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20201226 +%global snapshotdate 20210219 # Glslang revision from packaged version -%global glslang_version d550bebee919179c9e332a0ab28a67f8fe3ca239 +%global glslang_version c594de23cdd790d64ad5f9c8b059baae0ee2941d Name: shaderc -Version: 2020.4 -Release: 2%{?dist} +Version: 2020.5 +Release: 1%{?dist} Summary: A collection of tools, libraries, and tests for Vulkan shader compilation License: ASL 2.0 @@ -126,6 +126,10 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr %{_libdir}/pkgconfig/shaderc_combined.pc %changelog +* Fri Mar 5 13:43:44 CET 2021 Robert-André Mauchin - 2020.5-1 +- Update to 2020.5 +- Close: rhbz#1931006 + * Wed Jan 27 2021 Fedora Release Engineering - 2020.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 12bde10..156fdaf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shaderc-0dbd899.tar.gz) = fe85aa633abaff22ae2a52af474cc45d068d018aa2821efd1e7c1016be598eb29085be1822400865826aa4d481ae0286a93c5925cc83f364070815fc1172d027 +SHA512 (shaderc-24275a1.tar.gz) = 4e5cd96888c555b7337154e64fc2b690a26e3fe044c605eb542dc2ff68c2cd0cfb2e945348eb6a8d97daab2449082949c8f780407e793a671a02246fb1fb1f59 From 719bd557e2619a33996a4a941269923ee6e1fdb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Mon, 24 May 2021 16:47:19 +0200 Subject: [PATCH 15/55] Update to 2020.5 Close: rhbz#1931006 --- .gitignore | 1 + shaderc.spec | 8 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b33a375..0cbdf20 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /shaderc-1fce597.tar.gz /shaderc-0dbd899.tar.gz /shaderc-24275a1.tar.gz +/shaderc-bdd134d.tar.gz diff --git a/shaderc.spec b/shaderc.spec index 4620465..ad63694 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -2,15 +2,15 @@ %undefine __cmake_in_source_build # Release 2020.4 -%global commit 24275a11d81a6b33ef345878f8a4ef929c95a116 +%global commit bdd134d1b7eca01925c1919d2ea05fd3cd6843c7 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20210219 +%global snapshotdate 20210524 # Glslang revision from packaged version -%global glslang_version c594de23cdd790d64ad5f9c8b059baae0ee2941d +%global glslang_version 18eef33bd7a4bf5ad8c69f99cb72022608cf6e73 Name: shaderc -Version: 2020.5 +Version: 2021.0 Release: 1%{?dist} Summary: A collection of tools, libraries, and tests for Vulkan shader compilation diff --git a/sources b/sources index 156fdaf..b234da6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shaderc-24275a1.tar.gz) = 4e5cd96888c555b7337154e64fc2b690a26e3fe044c605eb542dc2ff68c2cd0cfb2e945348eb6a8d97daab2449082949c8f780407e793a671a02246fb1fb1f59 +SHA512 (shaderc-bdd134d.tar.gz) = cec230949f98589eef2532b02048e3d1b4a2c07ceff1043bfe5b30cdbd3511cdfcbb625cc115d9cfa52252b20a486e146db7e2e1944d89f9371811d64f9f675c From 350f8f9131f8f5ea40ee14dab301f1fda90629f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 30 May 2021 11:30:10 +0200 Subject: [PATCH 16/55] Update to 2021.0 Fix changelog Close: rhbz#1952332 --- shaderc.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/shaderc.spec b/shaderc.spec index ad63694..d1ee403 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -11,7 +11,7 @@ Name: shaderc Version: 2021.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A collection of tools, libraries, and tests for Vulkan shader compilation License: ASL 2.0 @@ -126,6 +126,11 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr %{_libdir}/pkgconfig/shaderc_combined.pc %changelog +* Sun May 30 11:26:42 CEST 2021 Robert-André Mauchin - 2021.0-2 +- Update to 2021.0 +- Fix changelog +- Close: rhbz#1952332 + * Fri Mar 5 13:43:44 CET 2021 Robert-André Mauchin - 2020.5-1 - Update to 2020.5 - Close: rhbz#1931006 From 5d69c02a1fab4730e5856ecc03c56c4f3edfb5ef Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 17:27:35 +0000 Subject: [PATCH 17/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- shaderc.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shaderc.spec b/shaderc.spec index d1ee403..e413b00 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -11,7 +11,7 @@ Name: shaderc Version: 2021.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A collection of tools, libraries, and tests for Vulkan shader compilation License: ASL 2.0 @@ -126,6 +126,9 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr %{_libdir}/pkgconfig/shaderc_combined.pc %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2021.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sun May 30 11:26:42 CEST 2021 Robert-André Mauchin - 2021.0-2 - Update to 2021.0 - Fix changelog From 1150544b5cc1f98f6c43b5eac55606e5b424ee0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 25 Jul 2021 17:31:36 +0200 Subject: [PATCH 18/55] Convert to rpmautospec --- changelog | 57 +++++++++++++++++++++++++++++++++++++++++++++++++ shaderc.spec | 60 ++-------------------------------------------------- 2 files changed, 59 insertions(+), 58 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..8d0f288 --- /dev/null +++ b/changelog @@ -0,0 +1,57 @@ +* Fri Jul 23 2021 Fedora Release Engineering - 2021.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sun May 30 11:26:42 CEST 2021 Robert-André Mauchin - 2021.0-2 +- Update to 2021.0 +- Fix changelog +- Close: rhbz#1952332 + +* Fri Mar 5 13:43:44 CET 2021 Robert-André Mauchin - 2020.5-1 +- Update to 2020.5 +- Close: rhbz#1931006 + +* Wed Jan 27 2021 Fedora Release Engineering - 2020.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Dec 26 15:21:39 CET 2020 Robert-André Mauchin - 2020.4-1 +- Update to 2020.4 +- Close: rhbz#1906260 + +* Sat Dec 05 2020 Robert-André Mauchin - 2020.3-1 +- Update to 2020.3 +- Close: rhbz#1875183 + +* Sat Aug 08 2020 Robert-André Mauchin - 2020.2-1 +- Update to 2020.2 + +* Sat Aug 01 2020 Fedora Release Engineering - 2020.1-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 2020.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jun 17 20:15:27 CEST 2020 Robert-André Mauchin - 2020.1-1 +- Update to 2020.1 + +* Sun Feb 02 20:53:01 CET 2020 Robert-André Mauchin - 2019.1-1 +- Update to 2019.1 + +* Thu Jan 30 2020 Fedora Release Engineering - 2019.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jul 26 2019 Fedora Release Engineering - 2019.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Jun 10 00:18:18 CEST 2019 Robert-André Mauchin - 2019.0-1 +- Release 2019.0 + +* Sat Feb 02 2019 Fedora Release Engineering - 2018.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Oct 03 2018 Robert-André Mauchin - 2018.0-1 +- Release 2018.0 + +* Mon Sep 24 2018 Robert-André Mauchin - 2017.2-1 +- Initial build + diff --git a/shaderc.spec b/shaderc.spec index e413b00..f6dd8c3 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -11,7 +11,7 @@ Name: shaderc Version: 2021.0 -Release: 3%{?dist} +Release: %autorelease Summary: A collection of tools, libraries, and tests for Vulkan shader compilation License: ASL 2.0 @@ -126,60 +126,4 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr %{_libdir}/pkgconfig/shaderc_combined.pc %changelog -* Fri Jul 23 2021 Fedora Release Engineering - 2021.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sun May 30 11:26:42 CEST 2021 Robert-André Mauchin - 2021.0-2 -- Update to 2021.0 -- Fix changelog -- Close: rhbz#1952332 - -* Fri Mar 5 13:43:44 CET 2021 Robert-André Mauchin - 2020.5-1 -- Update to 2020.5 -- Close: rhbz#1931006 - -* Wed Jan 27 2021 Fedora Release Engineering - 2020.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sat Dec 26 15:21:39 CET 2020 Robert-André Mauchin - 2020.4-1 -- Update to 2020.4 -- Close: rhbz#1906260 - -* Sat Dec 05 2020 Robert-André Mauchin - 2020.3-1 -- Update to 2020.3 -- Close: rhbz#1875183 - -* Sat Aug 08 2020 Robert-André Mauchin - 2020.2-1 -- Update to 2020.2 - -* Sat Aug 01 2020 Fedora Release Engineering - 2020.1-3 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 2020.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jun 17 20:15:27 CEST 2020 Robert-André Mauchin - 2020.1-1 -- Update to 2020.1 - -* Sun Feb 02 20:53:01 CET 2020 Robert-André Mauchin - 2019.1-1 -- Update to 2019.1 - -* Thu Jan 30 2020 Fedora Release Engineering - 2019.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jul 26 2019 Fedora Release Engineering - 2019.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jun 10 00:18:18 CEST 2019 Robert-André Mauchin - 2019.0-1 -- Release 2019.0 - -* Sat Feb 02 2019 Fedora Release Engineering - 2018.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Oct 03 2018 Robert-André Mauchin - 2018.0-1 -- Release 2018.0 - -* Mon Sep 24 2018 Robert-André Mauchin - 2017.2-1 -- Initial build - +%autochangelog From a2698b1c1c46b4cd142df5469ce4fb9d38935663 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 25 Jul 2021 17:40:52 +0200 Subject: [PATCH 19/55] Update to 2021.1 Close: rhbz#1974600 --- .gitignore | 1 + shaderc.spec | 8 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0cbdf20..5b247ea 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /shaderc-0dbd899.tar.gz /shaderc-24275a1.tar.gz /shaderc-bdd134d.tar.gz +/shaderc-adca18d.tar.gz diff --git a/shaderc.spec b/shaderc.spec index f6dd8c3..c97e7db 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,13 +1,13 @@ # Force out of source build %undefine __cmake_in_source_build -# Release 2020.4 -%global commit bdd134d1b7eca01925c1919d2ea05fd3cd6843c7 +# Release 2021.1 +%global commit adca18dcadd460eb517fe44f6cd2460fa0650ebe %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20210524 +%global snapshotdate 20210725 # Glslang revision from packaged version -%global glslang_version 18eef33bd7a4bf5ad8c69f99cb72022608cf6e73 +%global glslang_version ae2a562936cc8504c9ef2757cceaff163147834f Name: shaderc Version: 2021.0 diff --git a/sources b/sources index b234da6..8d587b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shaderc-bdd134d.tar.gz) = cec230949f98589eef2532b02048e3d1b4a2c07ceff1043bfe5b30cdbd3511cdfcbb625cc115d9cfa52252b20a486e146db7e2e1944d89f9371811d64f9f675c +SHA512 (shaderc-adca18d.tar.gz) = 3a27d4c51be9e9396b9a854cb96d88e78ff2ca6dcb8400bd3288f6984d25876af0eae649aa1c72ad613edbbcfa4324a12809f13ceb7a0134eef41cb1a698dfdf From d7061f6fa5603f241a92e3a37884c49a038ea988 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 2 Dec 2021 17:28:49 +1000 Subject: [PATCH 20/55] Update to v2021.3 --- shaderc.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/shaderc.spec b/shaderc.spec index c97e7db..7cf87de 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -2,15 +2,15 @@ %undefine __cmake_in_source_build # Release 2021.1 -%global commit adca18dcadd460eb517fe44f6cd2460fa0650ebe +%global commit 315d39d082875047f4fbd004e6eedef14ff2db24 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20210725 +%global snapshotdate 20211110 # Glslang revision from packaged version -%global glslang_version ae2a562936cc8504c9ef2757cceaff163147834f +%global glslang_version 600c5037baac82a80851d1fb95f3f09d34bb43e8 Name: shaderc -Version: 2021.0 +Version: 2021.3 Release: %autorelease Summary: A collection of tools, libraries, and tests for Vulkan shader compilation From ff40768c64ae85a14c5265fd6ff05d6a21f05e20 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 3 Dec 2021 05:52:14 +1000 Subject: [PATCH 21/55] add updates sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5b247ea..c0e394f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /shaderc-24275a1.tar.gz /shaderc-bdd134d.tar.gz /shaderc-adca18d.tar.gz +/shaderc-315d39d.tar.gz diff --git a/sources b/sources index 8d587b7..61b5697 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shaderc-adca18d.tar.gz) = 3a27d4c51be9e9396b9a854cb96d88e78ff2ca6dcb8400bd3288f6984d25876af0eae649aa1c72ad613edbbcfa4324a12809f13ceb7a0134eef41cb1a698dfdf +SHA512 (shaderc-315d39d.tar.gz) = adce73678139a864db4fa1dbac8d1cc81dcdd885e11858f7064a6b7bc73bb33ebdd0a67ead42c41ddef1ebc2df11bf8fe2245a17d6bff6af97ca38b6bd44973f From 636d983a4644ef4a94384891df178baae56d6950 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 6 Dec 2021 14:49:48 +1000 Subject: [PATCH 22/55] force a bump for spirv-tools abi change From 5012bf8856d1ca819a0c9765810f2f4221b97585 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 00:46:40 +0000 Subject: [PATCH 23/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 7549837cf66700558c4c60946d794e67d3b71195 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 08:28:54 +0000 Subject: [PATCH 24/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering From c51ae85d16d505be277b8cced6ed8561965c1a84 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 26 Aug 2022 14:45:57 +1000 Subject: [PATCH 25/55] update shaderc to sdk 1.3.224 release version --- .gitignore | 1 + shaderc.spec | 8 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index c0e394f..bd7832e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /shaderc-bdd134d.tar.gz /shaderc-adca18d.tar.gz /shaderc-315d39d.tar.gz +/shaderc-551f106.tar.gz diff --git a/shaderc.spec b/shaderc.spec index 7cf87de..4bb8161 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,16 +1,16 @@ # Force out of source build %undefine __cmake_in_source_build -# Release 2021.1 -%global commit 315d39d082875047f4fbd004e6eedef14ff2db24 +# Release 2022.2 +%global commit 551f106dc64a1cacb298cc2f05613d142b53302f %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20211110 +%global snapshotdate 20220811 # Glslang revision from packaged version %global glslang_version 600c5037baac82a80851d1fb95f3f09d34bb43e8 Name: shaderc -Version: 2021.3 +Version: 2022.2 Release: %autorelease Summary: A collection of tools, libraries, and tests for Vulkan shader compilation diff --git a/sources b/sources index 61b5697..e94c2e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shaderc-315d39d.tar.gz) = adce73678139a864db4fa1dbac8d1cc81dcdd885e11858f7064a6b7bc73bb33ebdd0a67ead42c41ddef1ebc2df11bf8fe2245a17d6bff6af97ca38b6bd44973f +SHA512 (shaderc-551f106.tar.gz) = 368c65ceb7a51e07f9069c19d8cf3c551d3850ad0e02edf159fef9c68ddcf1ab94f3b3b7e36363edc6b69801f9e6a8201a56a5034c858f998d7925eaf672717d From 4987ecd9e0ad66ab5ac5093aceaf561dea90f9ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 23 Oct 2022 13:28:09 +0200 Subject: [PATCH 26/55] Update to 2022.2 --- .gitignore | 2 +- shaderc.spec | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bd7832e..94e3acf 100644 --- a/.gitignore +++ b/.gitignore @@ -9,5 +9,5 @@ /shaderc-24275a1.tar.gz /shaderc-bdd134d.tar.gz /shaderc-adca18d.tar.gz -/shaderc-315d39d.tar.gz +/shaderc-1701a27.tar.gz /shaderc-551f106.tar.gz diff --git a/shaderc.spec b/shaderc.spec index 4bb8161..345297b 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,6 +1,7 @@ # Force out of source build %undefine __cmake_in_source_build +<<<<<<< HEAD # Release 2022.2 %global commit 551f106dc64a1cacb298cc2f05613d142b53302f %global shortcommit %(c=%{commit}; echo ${c:0:7}) @@ -8,6 +9,15 @@ # Glslang revision from packaged version %global glslang_version 600c5037baac82a80851d1fb95f3f09d34bb43e8 +======= +# Release 2022.3 +%global commit 551f106dc64a1cacb298cc2f05613d142b53302f +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global snapshotdate 20221023 + +# Glslang revision from packaged version +%global glslang_version 73c9630da979017b2f7e19c6549e2bdb93d9b238 +>>>>>>> 8d827ff (Update to 2022.2) Name: shaderc Version: 2022.2 From d0f8d4b689902939129b31aa7ca7451f5873b12e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sun, 23 Oct 2022 13:34:38 +0200 Subject: [PATCH 27/55] Update to 2022.2 --- shaderc.spec | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/shaderc.spec b/shaderc.spec index 345297b..7915ac5 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,15 +1,6 @@ # Force out of source build %undefine __cmake_in_source_build -<<<<<<< HEAD -# Release 2022.2 -%global commit 551f106dc64a1cacb298cc2f05613d142b53302f -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20220811 - -# Glslang revision from packaged version -%global glslang_version 600c5037baac82a80851d1fb95f3f09d34bb43e8 -======= # Release 2022.3 %global commit 551f106dc64a1cacb298cc2f05613d142b53302f %global shortcommit %(c=%{commit}; echo ${c:0:7}) @@ -17,14 +8,13 @@ # Glslang revision from packaged version %global glslang_version 73c9630da979017b2f7e19c6549e2bdb93d9b238 ->>>>>>> 8d827ff (Update to 2022.2) Name: shaderc Version: 2022.2 Release: %autorelease Summary: A collection of tools, libraries, and tests for Vulkan shader compilation -License: ASL 2.0 +License: Apache-2.0 URL: https://github.com/google/shaderc Source0: %url/archive/%{commit}/%{name}-%{shortcommit}.tar.gz # Patch to unbundle 3rd party code From 80bbfbd1005ec29ca45cb9222e335532e4fa06dc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:07:04 +0000 Subject: [PATCH 28/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From c30203295b32b09f548598be8d7dab005f108c45 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Tue, 31 Jan 2023 16:10:40 +0900 Subject: [PATCH 29/55] Backport upstream patch to support current spirv-tools spirv-tools with SDK version 1.3.231.1 or higher (which corresponds to Fedora spirv-tools 2022.2-6) needs this patch to support GL_EXT_mesh_shader . --- ...rc-pr1264-GL_EXT_mesh_shader-support.patch | 50 +++++++++++++++++++ shaderc.spec | 4 ++ 2 files changed, 54 insertions(+) create mode 100644 shaderc-pr1264-GL_EXT_mesh_shader-support.patch diff --git a/shaderc-pr1264-GL_EXT_mesh_shader-support.patch b/shaderc-pr1264-GL_EXT_mesh_shader-support.patch new file mode 100644 index 0000000..6c28595 --- /dev/null +++ b/shaderc-pr1264-GL_EXT_mesh_shader-support.patch @@ -0,0 +1,50 @@ +From 729aa2f92569b4a419ddda8fc0ccfadbf7dbc3f7 Mon Sep 17 00:00:00 2001 +From: Pankaj Mistry +Date: Wed, 29 Sep 2021 01:10:42 -0700 +Subject: [PATCH] Implement default builtin constants needed for + GL_EXT_mesh_shader. + +--- + DEPS | 6 +++--- + libshaderc_util/src/resources.cc | 9 +++++++++ + 2 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/DEPS b/DEPS +index 01ce19d5e..68fac7869 100644 +--- a/DEPS ++++ b/DEPS +@@ -5,11 +5,11 @@ vars = { + 'khronos_git': 'https://github.com/KhronosGroup', + + 'effcee_revision' : '2ec8f8738118cc483b67c04a759fee53496c5659', +- 'glslang_revision': 'f771c1293dce29e1ac3557cf994169136155c81f', ++ 'glslang_revision': 'a53aa3e94f8b4bf22a6eb6e8a207fe91ab02b989', + 'googletest_revision': '389cb68b87193358358ae87cc56d257fd0d80189', + 're2_revision': '7107ebc4fbf7205151d8d2a57b2fc6e7853125d4', +- 'spirv_headers_revision': '0bcc624926a25a2a273d07877fd25a6ff5ba1cfb', +- 'spirv_tools_revision': '3a8a961cffb7699422a05dcbafdd721226b4547d', ++ 'spirv_headers_revision': '87d5b782bec60822aa878941e6b13c0a9a954c9b', ++ 'spirv_tools_revision': '4c456f7da67c5437a6fb7d4d20d78e2a5ae2acf2', + } + + deps = { +diff --git a/libshaderc_util/src/resources.cc b/libshaderc_util/src/resources.cc +index d64e47fa0..6c662d3db 100644 +--- a/libshaderc_util/src/resources.cc ++++ b/libshaderc_util/src/resources.cc +@@ -125,6 +125,15 @@ const TBuiltInResource kDefaultTBuiltInResource = { + /* .maxTaskWorkGroupSizeY_NV = */ 1, + /* .maxTaskWorkGroupSizeZ_NV = */ 1, + /* .maxMeshViewCountNV = */ 4, ++ /* .maxMeshOutputVerticesEXT = */ 256, ++ /* .maxMeshOutputPrimitivesEXT = */ 256, ++ /* .maxMeshWorkGroupSizeX_EXT = */ 128, ++ /* .maxMeshWorkGroupSizeY_EXT = */ 128, ++ /* .maxMeshWorkGroupSizeZ_EXT = */ 128, ++ /* .maxTaskWorkGroupSizeX_EXT = */ 128, ++ /* .maxTaskWorkGroupSizeY_EXT = */ 128, ++ /* .maxTaskWorkGroupSizeZ_EXT = */ 128, ++ /* .maxMeshViewCountEXT = */ 4, + /* .maxDualSourceDrawBuffersEXT = */ 1, + // This is the glslang TLimits structure. + // It defines whether or not the following features are enabled. diff --git a/shaderc.spec b/shaderc.spec index 7915ac5..68bd226 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -20,6 +20,10 @@ Source0: %url/archive/%{commit}/%{name}-%{shortcommit}.tar.gz # Patch to unbundle 3rd party code Patch1: 0001-Drop-third-party-code-in-CMakeLists.txt.patch Patch2: glslang_linker_flags.patch +# https://github.com/google/shaderc/pull/1264 +# Included in 2022.3 +# Related to https://github.com/KhronosGroup/SPIRV-Tools/pull/4915 (SDK 1.3.231.1) +Patch3: shaderc-pr1264-GL_EXT_mesh_shader-support.patch BuildRequires: cmake3 BuildRequires: gcc-c++ From 49f19ee5825ed5f57d3a0951fccdac1eb25bc983 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 16 Feb 2023 11:00:13 +1000 Subject: [PATCH 30/55] update to 2023.1 for sdk 1.3.239.0 release --- ...rc-pr1264-GL_EXT_mesh_shader-support.patch | 50 ------------------- shaderc.spec | 14 ++---- 2 files changed, 5 insertions(+), 59 deletions(-) delete mode 100644 shaderc-pr1264-GL_EXT_mesh_shader-support.patch diff --git a/shaderc-pr1264-GL_EXT_mesh_shader-support.patch b/shaderc-pr1264-GL_EXT_mesh_shader-support.patch deleted file mode 100644 index 6c28595..0000000 --- a/shaderc-pr1264-GL_EXT_mesh_shader-support.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 729aa2f92569b4a419ddda8fc0ccfadbf7dbc3f7 Mon Sep 17 00:00:00 2001 -From: Pankaj Mistry -Date: Wed, 29 Sep 2021 01:10:42 -0700 -Subject: [PATCH] Implement default builtin constants needed for - GL_EXT_mesh_shader. - ---- - DEPS | 6 +++--- - libshaderc_util/src/resources.cc | 9 +++++++++ - 2 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/DEPS b/DEPS -index 01ce19d5e..68fac7869 100644 ---- a/DEPS -+++ b/DEPS -@@ -5,11 +5,11 @@ vars = { - 'khronos_git': 'https://github.com/KhronosGroup', - - 'effcee_revision' : '2ec8f8738118cc483b67c04a759fee53496c5659', -- 'glslang_revision': 'f771c1293dce29e1ac3557cf994169136155c81f', -+ 'glslang_revision': 'a53aa3e94f8b4bf22a6eb6e8a207fe91ab02b989', - 'googletest_revision': '389cb68b87193358358ae87cc56d257fd0d80189', - 're2_revision': '7107ebc4fbf7205151d8d2a57b2fc6e7853125d4', -- 'spirv_headers_revision': '0bcc624926a25a2a273d07877fd25a6ff5ba1cfb', -- 'spirv_tools_revision': '3a8a961cffb7699422a05dcbafdd721226b4547d', -+ 'spirv_headers_revision': '87d5b782bec60822aa878941e6b13c0a9a954c9b', -+ 'spirv_tools_revision': '4c456f7da67c5437a6fb7d4d20d78e2a5ae2acf2', - } - - deps = { -diff --git a/libshaderc_util/src/resources.cc b/libshaderc_util/src/resources.cc -index d64e47fa0..6c662d3db 100644 ---- a/libshaderc_util/src/resources.cc -+++ b/libshaderc_util/src/resources.cc -@@ -125,6 +125,15 @@ const TBuiltInResource kDefaultTBuiltInResource = { - /* .maxTaskWorkGroupSizeY_NV = */ 1, - /* .maxTaskWorkGroupSizeZ_NV = */ 1, - /* .maxMeshViewCountNV = */ 4, -+ /* .maxMeshOutputVerticesEXT = */ 256, -+ /* .maxMeshOutputPrimitivesEXT = */ 256, -+ /* .maxMeshWorkGroupSizeX_EXT = */ 128, -+ /* .maxMeshWorkGroupSizeY_EXT = */ 128, -+ /* .maxMeshWorkGroupSizeZ_EXT = */ 128, -+ /* .maxTaskWorkGroupSizeX_EXT = */ 128, -+ /* .maxTaskWorkGroupSizeY_EXT = */ 128, -+ /* .maxTaskWorkGroupSizeZ_EXT = */ 128, -+ /* .maxMeshViewCountEXT = */ 4, - /* .maxDualSourceDrawBuffersEXT = */ 1, - // This is the glslang TLimits structure. - // It defines whether or not the following features are enabled. diff --git a/shaderc.spec b/shaderc.spec index 68bd226..cea041d 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,16 +1,16 @@ # Force out of source build %undefine __cmake_in_source_build -# Release 2022.3 -%global commit 551f106dc64a1cacb298cc2f05613d142b53302f +# Release 2023.1 +%global commit d0b02222f33e1e5e1f521e4e4e1cbfa7fe2cf540 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20221023 +%global snapshotdate 20230116 # Glslang revision from packaged version -%global glslang_version 73c9630da979017b2f7e19c6549e2bdb93d9b238 +%global glslang_version ca8d07d0bc1c6390b83915700439fa7719de6a2a Name: shaderc -Version: 2022.2 +Version: 2023.1 Release: %autorelease Summary: A collection of tools, libraries, and tests for Vulkan shader compilation @@ -20,10 +20,6 @@ Source0: %url/archive/%{commit}/%{name}-%{shortcommit}.tar.gz # Patch to unbundle 3rd party code Patch1: 0001-Drop-third-party-code-in-CMakeLists.txt.patch Patch2: glslang_linker_flags.patch -# https://github.com/google/shaderc/pull/1264 -# Included in 2022.3 -# Related to https://github.com/KhronosGroup/SPIRV-Tools/pull/4915 (SDK 1.3.231.1) -Patch3: shaderc-pr1264-GL_EXT_mesh_shader-support.patch BuildRequires: cmake3 BuildRequires: gcc-c++ From 2ad635f2b0ca3d038d4f9a5aa131d285315c2a5b Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 16 Feb 2023 11:14:51 +1000 Subject: [PATCH 31/55] upload sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 94e3acf..dd280a1 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /shaderc-adca18d.tar.gz /shaderc-1701a27.tar.gz /shaderc-551f106.tar.gz +/shaderc-d0b0222.tar.gz diff --git a/sources b/sources index e94c2e9..0567161 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shaderc-551f106.tar.gz) = 368c65ceb7a51e07f9069c19d8cf3c551d3850ad0e02edf159fef9c68ddcf1ab94f3b3b7e36363edc6b69801f9e6a8201a56a5034c858f998d7925eaf672717d +SHA512 (shaderc-d0b0222.tar.gz) = e9d91ca0ffdd66df457ad8f288f34bd0b3aa5b76e66320f0c38cb867db4cc0bc4419fe82b99826df116dd8398d6da39867dcac9c32c68596b09782faad120eab From e372b7585c61a39e5848674e45fcb02e5a8e9480 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 16 Feb 2023 11:29:31 +1000 Subject: [PATCH 32/55] fix build-version attempt --- shaderc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/shaderc.spec b/shaderc.spec index cea041d..30e5869 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -78,6 +78,7 @@ rm -rf third_party # Stolen from Gentoo # Create build-version.inc since we want to use our packaged # SPIRV-Tools and glslang +sed -i -e '/build-version/d' glslc/CMakeLists.txt echo \"shaderc $(grep -m1 -o '^v[[:digit:]]\{4\}\.[[:digit:]]\(-dev\)\? [[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}$' CHANGES)\" \ > glslc/src/build-version.inc echo \"spirv-tools $(grep -m1 -o '^v[[:digit:]]\{4\}\.[[:digit:]]\(-dev\)\? [[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}$' /usr/share/doc/spirv-tools/CHANGES)\" \ From 4a5f8f6b079344036e0581403e9d641daf105d9e Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Thu, 22 Jun 2023 08:36:04 +0200 Subject: [PATCH 33/55] Update to 2023.3 and tidy up the spec; Fixes: RHBZ#1997985 --- .gitignore | 1 + CHANGES | 223 --------------------------------------------------- shaderc.spec | 48 +++++------ sources | 2 +- 4 files changed, 23 insertions(+), 251 deletions(-) delete mode 100644 CHANGES diff --git a/.gitignore b/.gitignore index dd280a1..36cc0bf 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /shaderc-1701a27.tar.gz /shaderc-551f106.tar.gz /shaderc-d0b0222.tar.gz +/shaderc-2023.3.tar.gz diff --git a/CHANGES b/CHANGES deleted file mode 100644 index ff3ef43..0000000 --- a/CHANGES +++ /dev/null @@ -1,223 +0,0 @@ -Revision history for Shaderc - -v2020.1 2020-06-09 - This is the last version that officially supports VS2013. - - - General: - - Added warning signs about unsupported downloads (#1041) - - Added .NET bindings to README.md (#1060) - - Only add -fPIC if supported by the compiler. (#1061) - - - glslc, libshaderc: - - Removed Singleton pattern around access to glslang (#1059) - - - spvc: - - Added concept of comparison sampler to API (#1036) - - Added support for options.hlsl.nonwritable_uav_texture_as_srv (#1048) - - Support forcing storage buffers to be always declared as UAV. (#1076) - -v2020.0 2020-03-06 - - General: - - Getting spirv.hpp from SPIRV-Headers instead of not glslang (#992) - - Added clarification about status of artifacts in downloads.md (#1012) - - - glslc, libshaderc: - - Added support for new Glslang profile enum, EProfileCount (#973) - - Updated user documentation for -S in glslc (#978) - - Add documentation for Vulkan 1.2 and SPIR-V 1.5 (#980) - - Removed NV_EXTENSIONS conditionals (#1003) - - Added support for generating WebGPU SPIR-V to libshaderc (#1021) - - Rolled in all DEPS for provisional SPIR-V extensions for raytracing - - - spvc: - - Normalized API behaviour (#967) - - Added source_set target for libshaderc_spvc (#976) - - Added in support for spvc logging to the terminal (#981) - - Internal refactoring to reduce boiler plate in API implementations (#984) - - Added newline to logging messages to make them readable (#985) - - Added reflection support for Dawn: - - storage textures (#1001) - - storage texture format (#1005) - - texture dimension for storage textures (#1008) - - is storage texture declared as multisampled texture (#1011) - - Converted compile options to require explicit environments (#1019) - - Added knob to control force_zero_initialized_variables in SPIRV-Cross (#1028) - -v2019.1 2020-01-22 - - glslc, libshaderc: - - Add -fnan-clamp: Generate code for max and min builtins so that, - given a NaN operand, will return the other operand. Similarly, the - clamp builtin favours non-NaN operands, as if clamp was implemented - as the composition of max and min. - - Add -finvert-y - - Using SetBeforeHlslLegalization for more relaxed validation rules - - Added support for SPIR-V 1.5 - - Add --emit-line-directive option - - Added support for Vulkan 1.2 - - spvc: - - Add many options: - --flatten-multidimensional-arrays - --es - --no-es - --glsl-emit-push-constant-as-ubo - --msl-swizzle-texture-samples - --msl-platform=ios|macos - --msl-pad-fragment-output - --msl-capture-output - --msl-domain-lower-left - --msl-argument-buffers - --msl-discrete-descriptor-set= - --hlsl-enable-compat - - Reintroduce shaderc_spvc_compile_options_set_shader_model - - Added option to inject robust buffer access code - - Added support for emitting ToVulkan shaders - - Added spirv-opt based IR generation as alternative to built in spirv_cross IR gen - - Added API for specifying source and target execution environments - - Added option & reflection API methods neede by Dawn - - Substantial internal refactoring and code cleanup - - Large number of breaking changes to the API - - Replaced shaderc_spvc_compile_options_set_shader_model with - shaderc_spvc_compile_options_set_hlsl_shader_model - - Compiler initialization and shader generation moved into seperate calls - - Seperated return codes from shaderc ones - - Many small API changes - - Improvements to testing - - Refactoring and clean up of run_spirv_cross_tests.py - - Seperation of expectations into known failures, known invalids, and cases - that need investigation - - Tweaks and fixes to substantially increase passing cases - - Added support for running tests using spvc IR generation - - Infrastructure - - Update DEPS with cross-verified commits from associated repos. - - Add utils/roll-deps - - Infrastructure: - - Removed Appveyor artifacts link - - Improvements and clean up of DEPS rolling scripts - - Enabled warnings about implicit fallthrough - - Enabled improper semicolon warnings - - Restricted -fPIC to platforms that support it - - Converted remaining scripts to use Python 3 - - Replaced nosetest with unittest - - Removed assumptions aabout location of spirv-tools, effcee, and RE2 - - Migrated BUILD.gn spirv_cross dependency to local repo - - Fixes: - - Fix duplicate install paths when using VisualStudio - - Fixed BUILD.gn for Chromium, Dawn & Fuchsia - - Explicitly enabled HLSL support in glslang - - Added installing necessary headers in Android.mk - - Removed unsupported Unicode characters - - Fixed detection of spirv-headers directory - #666: Update Docker file to use Python3 - -v2019.0 2019-06-04 - - Add optional spvc, libshaderc_spvc as wrapper around SPIRV-Cross: - - Rejects bad modules by running the SPIR-V validator first - - Skips exception-heavy SPIRV-Cross SPIR-V parser - - Support NV extensions for shader stages - - Require SPIRV-Tools and SPIRV-Headers with SPIR-V 1.4 support - Build support: - - Use KhronosGroup/glslang instead of google/glslang - - Stop running tests on VS 2013 (googletest no longer supports VS2013) - - Require Python3 for building - - Support Chromium's GN build system - - Kokoro build fixes - - Cmake build fixes: Only build subdirs if those targets are not yet defined - - Use Android.mk from Glslang - - Dockerfile gets re2 and effcee sources - - Fixes for newer googletest - - Add address sanitizer presubmit bot - - Generate config files for pkg-config - Spvc: - - Add option to specify source environment. Spvc will transform from source - to target environment if they are different. This only works for WebGPU0 - and Vulkan 1.1. - Fixes: - #499: In HLSL compilation, relax layout and logical pointer validation rules - prior to running the legalization recipe. - -v2018.0 2018-10-01 - - Support -fhlsl_functionality1 (also -fhlsl-functionality1) - - Support NVIDIA Turing extensions. Requires updated Glslang and SPIRV-Tools. - - Use SPIR-V optimization and HLSL legalization recipes from SPIRV-Tools. - - Pass target environment into SPIRV-Tools code, e.g. from --target-env vulkan1.1 - - Add SONAME=1 property to shared library - - Support GN build for Chromium - Fixes: - #469: Add virtual dtor to classes with virtual functions. - #457: Fix writing SPIR-V binaries to standard output on Windows. - -v2017.2 2018-02-27 - - Add a shared library version of libshaderc - - Support GLSL 4.6 and ESSL 3.2 - - Fail compilation if a resource does not have a binding. - - Add options for automatically setting bindings for (uniform) resources that - don't have bindings set in shader source. - - Add options for automatically setting locations for pipline inputs and outputs. - - Add option for using HLSL IO mappings as expressed in source. - - Add options for setting resource binding base numbers. - - Add option to use HLSL resource register numbers for bindings. - - HLSL compilation now defaults to HLSL packing rules. - (This change is inherited from Glslang commit 7cca140.) - - HLSL compilation runs SPIR-V "legalization" transforms to reduce - manipulation of opaque handles (e.g. images), to satisfy Vulkan rules. - - Adapt to Glslang generator version numbers: - - To 2: a fix for code generation for atomicCounterDecrement. - - To 3: change memory barrier semantics masks - - To 4: generate more access chains for swizzles - - CMake install rules uses GNUInstallDirs. For example, install to lib64 - when that is the norm for the target system. - -v2017.1 2017-03-10 - - Add option to automatically assign bindings to uniform variables - that don't have an explicit 'binding' layout in the shader source. - - Enable NVIDIA extensions by default in GLSL compilation - - README mentions language bindings provided by 3rd parties. - - README describes the known-good branch on GitHub - - Fixed examples in shaderc.h; added C API use to examples/online-compile - - Fixes issues: - #289: Don't output an object file when compilation fails. - #296: Enable use of the CMake in Android Studio. - -v2016.2 2016-12-13 - - Describe Shaderc's level of stability. - - Support HLSL compilation, exposing functionality in Glslang. - - Supported in C, C++ API - - glslc accepts "-x hlsl", and assumes .hlsl files are HLSL. - - glslc accepts "-fentry-point=" to set entry point name, - overriding default value "main". - - Support setting shader resource limits in C, C++ APIs, and in - glslc - - glslc adds -flimit= - - glslc adds --show-limits to display defaults and valid resource - limit syntax. - - glslc adds "-flimit-file " support to read Glslang resource - configuration files, i.e. the output of "glslangValidator -c". - - Enable AMD extensions by default in GLSL compilation - - Fixes issues: - #281: Work around Android build issue with abspath on Windows - #283: Increase default maxDrawBuffers to 4, to match Vulkan/GLES3.0 - -v2016.1 2016-10-12 - - C API for assembling now takes an options object - - Support compilation options to optimize for size. - - Maintain compatibility with recent SPIRV-Tools and Glslang versions. - - Update examples. - - Build cleanups. - - Fixes issues: - #238: Fix invocation of python scripts during build - -v2016.0 2016-07-07 - - - Adds v. versioning, with "-dev" suffix to indicate work in - progress. The intent is to summarize and report functionalities more easily - for incorporating into downstream projects. - - - Summary of functionalities (See the README.md for more details): - - Provides libraries and command line tools for generating SPIR-V modules - - Supports GLSL source code or SPIR-V assembly as input - - Supports SPIR-V binary or assembly text as output - - Command line options follow GCC/Clang conventions - - Supports various semantics (OpenGL, OpenGL Compatible and Vulkan) - - Supports #include - - Supports user-defined macros - - Supports dependency information dumping diff --git a/shaderc.spec b/shaderc.spec index 30e5869..a2f9408 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,33 +1,27 @@ -# Force out of source build -%undefine __cmake_in_source_build - -# Release 2023.1 -%global commit d0b02222f33e1e5e1f521e4e4e1cbfa7fe2cf540 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20230116 - # Glslang revision from packaged version %global glslang_version ca8d07d0bc1c6390b83915700439fa7719de6a2a Name: shaderc -Version: 2023.1 +Version: 2023.3 Release: %autorelease -Summary: A collection of tools, libraries, and tests for Vulkan shader compilation +Summary: Collection of tools, libraries, and tests for Vulkan shader compilation License: Apache-2.0 URL: https://github.com/google/shaderc -Source0: %url/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz # Patch to unbundle 3rd party code -Patch1: 0001-Drop-third-party-code-in-CMakeLists.txt.patch -Patch2: glslang_linker_flags.patch +Patch: 0001-Drop-third-party-code-in-CMakeLists.txt.patch +Patch: glslang_linker_flags.patch -BuildRequires: cmake3 +BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: ninja-build -BuildRequires: python3-devel -BuildRequires: glslang-devel -BuildRequires: spirv-headers-devel +BuildRequires: sed BuildRequires: spirv-tools + +BuildRequires: glslang-devel +BuildRequires: python3-devel +BuildRequires: spirv-headers-devel BuildRequires: spirv-tools-devel %description @@ -71,9 +65,9 @@ A library for compiling shader strings into SPIR-V. Static libraries for libshaderc. %prep -%autosetup -p1 -n %{name}-%{commit} +%autosetup -p1 -rm -rf third_party +rm -r third_party # Stolen from Gentoo # Create build-version.inc since we want to use our packaged @@ -91,18 +85,18 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr %build # We disable the tests because they don't work with our unbundling of 3rd party. # See https://github.com/google/shaderc/issues/470 -%cmake3 -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_SKIP_RPATH=True \ - -DSHADERC_SKIP_TESTS=True \ - -DPYTHON_EXE=%{__python3} \ - -GNinja -%cmake3_build +%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_SKIP_RPATH=True \ + -DSHADERC_SKIP_TESTS=True \ + -DPYTHON_EXE=%{python3} \ + -GNinja +%cmake_build %install -%cmake3_install +%cmake_install %check -%ctest3 +%ctest %files -n glslc %doc glslc/README.asciidoc diff --git a/sources b/sources index 0567161..9e4acf7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shaderc-d0b0222.tar.gz) = e9d91ca0ffdd66df457ad8f288f34bd0b3aa5b76e66320f0c38cb867db4cc0bc4419fe82b99826df116dd8398d6da39867dcac9c32c68596b09782faad120eab +SHA512 (shaderc-2023.3.tar.gz) = c6422383318b5d4d341e5b4215489ba03590aeff65fd03fb0b57aab8689c9002444f520a4017485645291777ee442979d22db52d843e66d4d672da2810b20e36 From c39ab21c8f28d0206038d79f5b3a0296e125708e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:31:34 +0000 Subject: [PATCH 34/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From a317187e6553ac3b6d8b2e471ed3959a3358b66d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Thu, 2 Nov 2023 17:18:59 +0100 Subject: [PATCH 35/55] update to 1.3.268.0 SDK --- .gitignore | 1 + shaderc.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 36cc0bf..05d0b2c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /shaderc-551f106.tar.gz /shaderc-d0b0222.tar.gz /shaderc-2023.3.tar.gz +/shaderc-2023.7.tar.gz diff --git a/shaderc.spec b/shaderc.spec index a2f9408..5c0a949 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,8 +1,8 @@ # Glslang revision from packaged version -%global glslang_version ca8d07d0bc1c6390b83915700439fa7719de6a2a +%global glslang_version 066853941a3f097b6196f452dde42c0cbf7f98f4 Name: shaderc -Version: 2023.3 +Version: 2023.7 Release: %autorelease Summary: Collection of tools, libraries, and tests for Vulkan shader compilation diff --git a/sources b/sources index 9e4acf7..f48ee18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shaderc-2023.3.tar.gz) = c6422383318b5d4d341e5b4215489ba03590aeff65fd03fb0b57aab8689c9002444f520a4017485645291777ee442979d22db52d843e66d4d672da2810b20e36 +SHA512 (shaderc-2023.7.tar.gz) = f3c1db574312e7e5ee22fb64f47f6609369754dd1648eb4e51c30b3c40aafd9994e54560e8334d01ac7d00011285a94d0543fa9ecd6977ec34c39a965fd72269 From 015b5d055c9ab67c421728b082bec81cfea65797 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 02:49:02 +0000 Subject: [PATCH 36/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 66374dd34e7f8d5d62408865e09fa76fa852cdb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Thu, 22 Feb 2024 14:53:07 +0100 Subject: [PATCH 37/55] Update to 1.3.275.0 SDK --- .gitignore | 1 + glslang_linker_flags.patch | 10 +++++----- shaderc.spec | 6 +++--- sources | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 05d0b2c..5ba017c 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /shaderc-d0b0222.tar.gz /shaderc-2023.3.tar.gz /shaderc-2023.7.tar.gz +/shaderc-2023.8.tar.gz diff --git a/glslang_linker_flags.patch b/glslang_linker_flags.patch index 9324f21..0bc540c 100644 --- a/glslang_linker_flags.patch +++ b/glslang_linker_flags.patch @@ -1,9 +1,9 @@ --- a/libshaderc_util/CMakeLists.txt +++ b/libshaderc_util/CMakeLists.txt -@@ -47,7 +47,7 @@ +@@ -47,7 +47,7 @@ add_definitions(-DENABLE_HLSL) find_package(Threads) target_link_libraries(shaderc_util PRIVATE - glslang OSDependent OGLCompiler HLSL glslang SPIRV + glslang SPIRV - SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT}) + SPIRV-Tools-opt MachineIndependent GenericCodeGen ${CMAKE_THREAD_LIBS_INIT}) @@ -12,12 +12,12 @@ --- a/glslc/CMakeLists.txt +++ b/glslc/CMakeLists.txt -@@ -43,7 +43,7 @@ +@@ -43,7 +43,7 @@ if (SHADERC_ENABLE_WGSL_OUTPUT) endif(SHADERC_ENABLE_WGSL_OUTPUT) target_link_libraries(glslc PRIVATE -- glslang OSDependent OGLCompiler HLSL glslang SPIRV # Glslang libraries -+ glslang OSDependent OGLCompiler HLSL glslang SPIRV MachineIndependent GenericCodeGen # Glslang libraries +- glslang SPIRV # Glslang libraries ++ glslang SPIRV MachineIndependent GenericCodeGen # Glslang libraries $<$:libtint> # Tint libraries, optional shaderc_util shaderc # internal Shaderc libraries ${CMAKE_THREAD_LIBS_INIT}) diff --git a/shaderc.spec b/shaderc.spec index 5c0a949..a249900 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,8 +1,8 @@ # Glslang revision from packaged version -%global glslang_version 066853941a3f097b6196f452dde42c0cbf7f98f4 +%global glslang_version 93b465f4f2eb5ef92004231b3c099944cd5cbf5b Name: shaderc -Version: 2023.7 +Version: 2023.8 Release: %autorelease Summary: Collection of tools, libraries, and tests for Vulkan shader compilation @@ -88,7 +88,7 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_SKIP_RPATH=True \ -DSHADERC_SKIP_TESTS=True \ - -DPYTHON_EXE=%{python3} \ + -DPYTHON_EXECUTABLE=%{python3} \ -GNinja %cmake_build diff --git a/sources b/sources index f48ee18..9a2c00e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shaderc-2023.7.tar.gz) = f3c1db574312e7e5ee22fb64f47f6609369754dd1648eb4e51c30b3c40aafd9994e54560e8334d01ac7d00011285a94d0543fa9ecd6977ec34c39a965fd72269 +SHA512 (shaderc-2023.8.tar.gz) = 2a5e59a2bb6c4b5462758d824747fee0edaf177dc64f30fe698fd2d2cc21cddab1a19ec2b2d63bd3d2e209330a13519f399395398379370b15daa39e6ee6b2bf From e319f19c4b600f8aa8e37a8f0618a8303b6e6d9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Wed, 3 Apr 2024 11:43:43 +0200 Subject: [PATCH 38/55] Update to 1.3.280.0 SDK --- .gitignore | 1 + 0001-Drop-third-party-code-in-CMakeLists.txt.patch | 2 +- shaderc.spec | 4 ++-- sources | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 5ba017c..5820457 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /shaderc-2023.3.tar.gz /shaderc-2023.7.tar.gz /shaderc-2023.8.tar.gz +/shaderc-2024.0.tar.gz diff --git a/0001-Drop-third-party-code-in-CMakeLists.txt.patch b/0001-Drop-third-party-code-in-CMakeLists.txt.patch index b49b925..312864e 100644 --- a/0001-Drop-third-party-code-in-CMakeLists.txt.patch +++ b/0001-Drop-third-party-code-in-CMakeLists.txt.patch @@ -15,7 +15,7 @@ diff -up shaderc-24275a11d81a6b33ef345878f8a4ef929c95a116/CMakeLists.txt.orig sh -endif() - -add_custom_target(build-version -- ${PYTHON_EXECUTABLE} +- ${Python_EXECUTABLE} - ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py - ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc - COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).") diff --git a/shaderc.spec b/shaderc.spec index a249900..395c951 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,8 +1,8 @@ # Glslang revision from packaged version -%global glslang_version 93b465f4f2eb5ef92004231b3c099944cd5cbf5b +%global glslang_version 436237a4ab2be3225acedc66016ea2aa82946b37 Name: shaderc -Version: 2023.8 +Version: 2024.0 Release: %autorelease Summary: Collection of tools, libraries, and tests for Vulkan shader compilation diff --git a/sources b/sources index 9a2c00e..4f13dfe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shaderc-2023.8.tar.gz) = 2a5e59a2bb6c4b5462758d824747fee0edaf177dc64f30fe698fd2d2cc21cddab1a19ec2b2d63bd3d2e209330a13519f399395398379370b15daa39e6ee6b2bf +SHA512 (shaderc-2024.0.tar.gz) = ca80b22a80bf1a222e6deecbe63f99c6eed980c6c31b4f7981b6c8dc5637b7271c861543566e01aaf945df40da095b63a69f2e22f061a41faad2ecca5dc187ae From 532876f399bdf95f0846926fcec1e9679d679846 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:22:38 +0000 Subject: [PATCH 39/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 69ab0ca76317d2a94b6a6fa24239b282d4afc066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Wed, 14 Aug 2024 17:53:04 +0200 Subject: [PATCH 40/55] Update to 1.3.290.0 SDK --- .gitignore | 1 + shaderc.spec | 8 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 5820457..79e7225 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /shaderc-2023.7.tar.gz /shaderc-2023.8.tar.gz /shaderc-2024.0.tar.gz +/3ac03b8ad85a8e328a6182cddee8d05810bd5a2c.tar.gz diff --git a/shaderc.spec b/shaderc.spec index 395c951..b2f65cd 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,14 +1,14 @@ # Glslang revision from packaged version -%global glslang_version 436237a4ab2be3225acedc66016ea2aa82946b37 +%global glslang_version 3ac03b8ad85a8e328a6182cddee8d05810bd5a2c Name: shaderc -Version: 2024.0 +Version: 2024.2 Release: %autorelease Summary: Collection of tools, libraries, and tests for Vulkan shader compilation License: Apache-2.0 URL: https://github.com/google/shaderc -Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +Source: %{url}/archive/%{glslang_version}.tar.gz # Patch to unbundle 3rd party code Patch: 0001-Drop-third-party-code-in-CMakeLists.txt.patch Patch: glslang_linker_flags.patch @@ -65,7 +65,7 @@ A library for compiling shader strings into SPIR-V. Static libraries for libshaderc. %prep -%autosetup -p1 +%autosetup -p1 -n %{name}-%{glslang_version} rm -r third_party diff --git a/sources b/sources index 4f13dfe..7c1a466 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (shaderc-2024.0.tar.gz) = ca80b22a80bf1a222e6deecbe63f99c6eed980c6c31b4f7981b6c8dc5637b7271c861543566e01aaf945df40da095b63a69f2e22f061a41faad2ecca5dc187ae +SHA512 (3ac03b8ad85a8e328a6182cddee8d05810bd5a2c.tar.gz) = 5f38f505cfab3e0a14c1a4d6673f599ce321ab12bbe454001dd05ae46540f3daa96775ef273e7a7869f07a43a22f2089ceb721c5ec31867dbc25b6c75128accb From e2ea6da7a43e755f3e06d5b3179261b335209a3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Fri, 11 Oct 2024 15:59:23 +0200 Subject: [PATCH 41/55] Update to 1.3.296.0 SDK --- .gitignore | 1 + shaderc.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 79e7225..1f1e061 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /shaderc-2023.8.tar.gz /shaderc-2024.0.tar.gz /3ac03b8ad85a8e328a6182cddee8d05810bd5a2c.tar.gz +/ff84893dd52d28f0b1737d2635733d952013bd9c.tar.gz diff --git a/shaderc.spec b/shaderc.spec index b2f65cd..6ac9697 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,8 +1,8 @@ # Glslang revision from packaged version -%global glslang_version 3ac03b8ad85a8e328a6182cddee8d05810bd5a2c +%global glslang_version ff84893dd52d28f0b1737d2635733d952013bd9c Name: shaderc -Version: 2024.2 +Version: 2024.3 Release: %autorelease Summary: Collection of tools, libraries, and tests for Vulkan shader compilation diff --git a/sources b/sources index 7c1a466..14aaa96 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (3ac03b8ad85a8e328a6182cddee8d05810bd5a2c.tar.gz) = 5f38f505cfab3e0a14c1a4d6673f599ce321ab12bbe454001dd05ae46540f3daa96775ef273e7a7869f07a43a22f2089ceb721c5ec31867dbc25b6c75128accb +SHA512 (ff84893dd52d28f0b1737d2635733d952013bd9c.tar.gz) = a00974f44b979a865f549fd3945f7864ab669f85dcd360f88547cf762454d4540185f7c90419ebfcdbd4a7c8743d2d043e01ea9bcb1b27a012f5321d421e244e From b32e668d9dbe845e437bcfd06d18afd9d37485fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Wed, 15 Jan 2025 17:02:40 +0100 Subject: [PATCH 42/55] Update to 1.4.304.0 SDK --- .gitignore | 1 + shaderc.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1f1e061..dce0b12 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /shaderc-2024.0.tar.gz /3ac03b8ad85a8e328a6182cddee8d05810bd5a2c.tar.gz /ff84893dd52d28f0b1737d2635733d952013bd9c.tar.gz +/caa54d9779d5605aca4e1a0c0c962a3d8f4aeb31.tar.gz diff --git a/shaderc.spec b/shaderc.spec index 6ac9697..b686ae5 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,8 +1,8 @@ # Glslang revision from packaged version -%global glslang_version ff84893dd52d28f0b1737d2635733d952013bd9c +%global glslang_version caa54d9779d5605aca4e1a0c0c962a3d8f4aeb31 Name: shaderc -Version: 2024.3 +Version: 2024.4 Release: %autorelease Summary: Collection of tools, libraries, and tests for Vulkan shader compilation diff --git a/sources b/sources index 14aaa96..42dc890 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ff84893dd52d28f0b1737d2635733d952013bd9c.tar.gz) = a00974f44b979a865f549fd3945f7864ab669f85dcd360f88547cf762454d4540185f7c90419ebfcdbd4a7c8743d2d043e01ea9bcb1b27a012f5321d421e244e +SHA512 (caa54d9779d5605aca4e1a0c0c962a3d8f4aeb31.tar.gz) = f7871571c708175e1f381fb8e9e108b498f9ce5de8273be91e7ebb123707335b02b26fd16960e90d6e8636b36c0c215b68ae55b88d6b7ad418f4c2a9a3a57ef6 From b5145be5a76dac44b0ab3a249bdc7c1e226cf30d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:32:14 +0000 Subject: [PATCH 43/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e9b15852811f3ec9788da16d5fac55ae0ae1e908 Mon Sep 17 00:00:00 2001 From: Anusha Srivatsa Date: Fri, 28 Mar 2025 16:14:13 +0000 Subject: [PATCH 44/55] Update to SDK v1.4.309.0 Signed-off-by: Anusha Srivatsa --- shaderc.spec | 4 ++-- sources | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/shaderc.spec b/shaderc.spec index b686ae5..77aa040 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,8 +1,8 @@ # Glslang revision from packaged version -%global glslang_version caa54d9779d5605aca4e1a0c0c962a3d8f4aeb31 +%global glslang_version 0968768c61d4eb7dd861114412e904bb3d59b7b6 Name: shaderc -Version: 2024.4 +Version: 2025.1 Release: %autorelease Summary: Collection of tools, libraries, and tests for Vulkan shader compilation diff --git a/sources b/sources index 42dc890..16a4a99 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (caa54d9779d5605aca4e1a0c0c962a3d8f4aeb31.tar.gz) = f7871571c708175e1f381fb8e9e108b498f9ce5de8273be91e7ebb123707335b02b26fd16960e90d6e8636b36c0c215b68ae55b88d6b7ad418f4c2a9a3a57ef6 +SHA512 (0968768c61d4eb7dd861114412e904bb3d59b7b6.tar.gz) = ab1d384f98384c79f708a68a0c01ac5daaf464d1b38f2c933e9a792b4e83375d0e76dbaab24c7f4c5756ce36882682c049ac2ec2f46c5fa1fdd6820b822fc20c \ No newline at end of file From 9a300b042aea89a986ec90539d6319219cc88469 Mon Sep 17 00:00:00 2001 From: Anusha Srivatsa Date: Mon, 12 May 2025 14:24:38 -0400 Subject: [PATCH 45/55] Update to SDK version v1.4.313.0 --- .gitignore | 1 + shaderc.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dce0b12..5fefba1 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /3ac03b8ad85a8e328a6182cddee8d05810bd5a2c.tar.gz /ff84893dd52d28f0b1737d2635733d952013bd9c.tar.gz /caa54d9779d5605aca4e1a0c0c962a3d8f4aeb31.tar.gz +/3362e24c42ab5bf7ad32c0fec64b0a0ddeb2fda1.tar.gz diff --git a/shaderc.spec b/shaderc.spec index 77aa040..c973fa9 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,8 +1,8 @@ # Glslang revision from packaged version -%global glslang_version 0968768c61d4eb7dd861114412e904bb3d59b7b6 +%global glslang_version 3362e24c42ab5bf7ad32c0fec64b0a0ddeb2fda1 Name: shaderc -Version: 2025.1 +Version: 2025.2 Release: %autorelease Summary: Collection of tools, libraries, and tests for Vulkan shader compilation diff --git a/sources b/sources index 16a4a99..eab0d79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (0968768c61d4eb7dd861114412e904bb3d59b7b6.tar.gz) = ab1d384f98384c79f708a68a0c01ac5daaf464d1b38f2c933e9a792b4e83375d0e76dbaab24c7f4c5756ce36882682c049ac2ec2f46c5fa1fdd6820b822fc20c \ No newline at end of file +SHA512 (3362e24c42ab5bf7ad32c0fec64b0a0ddeb2fda1.tar.gz) = 3af58c8b8fecd9a1c415c636a343f27e62593f00cc6f51ac745622cec136d4880c6e28b2ce35d1176196937256db8a6bef80dcfb76f5b7223e19c1887b689b30 From ebaa6f917545196a505e309e3be72aa872c91367 Mon Sep 17 00:00:00 2001 From: Anusha Srivatsa Date: Tue, 15 Jul 2025 16:57:29 -0500 Subject: [PATCH 46/55] Update to SDK v1.4.321.0 Signed-off-by: Anusha Srivatsa --- .gitignore | 1 + shaderc.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5fefba1..f709ac7 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /ff84893dd52d28f0b1737d2635733d952013bd9c.tar.gz /caa54d9779d5605aca4e1a0c0c962a3d8f4aeb31.tar.gz /3362e24c42ab5bf7ad32c0fec64b0a0ddeb2fda1.tar.gz +/8c2e602ce440b7739c95ff3d69cecb1adf6becda.tar.gz diff --git a/shaderc.spec b/shaderc.spec index c973fa9..5cc5cd4 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,8 +1,8 @@ # Glslang revision from packaged version -%global glslang_version 3362e24c42ab5bf7ad32c0fec64b0a0ddeb2fda1 +%global glslang_version 8c2e602ce440b7739c95ff3d69cecb1adf6becda Name: shaderc -Version: 2025.2 +Version: 2025.3 Release: %autorelease Summary: Collection of tools, libraries, and tests for Vulkan shader compilation diff --git a/sources b/sources index eab0d79..c962fbd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (3362e24c42ab5bf7ad32c0fec64b0a0ddeb2fda1.tar.gz) = 3af58c8b8fecd9a1c415c636a343f27e62593f00cc6f51ac745622cec136d4880c6e28b2ce35d1176196937256db8a6bef80dcfb76f5b7223e19c1887b689b30 +SHA512 (8c2e602ce440b7739c95ff3d69cecb1adf6becda.tar.gz) = 8fe92538aec412c2a0d5c2df15aac309fdae18809e41fe15c2536d35d3a7211d241a29c632cebcba25e7e7fbab51b46a8174c7d9e83b9b3e5a55b711457bb4aa From 778f507aee2e9f9d23743202c3b379ee8996626a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:12:48 +0000 Subject: [PATCH 47/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 98bfc81aebdd4468c5c91e617d69a76814f55cef Mon Sep 17 00:00:00 2001 From: Jocelyn Falempe Date: Wed, 3 Dec 2025 10:08:26 +0100 Subject: [PATCH 48/55] Update to sdk 1.4.328.1 Signed-off-by: Jocelyn Falempe --- .gitignore | 1 + shaderc.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f709ac7..3cbc295 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /caa54d9779d5605aca4e1a0c0c962a3d8f4aeb31.tar.gz /3362e24c42ab5bf7ad32c0fec64b0a0ddeb2fda1.tar.gz /8c2e602ce440b7739c95ff3d69cecb1adf6becda.tar.gz +/73743588fe9c39f2f1c780a087d94afac691a189.tar.gz diff --git a/shaderc.spec b/shaderc.spec index 5cc5cd4..397c337 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,8 +1,8 @@ # Glslang revision from packaged version -%global glslang_version 8c2e602ce440b7739c95ff3d69cecb1adf6becda +%global glslang_version 73743588fe9c39f2f1c780a087d94afac691a189 Name: shaderc -Version: 2025.3 +Version: 2025.4 Release: %autorelease Summary: Collection of tools, libraries, and tests for Vulkan shader compilation diff --git a/sources b/sources index c962fbd..f1d7822 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (8c2e602ce440b7739c95ff3d69cecb1adf6becda.tar.gz) = 8fe92538aec412c2a0d5c2df15aac309fdae18809e41fe15c2536d35d3a7211d241a29c632cebcba25e7e7fbab51b46a8174c7d9e83b9b3e5a55b711457bb4aa +SHA512 (73743588fe9c39f2f1c780a087d94afac691a189.tar.gz) = 14c90d57950b36b59cab2d67ba7235b6708a3b7bef617223b2552e0483f51114fafac05866e806a35e79a7ccbfc0aeb802a8ea5c56d6e9e1305acb93cd637e80 From 03213de09a6c646b2fc092b3d89afd668f229d2a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 17:57:42 +0000 Subject: [PATCH 49/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From b08e5bcfdcedfec1e85a334c0101ed285f63523a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Tue, 17 Feb 2026 11:00:13 +0100 Subject: [PATCH 50/55] Update to 1.4.341.0 SDK --- .gitignore | 1 + shaderc.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3cbc295..99bee39 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /3362e24c42ab5bf7ad32c0fec64b0a0ddeb2fda1.tar.gz /8c2e602ce440b7739c95ff3d69cecb1adf6becda.tar.gz /73743588fe9c39f2f1c780a087d94afac691a189.tar.gz +/301b4ede53d59b68bf55f95bb26412d9233c8187.tar.gz diff --git a/shaderc.spec b/shaderc.spec index 397c337..79cfe83 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,8 +1,8 @@ # Glslang revision from packaged version -%global glslang_version 73743588fe9c39f2f1c780a087d94afac691a189 +%global glslang_version 301b4ede53d59b68bf55f95bb26412d9233c8187 Name: shaderc -Version: 2025.4 +Version: 2026.1 Release: %autorelease Summary: Collection of tools, libraries, and tests for Vulkan shader compilation diff --git a/sources b/sources index f1d7822..7476cc2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (73743588fe9c39f2f1c780a087d94afac691a189.tar.gz) = 14c90d57950b36b59cab2d67ba7235b6708a3b7bef617223b2552e0483f51114fafac05866e806a35e79a7ccbfc0aeb802a8ea5c56d6e9e1305acb93cd637e80 +SHA512 (301b4ede53d59b68bf55f95bb26412d9233c8187.tar.gz) = de81f189417a452daef5466c4a679cc5c2dde364d90e6aed5a47d3a8dd2e6cb0cc5e367794489f144fd9bb56ccadf958d5a69eed50006175b3a3a9c59b615126 From 43567d2f46e479522cecafed0526dab25948a73d Mon Sep 17 00:00:00 2001 From: Anusha Srivatsa Date: Wed, 11 Mar 2026 15:16:00 -0600 Subject: [PATCH 51/55] Add packit config for sidetag group builds --- .packit.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..a8730e5 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,11 @@ +# packit config for shaderc +# Build Stage 4 - depends on glslang + +jobs: + - job: koji_build + trigger: commit | koji_build + dist_git_branches: + - fedora-all + sidetag_group: vulkan-sdk-releases + dependencies: + - glslang From 296e1ebf6d36a74effaaff7432e2cbb51fc3b351 Mon Sep 17 00:00:00 2001 From: Anusha Srivatsa Date: Tue, 26 May 2026 15:27:16 -0500 Subject: [PATCH 52/55] packit: add allowed_committers to enable build triggers v2: s/admins/committers Co-Authored-By: Claude Opus 4.6 --- .packit.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.packit.yaml b/.packit.yaml index a8730e5..b06c0a2 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -4,6 +4,7 @@ jobs: - job: koji_build trigger: commit | koji_build + allowed_committers: [all_committers] dist_git_branches: - fedora-all sidetag_group: vulkan-sdk-releases From 03bb69851267fc7fe5dc1b78aba1a8c248d89a66 Mon Sep 17 00:00:00 2001 From: Anusha Srivatsa Date: Wed, 27 May 2026 14:16:55 -0500 Subject: [PATCH 53/55] Update to 1.4.350.0 SDK --- .gitignore | 1 + shaderc.spec | 4 ++-- sources | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 99bee39..1054d07 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /8c2e602ce440b7739c95ff3d69cecb1adf6becda.tar.gz /73743588fe9c39f2f1c780a087d94afac691a189.tar.gz /301b4ede53d59b68bf55f95bb26412d9233c8187.tar.gz +/d5f08ae5c5a9a45165578445cbd0f9adf0223448.tar.gz diff --git a/shaderc.spec b/shaderc.spec index 79cfe83..35693ce 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,8 +1,8 @@ # Glslang revision from packaged version -%global glslang_version 301b4ede53d59b68bf55f95bb26412d9233c8187 +%global glslang_version d5f08ae5c5a9a45165578445cbd0f9adf0223448 Name: shaderc -Version: 2026.1 +Version: 2026.2 Release: %autorelease Summary: Collection of tools, libraries, and tests for Vulkan shader compilation diff --git a/sources b/sources index 7476cc2..618f369 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (301b4ede53d59b68bf55f95bb26412d9233c8187.tar.gz) = de81f189417a452daef5466c4a679cc5c2dde364d90e6aed5a47d3a8dd2e6cb0cc5e367794489f144fd9bb56ccadf958d5a69eed50006175b3a3a9c59b615126 +SHA512 (d5f08ae5c5a9a45165578445cbd0f9adf0223448.tar.gz) = 91223ef1c85a8e7a5dff8b220e816afe278830f9fb3f7a15e88fd814995b2ea453aaba0370d22102520e9c4acd375436ff79b2ddd6cdbf03aab72541523d5592 From a329a0be6f5666dfc7049fa2078340fd09fdaaf3 Mon Sep 17 00:00:00 2001 From: Anusha Srivatsa Date: Tue, 9 Jun 2026 17:22:16 -0500 Subject: [PATCH 54/55] packit: Use allowed_pr_authors instead of allowed_committers allowed_committers is meant for direct pushed. Switch to allowed_pr_authors so when a PR from fork gets submitted the author of the commit is checked and then the build is triggered. v2: Add packit configuration for bodhi updates to kick in once the last package is built. Signed-off-by: Anusha Srivatsa --- .packit.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.packit.yaml b/.packit.yaml index b06c0a2..1ce0fb0 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -5,8 +5,18 @@ jobs: - job: koji_build trigger: commit | koji_build allowed_committers: [all_committers] + allowed_pr_authors: ['asrivats','jexposit'] dist_git_branches: - fedora-all sidetag_group: vulkan-sdk-releases dependencies: - glslang + + - job: bodhi_update + trigger: koji_build + dist_git_branches: + - fedora-all + sidetag_group: vulkan-sdk-releases + dependencies: + - vulkan-validation-layers + - vulkan-tools From 7cfe9fc42504b4812593beff34aaf5b523fa83c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 06:27:51 +0000 Subject: [PATCH 55/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild