1 |
commit: 313b8a15f5cffbbc421f1649aadde45f49576c93 |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Mon Feb 27 19:26:14 2023 +0000 |
4 |
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 1 11:20:25 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=313b8a15 |
7 |
|
8 |
media-gfx/renderdoc: remove unused patches |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/29841 |
12 |
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org> |
13 |
|
14 |
.../renderdoc/files/renderdoc-1.18-env-home.patch | 26 --- |
15 |
.../files/renderdoc-1.20-system-glslang.patch | 197 --------------------- |
16 |
2 files changed, 223 deletions(-) |
17 |
|
18 |
diff --git a/media-gfx/renderdoc/files/renderdoc-1.18-env-home.patch b/media-gfx/renderdoc/files/renderdoc-1.18-env-home.patch |
19 |
deleted file mode 100644 |
20 |
index 94ec9a9bbf14..000000000000 |
21 |
--- a/media-gfx/renderdoc/files/renderdoc-1.18-env-home.patch |
22 |
+++ /dev/null |
23 |
@@ -1,26 +0,0 @@ |
24 |
-From 1a9c1bc02d2ed1b8e1723750d8e9eb9fa92fddef Mon Sep 17 00:00:00 2001 |
25 |
-From: Matthew Smith <matt@×××××××××.uk> |
26 |
-Date: Thu, 10 Feb 2022 18:02:37 +0000 |
27 |
-Subject: [PATCH] Use getenv("HOME") instead of getpwuid |
28 |
- |
29 |
---- |
30 |
- renderdoc/os/posix/linux/linux_stringio.cpp | 3 +-- |
31 |
- 1 file changed, 1 insertion(+), 2 deletions(-) |
32 |
- |
33 |
-diff --git a/renderdoc/os/posix/linux/linux_stringio.cpp b/renderdoc/os/posix/linux/linux_stringio.cpp |
34 |
-index c704fc7fc..9a556ec16 100644 |
35 |
---- a/renderdoc/os/posix/linux/linux_stringio.cpp |
36 |
-+++ b/renderdoc/os/posix/linux/linux_stringio.cpp |
37 |
-@@ -595,8 +595,7 @@ rdcstr GetTempRootPath() |
38 |
- |
39 |
- rdcstr GetAppFolderFilename(const rdcstr &filename) |
40 |
- { |
41 |
-- passwd *pw = getpwuid(getuid()); |
42 |
-- const char *homedir = pw->pw_dir; |
43 |
-+ const char *homedir = getenv("HOME"); |
44 |
- |
45 |
- rdcstr ret = rdcstr(homedir) + "/.renderdoc/"; |
46 |
- |
47 |
--- |
48 |
-2.35.1 |
49 |
- |
50 |
|
51 |
diff --git a/media-gfx/renderdoc/files/renderdoc-1.20-system-glslang.patch b/media-gfx/renderdoc/files/renderdoc-1.20-system-glslang.patch |
52 |
deleted file mode 100644 |
53 |
index be808131c362..000000000000 |
54 |
--- a/media-gfx/renderdoc/files/renderdoc-1.20-system-glslang.patch |
55 |
+++ /dev/null |
56 |
@@ -1,197 +0,0 @@ |
57 |
-From 70442b7a3952350429872e95d843374f0aaa6a2f Mon Sep 17 00:00:00 2001 |
58 |
-From: Matthew Smith <matthew@g.o> |
59 |
-Date: Sun, 30 Jan 2022 17:19:47 +0000 |
60 |
-Subject: [PATCH] build: Use system glslang |
61 |
- |
62 |
-Requires -DGLSLANG_TARGET_DIR option. |
63 |
---- a/CMakeLists.txt |
64 |
-+++ b/CMakeLists.txt |
65 |
-@@ -437,6 +437,17 @@ elseif(UNIX) |
66 |
- endif() |
67 |
- endif() |
68 |
- |
69 |
-+# glslang package does not export a -config.cmake file. |
70 |
-+option(GLSLANG_TARGET_DIR "Absolute path to glslangTargets.cmake directory") |
71 |
-+include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") |
72 |
-+include("${GLSLANG_TARGET_DIR}/OGLCompilerTargets.cmake") |
73 |
-+include("${GLSLANG_TARGET_DIR}/HLSLTargets.cmake") |
74 |
-+include("${GLSLANG_TARGET_DIR}/glslangTargets.cmake") |
75 |
-+include("${GLSLANG_TARGET_DIR}/SPIRVTargets.cmake") |
76 |
-+if(NOT TARGET glslang OR NOT TARGET SPIRV) |
77 |
-+ message(FATAL_ERROR "glslang or SPIRV target not found") |
78 |
-+endif() |
79 |
-+ |
80 |
- add_subdirectory(renderdoc) |
81 |
- |
82 |
- # these variables are handled within the CMakeLists.txt in qrenderdoc, |
83 |
---- a/renderdoc/CMakeLists.txt |
84 |
-+++ b/renderdoc/CMakeLists.txt |
85 |
-@@ -595,7 +595,7 @@ endif() |
86 |
- add_library(renderdoc SHARED ${renderdoc_objects}) |
87 |
- target_compile_definitions(renderdoc ${RDOC_DEFINITIONS}) |
88 |
- target_include_directories(renderdoc ${RDOC_INCLUDES}) |
89 |
--target_link_libraries(renderdoc ${RDOC_LIBRARIES}) |
90 |
-+target_link_libraries(renderdoc ${RDOC_LIBRARIES} glslang SPIRV) |
91 |
- |
92 |
- add_dependencies(renderdoc renderdoc_libentry) |
93 |
- |
94 |
---- a/renderdoc/data/glsl_shaders.cpp |
95 |
-+++ b/renderdoc/data/glsl_shaders.cpp |
96 |
-@@ -26,7 +26,7 @@ |
97 |
- #include "common/common.h" |
98 |
- #include "common/formatting.h" |
99 |
- #include "driver/shaders/spirv/glslang_compile.h" |
100 |
--#include "glslang/glslang/Public/ShaderLang.h" |
101 |
-+#include <glslang/Public/ShaderLang.h> |
102 |
- #include "os/os_specific.h" |
103 |
- |
104 |
- #define GLSL_HEADERS(HEADER) \ |
105 |
---- a/renderdoc/driver/gl/gl_shader_refl.cpp |
106 |
-+++ b/renderdoc/driver/gl/gl_shader_refl.cpp |
107 |
-@@ -26,7 +26,7 @@ |
108 |
- #include <algorithm> |
109 |
- #include <functional> |
110 |
- #include "driver/shaders/spirv/glslang_compile.h" |
111 |
--#include "glslang/glslang/Public/ShaderLang.h" |
112 |
-+#include <glslang/Public/ShaderLang.h> |
113 |
- #include "gl_driver.h" |
114 |
- |
115 |
- template <> |
116 |
---- a/renderdoc/driver/shaders/spirv/CMakeLists.txt |
117 |
-+++ b/renderdoc/driver/shaders/spirv/CMakeLists.txt |
118 |
-@@ -1,91 +1,3 @@ |
119 |
--set(glslang_dir ${RDOC_SOURCE_DIR}/3rdparty/glslang) |
120 |
--set(glslang_sources |
121 |
-- ${glslang_dir}/OGLCompilersDLL/InitializeDll.cpp |
122 |
-- ${glslang_dir}/OGLCompilersDLL/InitializeDll.h |
123 |
-- ${glslang_dir}/SPIRV/GlslangToSpv.cpp |
124 |
-- ${glslang_dir}/SPIRV/GlslangToSpv.h |
125 |
-- ${glslang_dir}/SPIRV/GLSL.std.450.h |
126 |
-- ${glslang_dir}/SPIRV/GLSL.ext.AMD.h |
127 |
-- ${glslang_dir}/SPIRV/GLSL.ext.EXT.h |
128 |
-- ${glslang_dir}/SPIRV/GLSL.ext.KHR.h |
129 |
-- ${glslang_dir}/SPIRV/GLSL.ext.NV.h |
130 |
-- ${glslang_dir}/SPIRV/hex_float.h |
131 |
-- ${glslang_dir}/SPIRV/InReadableOrder.cpp |
132 |
-- ${glslang_dir}/SPIRV/Logger.cpp |
133 |
-- ${glslang_dir}/SPIRV/Logger.h |
134 |
-- ${glslang_dir}/SPIRV/SpvBuilder.cpp |
135 |
-- ${glslang_dir}/SPIRV/SpvBuilder.h |
136 |
-- ${glslang_dir}/SPIRV/SpvTools.cpp |
137 |
-- ${glslang_dir}/SPIRV/SpvTools.h |
138 |
-- ${glslang_dir}/SPIRV/SpvPostProcess.cpp |
139 |
-- ${glslang_dir}/SPIRV/spvIR.h |
140 |
-- ${glslang_dir}/glslang/GenericCodeGen/CodeGen.cpp |
141 |
-- ${glslang_dir}/glslang/GenericCodeGen/Link.cpp |
142 |
-- ${glslang_dir}/glslang/Include/arrays.h |
143 |
-- ${glslang_dir}/glslang/Include/BaseTypes.h |
144 |
-- ${glslang_dir}/glslang/Include/Common.h |
145 |
-- ${glslang_dir}/glslang/Include/ConstantUnion.h |
146 |
-- ${glslang_dir}/glslang/Include/InfoSink.h |
147 |
-- ${glslang_dir}/glslang/Include/InitializeGlobals.h |
148 |
-- ${glslang_dir}/glslang/Include/intermediate.h |
149 |
-- ${glslang_dir}/glslang/Include/PoolAlloc.h |
150 |
-- ${glslang_dir}/glslang/Include/ResourceLimits.h |
151 |
-- ${glslang_dir}/glslang/Include/revision.h |
152 |
-- ${glslang_dir}/glslang/Include/ShHandle.h |
153 |
-- ${glslang_dir}/glslang/Include/Types.h |
154 |
-- ${glslang_dir}/glslang/MachineIndependent/Constant.cpp |
155 |
-- ${glslang_dir}/glslang/MachineIndependent/glslang_tab.cpp |
156 |
-- ${glslang_dir}/glslang/MachineIndependent/glslang_tab.cpp.h |
157 |
-- ${glslang_dir}/glslang/MachineIndependent/gl_types.h |
158 |
-- ${glslang_dir}/glslang/MachineIndependent/iomapper.cpp |
159 |
-- ${glslang_dir}/glslang/MachineIndependent/iomapper.h |
160 |
-- ${glslang_dir}/glslang/MachineIndependent/gl_types.h |
161 |
-- ${glslang_dir}/glslang/MachineIndependent/InfoSink.cpp |
162 |
-- ${glslang_dir}/glslang/MachineIndependent/Initialize.cpp |
163 |
-- ${glslang_dir}/glslang/MachineIndependent/Initialize.h |
164 |
-- ${glslang_dir}/glslang/MachineIndependent/Intermediate.cpp |
165 |
-- ${glslang_dir}/glslang/MachineIndependent/intermOut.cpp |
166 |
-- ${glslang_dir}/glslang/MachineIndependent/IntermTraverse.cpp |
167 |
-- ${glslang_dir}/glslang/MachineIndependent/limits.cpp |
168 |
-- ${glslang_dir}/glslang/MachineIndependent/linkValidate.cpp |
169 |
-- ${glslang_dir}/glslang/MachineIndependent/LiveTraverser.h |
170 |
-- ${glslang_dir}/glslang/MachineIndependent/localintermediate.h |
171 |
-- ${glslang_dir}/glslang/MachineIndependent/parseConst.cpp |
172 |
-- ${glslang_dir}/glslang/MachineIndependent/ParseContextBase.cpp |
173 |
-- ${glslang_dir}/glslang/MachineIndependent/ParseHelper.cpp |
174 |
-- ${glslang_dir}/glslang/MachineIndependent/ParseHelper.h |
175 |
-- ${glslang_dir}/glslang/MachineIndependent/PoolAlloc.cpp |
176 |
-- ${glslang_dir}/glslang/MachineIndependent/propagateNoContraction.cpp |
177 |
-- ${glslang_dir}/glslang/MachineIndependent/propagateNoContraction.h |
178 |
-- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpAtom.cpp |
179 |
-- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpContext.cpp |
180 |
-- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpContext.h |
181 |
-- ${glslang_dir}/glslang/MachineIndependent/preprocessor/Pp.cpp |
182 |
-- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpScanner.cpp |
183 |
-- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpTokens.cpp |
184 |
-- ${glslang_dir}/glslang/MachineIndependent/preprocessor/PpTokens.h |
185 |
-- ${glslang_dir}/glslang/MachineIndependent/reflection.cpp |
186 |
-- ${glslang_dir}/glslang/MachineIndependent/reflection.h |
187 |
-- ${glslang_dir}/glslang/MachineIndependent/RemoveTree.cpp |
188 |
-- ${glslang_dir}/glslang/MachineIndependent/RemoveTree.h |
189 |
-- ${glslang_dir}/glslang/MachineIndependent/ScanContext.h |
190 |
-- ${glslang_dir}/glslang/MachineIndependent/Scan.cpp |
191 |
-- ${glslang_dir}/glslang/MachineIndependent/Scan.h |
192 |
-- ${glslang_dir}/glslang/MachineIndependent/ShaderLang.cpp |
193 |
-- ${glslang_dir}/glslang/MachineIndependent/SymbolTable.cpp |
194 |
-- ${glslang_dir}/glslang/MachineIndependent/SymbolTable.h |
195 |
-- ${glslang_dir}/glslang/MachineIndependent/Versions.cpp |
196 |
-- ${glslang_dir}/glslang/MachineIndependent/Versions.h |
197 |
-- ${glslang_dir}/glslang/MachineIndependent/attribute.cpp |
198 |
-- ${glslang_dir}/glslang/MachineIndependent/attribute.h |
199 |
-- ${glslang_dir}/glslang/OSDependent/osinclude.h |
200 |
-- ${glslang_dir}/glslang/Public/ShaderLang.h) |
201 |
-- |
202 |
--if(UNIX) |
203 |
-- list(APPEND glslang_sources |
204 |
-- ${glslang_dir}/glslang/OSDependent/Unix/ossource.cpp) |
205 |
--endif() |
206 |
-- |
207 |
- set(sources |
208 |
- glslang_compile.cpp |
209 |
- glslang_compile.h |
210 |
-@@ -108,8 +20,7 @@ set(sources |
211 |
- spirv_processor.h |
212 |
- spirv_disassemble.cpp |
213 |
- spirv_stringise.cpp |
214 |
-- var_dispatch_helpers.h |
215 |
-- ${glslang_sources}) |
216 |
-+ var_dispatch_helpers.h) |
217 |
- |
218 |
- add_definitions(-DAMD_EXTENSIONS) |
219 |
- add_definitions(-DNV_EXTENSIONS) |
220 |
---- a/renderdoc/driver/shaders/spirv/glslang_compile.cpp |
221 |
-+++ b/renderdoc/driver/shaders/spirv/glslang_compile.cpp |
222 |
-@@ -29,8 +29,8 @@ |
223 |
- #undef min |
224 |
- #undef max |
225 |
- |
226 |
--#include "glslang/glslang/Include/Types.h" |
227 |
--#include "glslang/glslang/Public/ShaderLang.h" |
228 |
-+#include <glslang/Include/Types.h> |
229 |
-+#include <glslang/Public/ShaderLang.h> |
230 |
- |
231 |
- static bool glslang_inited = false; |
232 |
- rdcarray<glslang::TShader *> *allocatedShaders = NULL; |
233 |
-@@ -129,6 +129,7 @@ static TBuiltInResource DefaultResources = { |
234 |
- /*.maxTaskWorkGroupSizeY_NV =*/1, |
235 |
- /*.maxTaskWorkGroupSizeZ_NV =*/1, |
236 |
- /*.maxMeshViewCountNV =*/4, |
237 |
-+ /*.maxDualSourceDrawBuffersEXT =*/1, |
238 |
- |
239 |
- /*.limits*/ |
240 |
- { |
241 |
---- a/renderdoc/driver/shaders/spirv/spirv_compile.cpp |
242 |
-+++ b/renderdoc/driver/shaders/spirv/spirv_compile.cpp |
243 |
-@@ -31,8 +31,8 @@ |
244 |
- #undef min |
245 |
- #undef max |
246 |
- |
247 |
--#include "glslang/SPIRV/GlslangToSpv.h" |
248 |
--#include "glslang/glslang/Public/ShaderLang.h" |
249 |
-+#include <glslang/SPIRV/GlslangToSpv.h> |
250 |
-+#include <glslang/Public/ShaderLang.h> |
251 |
- |
252 |
- rdcstr rdcspv::Compile(const rdcspv::CompilationSettings &settings, const rdcarray<rdcstr> &sources, |
253 |
- rdcarray<uint32_t> &spirv) |