* [gentoo-commits] repo/gentoo:master commit in: media-gfx/renderdoc/files/
@ 2022-07-24 10:52 Matthew Smith
0 siblings, 0 replies; 4+ messages in thread
From: Matthew Smith @ 2022-07-24 10:52 UTC (permalink / raw
To: gentoo-commits
commit: b30c37c149c6123c40ee5bdc3a0d77a48b632605
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Jul 23 17:50:48 2022 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 10:40:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b30c37c1
media-gfx/renderdoc: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.11
Closes: https://github.com/gentoo/gentoo/pull/26541
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
.../files/renderdoc-1.18-system-glslang.patch | 210 ---------------------
1 file changed, 210 deletions(-)
diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-system-glslang.patch b/media-gfx/renderdoc/files/renderdoc-1.18-system-glslang.patch
deleted file mode 100644
index 12f6913002a0..000000000000
--- a/media-gfx/renderdoc/files/renderdoc-1.18-system-glslang.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-From 76052a739491c194e2d4aa3bace501083fb6c2a9 Mon Sep 17 00:00:00 2001
-From: Matthew Smith <matt@offtopica.uk>
-Date: Sun, 30 Jan 2022 17:19:47 +0000
-Subject: [PATCH 1/3] build: Use system glslang
-
-Requires -DGLSLANG_TARGET_DIR option.
----
- CMakeLists.txt | 11 +++
- renderdoc/CMakeLists.txt | 2 +-
- renderdoc/data/glsl_shaders.cpp | 2 +-
- renderdoc/driver/shaders/spirv/CMakeLists.txt | 91 +------------------
- .../driver/shaders/spirv/glslang_compile.cpp | 5 +-
- .../driver/shaders/spirv/spirv_compile.cpp | 4 +-
- 6 files changed, 19 insertions(+), 96 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 127cee3fd..cb0a2c7f6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -419,6 +419,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,
-diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
-index 9174afb2a..927e95fb9 100644
---- a/renderdoc/CMakeLists.txt
-+++ b/renderdoc/CMakeLists.txt
-@@ -580,7 +580,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 SPIRV)
-
- add_dependencies(renderdoc renderdoc_libentry)
-
-diff --git a/renderdoc/data/glsl_shaders.cpp b/renderdoc/data/glsl_shaders.cpp
-index d11cd0b88..d33f18099 100644
---- a/renderdoc/data/glsl_shaders.cpp
-+++ b/renderdoc/data/glsl_shaders.cpp
-@@ -26,7 +26,7 @@
- #include "common/common.h"
- #include "common/formatting.h"
- #include "driver/shaders/spirv/glslang_compile.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/Public/ShaderLang.h>
- #include "os/os_specific.h"
-
- #define GLSL_HEADERS(HEADER) \
-diff --git a/renderdoc/driver/shaders/spirv/CMakeLists.txt b/renderdoc/driver/shaders/spirv/CMakeLists.txt
-index 68229cd36..088645fbe 100644
---- a/renderdoc/driver/shaders/spirv/CMakeLists.txt
-+++ b/renderdoc/driver/shaders/spirv/CMakeLists.txt
-@@ -1,91 +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.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/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/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/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/Public/ShaderLang.h)
--
--if(UNIX)
-- list(APPEND glslang_sources
-- ${glslang_dir}/glslang/OSDependent/Unix/ossource.cpp)
--endif()
--
- set(sources
- glslang_compile.cpp
- glslang_compile.h
-@@ -108,8 +20,7 @@ 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)
-diff --git a/renderdoc/driver/shaders/spirv/glslang_compile.cpp b/renderdoc/driver/shaders/spirv/glslang_compile.cpp
-index ee1b02c73..ec0db8345 100644
---- a/renderdoc/driver/shaders/spirv/glslang_compile.cpp
-+++ b/renderdoc/driver/shaders/spirv/glslang_compile.cpp
-@@ -29,8 +29,8 @@
- #undef min
- #undef max
-
--#include "glslang/glslang/Include/Types.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/Include/Types.h>
-+#include <glslang/Public/ShaderLang.h>
-
- static bool glslang_inited = false;
- rdcarray<glslang::TShader *> *allocatedShaders = NULL;
-@@ -129,6 +129,7 @@ static TBuiltInResource DefaultResources = {
- /*.maxTaskWorkGroupSizeY_NV =*/1,
- /*.maxTaskWorkGroupSizeZ_NV =*/1,
- /*.maxMeshViewCountNV =*/4,
-+ /*.maxDualSourceDrawBuffersEXT =*/1,
-
- /*.limits*/
- {
-diff --git a/renderdoc/driver/shaders/spirv/spirv_compile.cpp b/renderdoc/driver/shaders/spirv/spirv_compile.cpp
-index a2cc2bec4..a494cc69d 100644
---- a/renderdoc/driver/shaders/spirv/spirv_compile.cpp
-+++ b/renderdoc/driver/shaders/spirv/spirv_compile.cpp
-@@ -31,8 +31,8 @@
- #undef min
- #undef max
-
--#include "glslang/SPIRV/GlslangToSpv.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/SPIRV/GlslangToSpv.h>
-+#include <glslang/Public/ShaderLang.h>
-
- rdcstr rdcspv::Compile(const rdcspv::CompilationSettings &settings, const rdcarray<rdcstr> &sources,
- rdcarray<uint32_t> &spirv)
---
-2.35.1
-
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/renderdoc/files/
@ 2024-03-03 19:23 Matthew Smith
0 siblings, 0 replies; 4+ messages in thread
From: Matthew Smith @ 2024-03-03 19:23 UTC (permalink / raw
To: gentoo-commits
commit: e7ee9b5616fab3ceafee09422c6ff1b8fe1eaf82
Author: Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 3 19:23:12 2024 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Sun Mar 3 19:23:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7ee9b56
media-gfx/renderdoc: remove unused patches
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
.../files/renderdoc-1.18-system-compress.patch | 142 -----------
.../files/renderdoc-1.22-r1-system-glslang.patch | 215 -----------------
.../files/renderdoc-1.29-r2-system-compress.patch | 144 -----------
.../files/renderdoc-1.29-r2-system-glslang.patch | 268 ---------------------
4 files changed, 769 deletions(-)
diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-system-compress.patch b/media-gfx/renderdoc/files/renderdoc-1.18-system-compress.patch
deleted file mode 100644
index 5b9a7472349b..000000000000
--- a/media-gfx/renderdoc/files/renderdoc-1.18-system-compress.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 8f16c974fc8ec0b286d803490baa6e00a83615cf Mon Sep 17 00:00:00 2001
-From: Matthew Smith <matt@offtopica.uk>
-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 SPIRV)
-+target_link_libraries(renderdoc ${RDOC_LIBRARIES} glslang 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 <list>
--#include "lz4/lz4.h"
-+#include <lz4.h>
- #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 <lz4.h>
- #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 <lz4.h>
- #include "streamio.h"
-
- class LZ4Compressor : public Compressor
---
-2.35.1
-
diff --git a/media-gfx/renderdoc/files/renderdoc-1.22-r1-system-glslang.patch b/media-gfx/renderdoc/files/renderdoc-1.22-r1-system-glslang.patch
deleted file mode 100644
index 7b5b88a53625..000000000000
--- a/media-gfx/renderdoc/files/renderdoc-1.22-r1-system-glslang.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 857c848b9..0423b3e3c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -448,6 +448,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,
-diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
-index a26438d76..9ee043959 100644
---- a/renderdoc/CMakeLists.txt
-+++ b/renderdoc/CMakeLists.txt
-@@ -601,7 +601,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 SPIRV)
-
- add_dependencies(renderdoc renderdoc_libentry)
-
-diff --git a/renderdoc/data/glsl_shaders.cpp b/renderdoc/data/glsl_shaders.cpp
-index dd79c1f89..5295fb05e 100644
---- a/renderdoc/data/glsl_shaders.cpp
-+++ b/renderdoc/data/glsl_shaders.cpp
-@@ -26,7 +26,7 @@
- #include "common/common.h"
- #include "common/formatting.h"
- #include "driver/shaders/spirv/glslang_compile.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/Public/ShaderLang.h>
- #include "os/os_specific.h"
-
- #define GLSL_HEADERS(HEADER) \
-diff --git a/renderdoc/driver/gl/gl_shader_refl.cpp b/renderdoc/driver/gl/gl_shader_refl.cpp
-index dfd871f32..57b5aeca6 100644
---- a/renderdoc/driver/gl/gl_shader_refl.cpp
-+++ b/renderdoc/driver/gl/gl_shader_refl.cpp
-@@ -26,7 +26,7 @@
- #include <algorithm>
- #include <functional>
- #include "driver/shaders/spirv/glslang_compile.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/Public/ShaderLang.h>
- #include "gl_driver.h"
-
- template <>
-diff --git a/renderdoc/driver/shaders/spirv/CMakeLists.txt b/renderdoc/driver/shaders/spirv/CMakeLists.txt
-index e5f2f4113..79525b5f6 100644
---- a/renderdoc/driver/shaders/spirv/CMakeLists.txt
-+++ b/renderdoc/driver/shaders/spirv/CMakeLists.txt
-@@ -1,91 +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.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/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/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/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/Public/ShaderLang.h)
--
--if(UNIX)
-- list(APPEND glslang_sources
-- ${glslang_dir}/glslang/OSDependent/Unix/ossource.cpp)
--endif()
--
- set(sources
- glslang_compile.cpp
- glslang_compile.h
-@@ -108,8 +20,7 @@ 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)
-diff --git a/renderdoc/driver/shaders/spirv/glslang_compile.cpp b/renderdoc/driver/shaders/spirv/glslang_compile.cpp
-index e2f1f2df8..fc0adab99 100644
---- a/renderdoc/driver/shaders/spirv/glslang_compile.cpp
-+++ b/renderdoc/driver/shaders/spirv/glslang_compile.cpp
-@@ -29,8 +29,8 @@
- #undef min
- #undef max
-
--#include "glslang/glslang/Include/Types.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/Include/Types.h>
-+#include <glslang/Public/ShaderLang.h>
-
- static bool glslang_inited = false;
- rdcarray<glslang::TShader *> *allocatedShaders = NULL;
-@@ -129,7 +129,16 @@ static TBuiltInResource DefaultResources = {
- /*.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,
- /*.limits*/
- {
- /*.limits.nonInductiveForLoops =*/1,
-diff --git a/renderdoc/driver/shaders/spirv/spirv_compile.cpp b/renderdoc/driver/shaders/spirv/spirv_compile.cpp
-index 8fbf2f16a..49bd322f4 100644
---- a/renderdoc/driver/shaders/spirv/spirv_compile.cpp
-+++ b/renderdoc/driver/shaders/spirv/spirv_compile.cpp
-@@ -31,8 +31,8 @@
- #undef min
- #undef max
-
--#include "glslang/SPIRV/GlslangToSpv.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/SPIRV/GlslangToSpv.h>
-+#include <glslang/Public/ShaderLang.h>
-
- rdcstr rdcspv::Compile(const rdcspv::CompilationSettings &settings, const rdcarray<rdcstr> &sources,
- rdcarray<uint32_t> &spirv)
diff --git a/media-gfx/renderdoc/files/renderdoc-1.29-r2-system-compress.patch b/media-gfx/renderdoc/files/renderdoc-1.29-r2-system-compress.patch
deleted file mode 100644
index 8f793562bcc7..000000000000
--- a/media-gfx/renderdoc/files/renderdoc-1.29-r2-system-compress.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From 8f16c974fc8ec0b286d803490baa6e00a83615cf Mon Sep 17 00:00:00 2001
-From: Matthew Smith <matt@offtopica.uk>
-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,9 +534,9 @@ 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)
- # Newer versions of glslang require C++17 for std::variant
- set_target_properties(renderdoc PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON)
-
- 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 <list>
--#include "lz4/lz4.h"
-+#include <lz4.h>
- #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 <lz4.h>
- #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 <lz4.h>
- #include "streamio.h"
-
- class LZ4Compressor : public Compressor
---
-2.35.1
-
diff --git a/media-gfx/renderdoc/files/renderdoc-1.29-r2-system-glslang.patch b/media-gfx/renderdoc/files/renderdoc-1.29-r2-system-glslang.patch
deleted file mode 100644
index 287917feb549..000000000000
--- a/media-gfx/renderdoc/files/renderdoc-1.29-r2-system-glslang.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-From d889c250f9e500c84f34533398e82aa9e5d5a0ae Mon Sep 17 00:00:00 2001
-From: Matthew Smith <matthew@gentoo.org>
-Date: Thu, 2 Nov 2023 18:43:42 +0000
-Subject: [PATCH] system glslang
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -383,7 +383,7 @@
- endif()
-
- if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-strict-aliasing")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
- if(ENABLE_GGP)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -gline-tables-only -fno-omit-frame-pointer")
-@@ -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,9 @@ 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)
-+# Newer versions of glslang require C++17 for std::variant
-+set_target_properties(renderdoc PROPERTIES CXX_STANDARD 17 CXX_STANDARD_REQUIRED ON)
-
- 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 <glslang/Public/ResourceLimits.h>
-+#include <glslang/Public/ShaderLang.h>
- #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 <algorithm>
- #include <functional>
- #include "driver/shaders/spirv/glslang_compile.h"
--#include "glslang/glslang/Public/ResourceLimits.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/Public/ResourceLimits.h>
-+#include <glslang/Public/ShaderLang.h>
- #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 <glslang/Public/ResourceLimits.h>
-+#include <glslang/Include/Types.h>
-+#include <glslang/Public/ShaderLang.h>
-
- static bool glslang_inited = false;
- rdcarray<glslang::TShader *> *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 <glslang/Public/ResourceLimits.h>
-+#include <glslang/SPIRV/GlslangToSpv.h>
-+#include <glslang/Public/ShaderLang.h>
-
- rdcstr rdcspv::Compile(const rdcspv::CompilationSettings &settings, const rdcarray<rdcstr> &sources,
- rdcarray<uint32_t> &spirv)
---- a/qrenderdoc/Code/pyrenderdoc/CMakeLists.txt
-+++ b/qrenderdoc/Code/pyrenderdoc/CMakeLists.txt
-@@ -1,11 +1,3 @@
--# Build as C++14 for the python bindings template-fu
--if (CMAKE_VERSION VERSION_LESS "3.1")
-- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
--else ()
-- set (CMAKE_CXX_STANDARD 14)
-- set (CMAKE_CXX_STANDARD_REQUIRED ON)
--endif ()
--
- # include paths for qrenderdoc, the internal renderdoc API, and Python
- set(MODULE_INCLUDES
- PRIVATE ${CMAKE_SOURCE_DIR}/qrenderdoc
-@@ -82,3 +74,5 @@
- # Make sure we build after the wrappers are generated
- add_dependencies(_renderdoc swig-bindings)
- add_dependencies(_qrenderdoc swig-bindings)
-+
-+set_target_properties(_renderdoc _qrenderdoc PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED ON)
---
-2.42.0
-
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/renderdoc/files/
@ 2023-03-01 11:40 Matthew Smith
0 siblings, 0 replies; 4+ messages in thread
From: Matthew Smith @ 2023-03-01 11:40 UTC (permalink / raw
To: gentoo-commits
commit: 313b8a15f5cffbbc421f1649aadde45f49576c93
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Feb 27 19:26:14 2023 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Wed Mar 1 11:20:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=313b8a15
media-gfx/renderdoc: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29841
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
.../renderdoc/files/renderdoc-1.18-env-home.patch | 26 ---
.../files/renderdoc-1.20-system-glslang.patch | 197 ---------------------
2 files changed, 223 deletions(-)
diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-env-home.patch b/media-gfx/renderdoc/files/renderdoc-1.18-env-home.patch
deleted file mode 100644
index 94ec9a9bbf14..000000000000
--- a/media-gfx/renderdoc/files/renderdoc-1.18-env-home.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 1a9c1bc02d2ed1b8e1723750d8e9eb9fa92fddef Mon Sep 17 00:00:00 2001
-From: Matthew Smith <matt@offtopica.uk>
-Date: Thu, 10 Feb 2022 18:02:37 +0000
-Subject: [PATCH] Use getenv("HOME") instead of getpwuid
-
----
- renderdoc/os/posix/linux/linux_stringio.cpp | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/renderdoc/os/posix/linux/linux_stringio.cpp b/renderdoc/os/posix/linux/linux_stringio.cpp
-index c704fc7fc..9a556ec16 100644
---- a/renderdoc/os/posix/linux/linux_stringio.cpp
-+++ b/renderdoc/os/posix/linux/linux_stringio.cpp
-@@ -595,8 +595,7 @@ rdcstr GetTempRootPath()
-
- rdcstr GetAppFolderFilename(const rdcstr &filename)
- {
-- passwd *pw = getpwuid(getuid());
-- const char *homedir = pw->pw_dir;
-+ const char *homedir = getenv("HOME");
-
- rdcstr ret = rdcstr(homedir) + "/.renderdoc/";
-
---
-2.35.1
-
diff --git a/media-gfx/renderdoc/files/renderdoc-1.20-system-glslang.patch b/media-gfx/renderdoc/files/renderdoc-1.20-system-glslang.patch
deleted file mode 100644
index be808131c362..000000000000
--- a/media-gfx/renderdoc/files/renderdoc-1.20-system-glslang.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From 70442b7a3952350429872e95d843374f0aaa6a2f Mon Sep 17 00:00:00 2001
-From: Matthew Smith <matthew@gentoo.org>
-Date: Sun, 30 Jan 2022 17:19:47 +0000
-Subject: [PATCH] build: Use system glslang
-
-Requires -DGLSLANG_TARGET_DIR option.
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -437,6 +437,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
-@@ -595,7 +595,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 SPIRV)
-
- add_dependencies(renderdoc renderdoc_libentry)
-
---- a/renderdoc/data/glsl_shaders.cpp
-+++ b/renderdoc/data/glsl_shaders.cpp
-@@ -26,7 +26,7 @@
- #include "common/common.h"
- #include "common/formatting.h"
- #include "driver/shaders/spirv/glslang_compile.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/Public/ShaderLang.h>
- #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,7 +26,7 @@
- #include <algorithm>
- #include <functional>
- #include "driver/shaders/spirv/glslang_compile.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/Public/ShaderLang.h>
- #include "gl_driver.h"
-
- template <>
---- a/renderdoc/driver/shaders/spirv/CMakeLists.txt
-+++ b/renderdoc/driver/shaders/spirv/CMakeLists.txt
-@@ -1,91 +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.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/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/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/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/Public/ShaderLang.h)
--
--if(UNIX)
-- list(APPEND glslang_sources
-- ${glslang_dir}/glslang/OSDependent/Unix/ossource.cpp)
--endif()
--
- set(sources
- glslang_compile.cpp
- glslang_compile.h
-@@ -108,8 +20,7 @@ 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)
---- a/renderdoc/driver/shaders/spirv/glslang_compile.cpp
-+++ b/renderdoc/driver/shaders/spirv/glslang_compile.cpp
-@@ -29,8 +29,8 @@
- #undef min
- #undef max
-
--#include "glslang/glslang/Include/Types.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/Include/Types.h>
-+#include <glslang/Public/ShaderLang.h>
-
- static bool glslang_inited = false;
- rdcarray<glslang::TShader *> *allocatedShaders = NULL;
-@@ -129,6 +129,7 @@ static TBuiltInResource DefaultResources = {
- /*.maxTaskWorkGroupSizeY_NV =*/1,
- /*.maxTaskWorkGroupSizeZ_NV =*/1,
- /*.maxMeshViewCountNV =*/4,
-+ /*.maxDualSourceDrawBuffersEXT =*/1,
-
- /*.limits*/
- {
---- a/renderdoc/driver/shaders/spirv/spirv_compile.cpp
-+++ b/renderdoc/driver/shaders/spirv/spirv_compile.cpp
-@@ -31,8 +31,8 @@
- #undef min
- #undef max
-
--#include "glslang/SPIRV/GlslangToSpv.h"
--#include "glslang/glslang/Public/ShaderLang.h"
-+#include <glslang/SPIRV/GlslangToSpv.h>
-+#include <glslang/Public/ShaderLang.h>
-
- rdcstr rdcspv::Compile(const rdcspv::CompilationSettings &settings, const rdcarray<rdcstr> &sources,
- rdcarray<uint32_t> &spirv)
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-gfx/renderdoc/files/
@ 2022-07-15 20:47 Matthew Smith
0 siblings, 0 replies; 4+ messages in thread
From: Matthew Smith @ 2022-07-15 20:47 UTC (permalink / raw
To: gentoo-commits
commit: 36841780c9d66e2351366cb39d2196ece2fd53bc
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Jul 15 18:31:24 2022 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 20:44:34 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36841780
media-gfx/renderdoc: remove unused patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/26426
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
.../files/renderdoc-1.18-check-api-ver.patch | 50 ----------------------
1 file changed, 50 deletions(-)
diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-check-api-ver.patch b/media-gfx/renderdoc/files/renderdoc-1.18-check-api-ver.patch
deleted file mode 100644
index a6af5645d14b..000000000000
--- a/media-gfx/renderdoc/files/renderdoc-1.18-check-api-ver.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 3d49524da4a28ecc1ee1a9b3f9ec455fc0263c81 Mon Sep 17 00:00:00 2001
-From: baldurk <baldurk@baldurk.org>
-Date: Mon, 31 Jan 2022 19:28:08 +0000
-Subject: [PATCH] Don't enable functionality not supported by the current
- physical device
-
----
- .../driver/vulkan/wrappers/vk_device_funcs.cpp | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
-index 4d342e0123..a40c52d6ef 100644
---- a/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
-+++ b/renderdoc/driver/vulkan/wrappers/vk_device_funcs.cpp
-@@ -3171,7 +3171,7 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi
- VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_KHR,
- };
-
-- if(physProps.apiVersion >= VK_MAKE_VERSION(1, 2, 0))
-+ if(RDCMIN(m_EnabledExtensions.vulkanVersion, physProps.apiVersion) >= VK_MAKE_VERSION(1, 2, 0))
- {
- VkPhysicalDeviceVulkan12Features avail12Features = {
- VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES,
-@@ -3376,11 +3376,13 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi
-
- CheckDeviceExts();
-
-+ uint32_t effectiveApiVersion = RDCMIN(m_EnabledExtensions.vulkanVersion, physProps.apiVersion);
-+
- #undef CheckExt
--#define CheckExt(name, ver) \
-- if(!strcmp(createInfo.ppEnabledExtensionNames[i], "VK_" #name) || physProps.apiVersion >= ver) \
-- { \
-- m_EnabledExtensions.ext_##name = true; \
-+#define CheckExt(name, ver) \
-+ if(!strcmp(createInfo.ppEnabledExtensionNames[i], "VK_" #name) || effectiveApiVersion >= ver) \
-+ { \
-+ m_EnabledExtensions.ext_##name = true; \
- }
-
- for(uint32_t i = 0; i < createInfo.enabledExtensionCount; i++)
-@@ -3391,7 +3393,7 @@ bool WrappedVulkan::Serialise_vkCreateDevice(SerialiserType &ser, VkPhysicalDevi
- // for cases where a promoted extension isn't supported as the extension itself, manually
- // disable them when the feature bit is false.
-
-- if(physProps.apiVersion >= VK_MAKE_VERSION(1, 2, 0))
-+ if(effectiveApiVersion >= VK_MAKE_VERSION(1, 2, 0))
- {
- if(supportedExtensions.find(VK_KHR_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME) ==
- supportedExtensions.end() &&
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-03-03 19:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-24 10:52 [gentoo-commits] repo/gentoo:master commit in: media-gfx/renderdoc/files/ Matthew Smith
-- strict thread matches above, loose matches on Subject: below --
2024-03-03 19:23 Matthew Smith
2023-03-01 11:40 Matthew Smith
2022-07-15 20:47 Matthew Smith
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox