From 1615d14d4de4360b2241ce5cd8a84157cc86cde0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 2 Nov 2023 21:51:21 +0000 Subject: gentoo auto-resync : 02:11:2023 - 21:51:21 --- .../files/renderdoc-1.29-system-compress.patch | 142 ++++++++++++ .../files/renderdoc-1.29-system-glslang.patch | 237 +++++++++++++++++++++ 2 files changed, 379 insertions(+) create mode 100644 media-gfx/renderdoc/files/renderdoc-1.29-system-compress.patch create mode 100644 media-gfx/renderdoc/files/renderdoc-1.29-system-glslang.patch (limited to 'media-gfx/renderdoc/files') diff --git a/media-gfx/renderdoc/files/renderdoc-1.29-system-compress.patch b/media-gfx/renderdoc/files/renderdoc-1.29-system-compress.patch new file mode 100644 index 000000000000..967d300b29d5 --- /dev/null +++ b/media-gfx/renderdoc/files/renderdoc-1.29-system-compress.patch @@ -0,0 +1,142 @@ +From 8f16c974fc8ec0b286d803490baa6e00a83615cf Mon Sep 17 00:00:00 2001 +From: Matthew Smith +Date: Sun, 30 Jan 2022 18:07:51 +0000 +Subject: [PATCH 2/3] build: Use system compression libs + +--- + CMakeLists.txt | 6 +++ + renderdoc/CMakeLists.txt | 48 +------------------ + renderdoc/core/replay_proxy.cpp | 2 +- + .../driver/shaders/dxbc/dxbc_container.cpp | 2 +- + renderdoc/serialise/lz4io.h | 2 +- + 5 files changed, 10 insertions(+), 50 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cb0a2c7f6..0ee4fc629 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -419,6 +419,12 @@ elseif(UNIX) + endif() + endif() + ++find_package(PkgConfig REQUIRED) ++find_package(miniz REQUIRED CONFIG) ++ ++pkg_check_modules(lz4 REQUIRED IMPORTED_TARGET liblz4) ++pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd) ++ + # glslang package does not export a -config.cmake file. + option(GLSLANG_TARGET_DIR "Absolute path to glslangTargets.cmake directory") + include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") +diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt +index 927e95fb9..5908be6de 100644 +--- a/renderdoc/CMakeLists.txt ++++ b/renderdoc/CMakeLists.txt +@@ -218,56 +218,10 @@ set(sources + 3rdparty/pugixml/pugixml.cpp + 3rdparty/pugixml/pugixml.hpp + 3rdparty/pugixml/pugiconfig.hpp +- 3rdparty/lz4/lz4.c +- 3rdparty/lz4/lz4.h + 3rdparty/md5/md5.c + 3rdparty/md5/md5.h +- 3rdparty/miniz/miniz.c +- 3rdparty/miniz/miniz.h + 3rdparty/superluminal/superluminal.cpp + 3rdparty/superluminal/superluminal.h +- 3rdparty/zstd/bitstream.h +- 3rdparty/zstd/compiler.h +- 3rdparty/zstd/cpu.h +- 3rdparty/zstd/debug.c +- 3rdparty/zstd/debug.h +- 3rdparty/zstd/entropy_common.c +- 3rdparty/zstd/error_private.c +- 3rdparty/zstd/error_private.h +- 3rdparty/zstd/fse.h +- 3rdparty/zstd/fse_compress.c +- 3rdparty/zstd/fse_decompress.c +- 3rdparty/zstd/hist.c +- 3rdparty/zstd/hist.h +- 3rdparty/zstd/huf.h +- 3rdparty/zstd/huf_compress.c +- 3rdparty/zstd/huf_decompress.c +- 3rdparty/zstd/mem.h +- 3rdparty/zstd/pool.c +- 3rdparty/zstd/pool.h +- 3rdparty/zstd/threading.c +- 3rdparty/zstd/threading.h +- 3rdparty/zstd/xxhash.c +- 3rdparty/zstd/xxhash.h +- 3rdparty/zstd/zstd.h +- 3rdparty/zstd/zstd_common.c +- 3rdparty/zstd/zstd_compress.c +- 3rdparty/zstd/zstd_compress_internal.h +- 3rdparty/zstd/zstd_decompress.c +- 3rdparty/zstd/zstd_double_fast.c +- 3rdparty/zstd/zstd_double_fast.h +- 3rdparty/zstd/zstd_errors.h +- 3rdparty/zstd/zstd_fast.c +- 3rdparty/zstd/zstd_fast.h +- 3rdparty/zstd/zstd_internal.h +- 3rdparty/zstd/zstd_lazy.c +- 3rdparty/zstd/zstd_lazy.h +- 3rdparty/zstd/zstd_ldm.c +- 3rdparty/zstd/zstd_ldm.h +- 3rdparty/zstd/zstd_opt.c +- 3rdparty/zstd/zstd_opt.h +- 3rdparty/zstd/zstdmt_compress.c +- 3rdparty/zstd/zstdmt_compress.h + 3rdparty/stb/stb_image.h + 3rdparty/stb/stb_image_write.h + 3rdparty/stb/stb_image_resize.h +@@ -580,7 +534,7 @@ endif() + add_library(renderdoc SHARED ${renderdoc_objects}) + target_compile_definitions(renderdoc ${RDOC_DEFINITIONS}) + target_include_directories(renderdoc ${RDOC_INCLUDES}) +-target_link_libraries(renderdoc ${RDOC_LIBRARIES} glslang glslang-default-resource-limits SPIRV) ++target_link_libraries(renderdoc ${RDOC_LIBRARIES} glslang glslang-default-resource-limits miniz::miniz PkgConfig::lz4 PkgConfig::zstd SPIRV) + + add_dependencies(renderdoc renderdoc_libentry) + +diff --git a/renderdoc/core/replay_proxy.cpp b/renderdoc/core/replay_proxy.cpp +index dea1e86cf..c9362e797 100644 +--- a/renderdoc/core/replay_proxy.cpp ++++ b/renderdoc/core/replay_proxy.cpp +@@ -25,7 +25,7 @@ + + #include "replay_proxy.h" + #include +-#include "lz4/lz4.h" ++#include + #include "replay/dummy_driver.h" + #include "serialise/lz4io.h" + +diff --git a/renderdoc/driver/shaders/dxbc/dxbc_container.cpp b/renderdoc/driver/shaders/dxbc/dxbc_container.cpp +index ede1fdeb7..0c8fd4dfe 100644 +--- a/renderdoc/driver/shaders/dxbc/dxbc_container.cpp ++++ b/renderdoc/driver/shaders/dxbc/dxbc_container.cpp +@@ -29,7 +29,7 @@ + #include "common/common.h" + #include "core/settings.h" + #include "driver/shaders/dxil/dxil_bytecode.h" +-#include "lz4/lz4.h" ++#include + #include "md5/md5.h" + #include "serialise/serialiser.h" + #include "strings/string_utils.h" +diff --git a/renderdoc/serialise/lz4io.h b/renderdoc/serialise/lz4io.h +index 199fbbbc1..80fdf94f2 100644 +--- a/renderdoc/serialise/lz4io.h ++++ b/renderdoc/serialise/lz4io.h +@@ -24,7 +24,7 @@ + + #pragma once + +-#include "lz4/lz4.h" ++#include + #include "streamio.h" + + class LZ4Compressor : public Compressor +-- +2.35.1 + diff --git a/media-gfx/renderdoc/files/renderdoc-1.29-system-glslang.patch b/media-gfx/renderdoc/files/renderdoc-1.29-system-glslang.patch new file mode 100644 index 000000000000..4e7934928ef7 --- /dev/null +++ b/media-gfx/renderdoc/files/renderdoc-1.29-system-glslang.patch @@ -0,0 +1,237 @@ +From d889c250f9e500c84f34533398e82aa9e5d5a0ae Mon Sep 17 00:00:00 2001 +From: Matthew Smith +Date: Thu, 2 Nov 2023 18:43:42 +0000 +Subject: [PATCH] system glslang + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -469,6 +469,17 @@ elseif(UNIX) + endif() + endif() + ++# glslang package does not export a -config.cmake file. ++option(GLSLANG_TARGET_DIR "Absolute path to glslangTargets.cmake directory") ++include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") ++include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake") ++include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") ++include("${GLSLANG_TARGET_DIR}/glslangTargets.cmake") ++include("${GLSLANG_TARGET_DIR}/SPIRVTargets.cmake") ++if(NOT TARGET glslang OR NOT TARGET SPIRV) ++ message(FATAL_ERROR "glslang or SPIRV target not found") ++endif() ++ + add_subdirectory(renderdoc) + + # these variables are handled within the CMakeLists.txt in qrenderdoc, +--- a/renderdoc/CMakeLists.txt ++++ b/renderdoc/CMakeLists.txt +@@ -604,7 +604,7 @@ endif() + add_library(renderdoc SHARED ${renderdoc_objects}) + target_compile_definitions(renderdoc ${RDOC_DEFINITIONS}) + target_include_directories(renderdoc ${RDOC_INCLUDES}) +-target_link_libraries(renderdoc ${RDOC_LIBRARIES}) ++target_link_libraries(renderdoc ${RDOC_LIBRARIES} glslang glslang-default-resource-limits SPIRV) + + add_dependencies(renderdoc renderdoc_libentry) + +--- a/renderdoc/data/glsl_shaders.cpp ++++ b/renderdoc/data/glsl_shaders.cpp +@@ -26,8 +26,8 @@ + #include "common/common.h" + #include "common/formatting.h" + #include "driver/shaders/spirv/glslang_compile.h" +-#include "glslang/glslang/Public/ResourceLimits.h" +-#include "glslang/glslang/Public/ShaderLang.h" ++#include ++#include + #include "os/os_specific.h" + + #define GLSL_HEADERS(HEADER) \ +--- a/renderdoc/driver/gl/gl_shader_refl.cpp ++++ b/renderdoc/driver/gl/gl_shader_refl.cpp +@@ -26,8 +26,8 @@ + #include + #include + #include "driver/shaders/spirv/glslang_compile.h" +-#include "glslang/glslang/Public/ResourceLimits.h" +-#include "glslang/glslang/Public/ShaderLang.h" ++#include ++#include + #include "gl_driver.h" + + template <> +--- a/renderdoc/driver/shaders/spirv/CMakeLists.txt ++++ b/renderdoc/driver/shaders/spirv/CMakeLists.txt +@@ -1,98 +1,3 @@ +-set(glslang_dir ${RDOC_SOURCE_DIR}/3rdparty/glslang) +-set(glslang_sources +- ${glslang_dir}/OGLCompilersDLL/InitializeDll.cpp +- ${glslang_dir}/OGLCompilersDLL/InitializeDll.h +- ${glslang_dir}/SPIRV/GlslangToSpv.cpp +- ${glslang_dir}/SPIRV/GlslangToSpv.h +- ${glslang_dir}/SPIRV/GLSL.std.450.h +- ${glslang_dir}/SPIRV/GLSL.ext.ARM.h +- ${glslang_dir}/SPIRV/GLSL.ext.AMD.h +- ${glslang_dir}/SPIRV/GLSL.ext.EXT.h +- ${glslang_dir}/SPIRV/GLSL.ext.KHR.h +- ${glslang_dir}/SPIRV/GLSL.ext.NV.h +- ${glslang_dir}/SPIRV/NonSemanticDebugPrintf.h +- ${glslang_dir}/SPIRV/NonSemanticShaderDebugInfo100.h +- ${glslang_dir}/SPIRV/hex_float.h +- ${glslang_dir}/SPIRV/InReadableOrder.cpp +- ${glslang_dir}/SPIRV/Logger.cpp +- ${glslang_dir}/SPIRV/Logger.h +- ${glslang_dir}/SPIRV/SpvBuilder.cpp +- ${glslang_dir}/SPIRV/SpvBuilder.h +- ${glslang_dir}/SPIRV/SpvTools.cpp +- ${glslang_dir}/SPIRV/SpvTools.h +- ${glslang_dir}/SPIRV/SpvPostProcess.cpp +- ${glslang_dir}/SPIRV/spvIR.h +- ${glslang_dir}/glslang/GenericCodeGen/CodeGen.cpp +- ${glslang_dir}/glslang/GenericCodeGen/Link.cpp +- ${glslang_dir}/glslang/Include/arrays.h +- ${glslang_dir}/glslang/Include/BaseTypes.h +- ${glslang_dir}/glslang/Include/Common.h +- ${glslang_dir}/glslang/Include/ConstantUnion.h +- ${glslang_dir}/glslang/Include/InfoSink.h +- ${glslang_dir}/glslang/Include/InitializeGlobals.h +- ${glslang_dir}/glslang/Include/intermediate.h +- ${glslang_dir}/glslang/Include/PoolAlloc.h +- ${glslang_dir}/glslang/Include/ResourceLimits.h +- ${glslang_dir}/glslang/Include/SpirvIntrinsics.h +- ${glslang_dir}/glslang/Include/revision.h +- ${glslang_dir}/glslang/Include/ShHandle.h +- ${glslang_dir}/glslang/Include/Types.h +- ${glslang_dir}/glslang/MachineIndependent/Constant.cpp +- ${glslang_dir}/glslang/MachineIndependent/glslang_tab.cpp +- ${glslang_dir}/glslang/MachineIndependent/glslang_tab.cpp.h +- ${glslang_dir}/glslang/MachineIndependent/gl_types.h +- ${glslang_dir}/glslang/MachineIndependent/iomapper.cpp +- ${glslang_dir}/glslang/MachineIndependent/iomapper.h +- ${glslang_dir}/glslang/MachineIndependent/gl_types.h +- ${glslang_dir}/glslang/MachineIndependent/InfoSink.cpp +- ${glslang_dir}/glslang/MachineIndependent/Initialize.cpp +- ${glslang_dir}/glslang/MachineIndependent/Initialize.h +- ${glslang_dir}/glslang/MachineIndependent/Intermediate.cpp +- ${glslang_dir}/glslang/MachineIndependent/intermOut.cpp +- ${glslang_dir}/glslang/MachineIndependent/IntermTraverse.cpp +- ${glslang_dir}/glslang/MachineIndependent/limits.cpp +- ${glslang_dir}/glslang/MachineIndependent/linkValidate.cpp +- ${glslang_dir}/glslang/MachineIndependent/LiveTraverser.h +- ${glslang_dir}/glslang/MachineIndependent/localintermediate.h +- ${glslang_dir}/glslang/MachineIndependent/parseConst.cpp +- ${glslang_dir}/glslang/MachineIndependent/ParseContextBase.cpp +- ${glslang_dir}/glslang/MachineIndependent/ParseHelper.cpp +- ${glslang_dir}/glslang/MachineIndependent/ParseHelper.h +- ${glslang_dir}/glslang/MachineIndependent/PoolAlloc.cpp +- ${glslang_dir}/glslang/MachineIndependent/propagateNoContraction.cpp +- ${glslang_dir}/glslang/MachineIndependent/propagateNoContraction.h +- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpAtom.cpp +- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpContext.cpp +- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpContext.h +- ${glslang_dir}/glslang/MachineIndependent/preprocessor/Pp.cpp +- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpScanner.cpp +- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpTokens.cpp +- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpTokens.h +- ${glslang_dir}/glslang/MachineIndependent/reflection.cpp +- ${glslang_dir}/glslang/MachineIndependent/reflection.h +- ${glslang_dir}/glslang/MachineIndependent/RemoveTree.cpp +- ${glslang_dir}/glslang/MachineIndependent/RemoveTree.h +- ${glslang_dir}/glslang/MachineIndependent/ScanContext.h +- ${glslang_dir}/glslang/MachineIndependent/Scan.cpp +- ${glslang_dir}/glslang/MachineIndependent/Scan.h +- ${glslang_dir}/glslang/MachineIndependent/ShaderLang.cpp +- ${glslang_dir}/glslang/MachineIndependent/SpirvIntrinsics.cpp +- ${glslang_dir}/glslang/MachineIndependent/SymbolTable.cpp +- ${glslang_dir}/glslang/MachineIndependent/SymbolTable.h +- ${glslang_dir}/glslang/MachineIndependent/Versions.cpp +- ${glslang_dir}/glslang/MachineIndependent/Versions.h +- ${glslang_dir}/glslang/MachineIndependent/attribute.cpp +- ${glslang_dir}/glslang/MachineIndependent/attribute.h +- ${glslang_dir}/glslang/OSDependent/osinclude.h +- ${glslang_dir}/glslang/ResourceLimits/ResourceLimits.cpp +- ${glslang_dir}/glslang/Public/ShaderLang.h +- ${glslang_dir}/glslang/Public/ResourceLimits.h) +- +-if(UNIX) +- list(APPEND glslang_sources +- ${glslang_dir}/glslang/OSDependent/Unix/ossource.cpp) +-endif() +- + set(sources + glslang_compile.cpp + glslang_compile.h +@@ -115,38 +20,20 @@ set(sources + spirv_processor.h + spirv_disassemble.cpp + spirv_stringise.cpp +- var_dispatch_helpers.h +- ${glslang_sources}) ++ var_dispatch_helpers.h) + + add_definitions(-DAMD_EXTENSIONS) + add_definitions(-DNV_EXTENSIONS) + +-set_property(SOURCE ${glslang_sources} +- PROPERTY COMPILE_FLAGS "-Wno-ignored-qualifiers -Wno-strict-aliasing -Wno-unreachable-code-break") +- +-# GCC 7.0 and above needs -Wno-implicit-fallthrough +-if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.9) +- set_property(SOURCE ${glslang_sources} +- APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-implicit-fallthrough") +-endif() +- + if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +- set_property(SOURCE ${glslang_sources} +- APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-unknown-warning-option -Wno-shadow -Wno-shorten-64-to-32") +- + set_property(SOURCE + spirv_debug.cpp + spirv_debug_glsl450.cpp + spirv_debug_setup.cpp + spirv_processor.cpp + APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-shadow -Wno-shorten-64-to-32") +- +- if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.9) +- set_property(SOURCE ${glslang_dir}/glslang/MachineIndependent/iomapper.cpp +- APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-deprecated-copy") +- endif() + endif() + + add_library(rdoc_spirv OBJECT ${sources}) + target_compile_definitions(rdoc_spirv ${RDOC_DEFINITIONS}) +-target_include_directories(rdoc_spirv ${RDOC_INCLUDES} ${glslang_dir}) ++target_include_directories(rdoc_spirv ${RDOC_INCLUDES}) +--- a/renderdoc/driver/shaders/spirv/glslang_compile.cpp ++++ b/renderdoc/driver/shaders/spirv/glslang_compile.cpp +@@ -29,9 +29,9 @@ + #undef min + #undef max + +-#include "glslang/glslang/Include/Types.h" +-#include "glslang/glslang/Public/ResourceLimits.h" +-#include "glslang/glslang/Public/ShaderLang.h" ++#include ++#include ++#include + + static bool glslang_inited = false; + rdcarray *allocatedShaders = NULL; +--- a/renderdoc/driver/shaders/spirv/spirv_compile.cpp ++++ b/renderdoc/driver/shaders/spirv/spirv_compile.cpp +@@ -31,9 +31,9 @@ + #undef min + #undef max + +-#include "glslang/SPIRV/GlslangToSpv.h" +-#include "glslang/glslang/Public/ResourceLimits.h" +-#include "glslang/glslang/Public/ShaderLang.h" ++#include ++#include ++#include + + rdcstr rdcspv::Compile(const rdcspv::CompilationSettings &settings, const rdcarray &sources, + rdcarray &spirv) +-- +2.42.0 + -- cgit v1.2.3