summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2023-02-27 20:26:14 +0100
committerMatthew Smith <matthew@gentoo.org>2023-03-01 11:20:25 +0000
commit313b8a15f5cffbbc421f1649aadde45f49576c93 (patch)
tree22cc7626f47966ce34030c0869c9001f5a665fff /media-gfx/renderdoc/files
parentapp-crypt/certbot-dns-dnsimple: enable py3.11 (diff)
downloadgentoo-313b8a15f5cffbbc421f1649aadde45f49576c93.tar.gz
gentoo-313b8a15f5cffbbc421f1649aadde45f49576c93.tar.bz2
gentoo-313b8a15f5cffbbc421f1649aadde45f49576c93.zip
media-gfx/renderdoc: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/29841 Signed-off-by: Matthew Smith <matthew@gentoo.org>
Diffstat (limited to 'media-gfx/renderdoc/files')
-rw-r--r--media-gfx/renderdoc/files/renderdoc-1.18-env-home.patch26
-rw-r--r--media-gfx/renderdoc/files/renderdoc-1.20-system-glslang.patch197
2 files changed, 0 insertions, 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)