Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-layers/files/
Date: Sun, 06 Jan 2019 15:39:33
Message-Id: 1546789128.7ecf304e304b1776c4660f3476e4c10b2a58d711.mattst88@gentoo
1 commit: 7ecf304e304b1776c4660f3476e4c10b2a58d711
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun Jan 6 10:40:12 2019 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 6 15:38:48 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ecf304e
7
8 media-libs/vulkan-layers: remove unused patch
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
12
13 ...1.77.0-layers-Rework-include-dependencies.patch | 68 ----------------------
14 1 file changed, 68 deletions(-)
15
16 diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch
17 deleted file mode 100644
18 index d0b48a749c2..00000000000
19 --- a/media-libs/vulkan-layers/files/vulkan-layers-1.1.77.0-layers-Rework-include-dependencies.patch
20 +++ /dev/null
21 @@ -1,68 +0,0 @@
22 -From 4c0da77c705464a259b38944fb53cf747e4c0554 Mon Sep 17 00:00:00 2001
23 -From: Lenny Komow <lenny@××××××.com>
24 -Date: Tue, 3 Jul 2018 10:17:21 -0600
25 -Subject: [PATCH] layers: Rework include dependencies
26 -
27 -This change removes the assumption that vk_layer.h will include
28 -vk_layer_dispatch_table.h, since it will be removed from vk_layer.h
29 -in the near future.
30 -
31 -Backported-by: Nick Sarnie <Sarnex@g.o>
32 -
33 -Change-Id: I082ccc52c3cb8257bf57342404d52dd737009b4b
34 ----
35 - layers/parameter_validation_utils.cpp | 1 +
36 - layers/vk_layer_logging.h | 1 +
37 - layers/vk_layer_table.h | 1 +
38 - scripts/dispatch_table_helper_generator.py | 1 +
39 - 4 files changed, 4 insertions(+)
40 -
41 -diff --git a/layers/parameter_validation_utils.cpp b/layers/parameter_validation_utils.cpp
42 -index 17f95bb8..c65a4970 100644
43 ---- a/layers/parameter_validation_utils.cpp
44 -+++ b/layers/parameter_validation_utils.cpp
45 -@@ -46,6 +46,7 @@
46 - #include "vk_layer_logging.h"
47 - #include "vk_layer_extension_utils.h"
48 - #include "vk_layer_utils.h"
49 -+#include "vk_layer_dispatch_table.h"
50 -
51 - #include "parameter_name.h"
52 - #include "parameter_validation.h"
53 -diff --git a/layers/vk_layer_logging.h b/layers/vk_layer_logging.h
54 -index f111cc5d..f67a3f55 100644
55 ---- a/layers/vk_layer_logging.h
56 -+++ b/layers/vk_layer_logging.h
57 -@@ -31,6 +31,7 @@
58 - #include "vulkan/vk_layer.h"
59 - #include "vk_object_types.h"
60 - #include "vk_validation_error_messages.h"
61 -+#include "vk_layer_dispatch_table.h"
62 - #include <signal.h>
63 - #include <cinttypes>
64 - #include <stdarg.h>
65 -diff --git a/layers/vk_layer_table.h b/layers/vk_layer_table.h
66 -index 45b8f6e1..23990a12 100644
67 ---- a/layers/vk_layer_table.h
68 -+++ b/layers/vk_layer_table.h
69 -@@ -19,6 +19,7 @@
70 -
71 - #pragma once
72 -
73 -+#include "vk_layer_dispatch_table.h"
74 - #include "vulkan/vk_layer.h"
75 - #include "vulkan/vulkan.h"
76 - #include <unordered_map>
77 -diff --git a/scripts/dispatch_table_helper_generator.py b/scripts/dispatch_table_helper_generator.py
78 -index fba25e55..1e2412c0 100644
79 ---- a/scripts/dispatch_table_helper_generator.py
80 -+++ b/scripts/dispatch_table_helper_generator.py
81 -@@ -113,6 +113,7 @@ class DispatchTableHelperOutputGenerator(OutputGenerator):
82 - preamble += '#include <vulkan/vulkan.h>\n'
83 - preamble += '#include <vulkan/vk_layer.h>\n'
84 - preamble += '#include <string.h>\n'
85 -+ preamble += '#include "vk_layer_dispatch_table.h"\n'
86 -
87 - write(copyright, file=self.outFile)
88 - write(preamble, file=self.outFile)
89 ---