cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r545240

Browse Source 
graphics/mesa: Fix build with -fno-common

Pull in a bunch of upstream patches to graphics/mesa to fix build with
-fno-common, which is the default after the llvm 11 import.

Approved by:	ports-secteam (joenum)
This commit is contained in:
Niclas Zeising 2020-08-19 08:31:54 +00:00
parent bb06cbbcec
commit 1db700806b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q3/; revision=545282
5 changed files with 213 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
graphics/mesa-dri/files/patch-75e5720e.c Normal file
View File

@ -0,0 +1,69 @@
commit 75e5720e1a64fac116e19cd9a7682b1d0f530149
Author: Timur Kristóf <timur.kristof@gmail.com>
Date: Tue Jan 21 16:36:54 2020 +0100
radeon: Fix multiple definition error with radeon_debug
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3488>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3488>
diff --git src/mesa/drivers/dri/radeon/radeon_debug.c src/mesa/drivers/dri/radeon/radeon_debug.c
index 91f86a96b52..4ac974473e2 100644
--- src/mesa/drivers/dri/radeon/radeon_debug.c
+++ src/mesa/drivers/dri/radeon/radeon_debug.c
@@ -57,13 +57,17 @@ static const struct debug_control debug_control[] = {
{NULL, 0}
};
-radeon_debug_type_t radeon_enabled_debug_types;
+#if defined(RADEON_R200)
+radeon_debug_type_t r200_enabled_debug_types;
+#elif defined(RADEON_R100)
+radeon_debug_type_t r100_enabled_debug_types;
+#endif
void radeon_init_debug(void)
{
- radeon_enabled_debug_types = parse_debug_string(getenv("RADEON_DEBUG"), debug_control);
+ RADEON_DEBUG = parse_debug_string(getenv("RADEON_DEBUG"), debug_control);
- radeon_enabled_debug_types |= RADEON_GENERAL;
+ RADEON_DEBUG |= RADEON_GENERAL;
}
void _radeon_debug_add_indent(void)
diff --git src/mesa/drivers/dri/radeon/radeon_debug.h src/mesa/drivers/dri/radeon/radeon_debug.h
index df2f1abfbf2..8f56ec6769b 100644
--- src/mesa/drivers/dri/radeon/radeon_debug.h
+++ src/mesa/drivers/dri/radeon/radeon_debug.h
@@ -81,18 +81,24 @@ struct radeon_debug {
char indent[RADEON_MAX_INDENT];
};
-extern radeon_debug_type_t radeon_enabled_debug_types;
-
/**
* Compabibility layer for old debug code
**/
-#define RADEON_DEBUG radeon_enabled_debug_types
+#if defined(RADEON_R200)
+extern radeon_debug_type_t r200_enabled_debug_types;
+#define RADEON_DEBUG r200_enabled_debug_types
+#elif defined(RADEON_R100)
+extern radeon_debug_type_t r100_enabled_debug_types;
+#define RADEON_DEBUG r100_enabled_debug_types
+#else
+#error "Neither RADEON_R100 nor RADEON_R200 are defined."
+#endif
static inline int radeon_is_debug_enabled(const radeon_debug_type_t type,
const radeon_debug_level_t level)
{
return RADEON_DEBUG_LEVEL >= level
- && (type & radeon_enabled_debug_types);
+ && (type & RADEON_DEBUG);
}
extern void _radeon_print(const radeon_debug_type_t type,

40
graphics/mesa-dri/files/patch-a134ac5e.c Normal file
View File

@ -0,0 +1,40 @@
commit a134ac5ee9355779e015f8d7f9fe3e2ab22cdb86
Author: Timur Kristóf <timur.kristof@gmail.com>
Date: Tue Jan 21 16:08:21 2020 +0100
r600: Move get_pic_param to radeon_vce.c
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3488>
diff --git src/gallium/drivers/r600/radeon_vce.c src/gallium/drivers/r600/radeon_vce.c
index 4051d73533d..16f48c69456 100644
--- src/gallium/drivers/r600/radeon_vce.c
+++ src/gallium/drivers/r600/radeon_vce.c
@@ -54,6 +54,10 @@
#define FW_52_8_3 ((52 << 24) | (8 << 16) | (3 << 8))
#define FW_53 (53 << 24)
+/* version specific function for getting parameters */
+static void (*get_pic_param)(struct rvce_encoder *enc,
+ struct pipe_h264_enc_picture_desc *pic) = NULL;
+
/**
* flush commands to the hardware
*/
diff --git src/gallium/drivers/r600/radeon_vce.h src/gallium/drivers/r600/radeon_vce.h
index 71f028721b4..c5e05477763 100644
--- src/gallium/drivers/r600/radeon_vce.h
+++ src/gallium/drivers/r600/radeon_vce.h
@@ -443,10 +443,6 @@ void radeon_vce_50_init(struct rvce_encoder *enc);
/* init vce fw 52 specific callbacks */
void radeon_vce_52_init(struct rvce_encoder *enc);
-/* version specific function for getting parameters */
-void (*get_pic_param)(struct rvce_encoder *enc,
- struct pipe_h264_enc_picture_desc *pic);
-
/* get parameters for vce 40.2.2 */
void radeon_vce_40_2_2_get_param(struct rvce_encoder *enc,
struct pipe_h264_enc_picture_desc *pic);

40
graphics/mesa-dri/files/patch-b7f97598.c Normal file
View File

@ -0,0 +1,40 @@
commit b7f975980916d670dcfc280af1678f4439a59d2f
Author: Timur Kristóf <timur.kristof@gmail.com>
Date: Tue Jan 21 16:04:33 2020 +0100
radeon: Move si_get_pic_param to radeon_vce.c
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3488>
diff --git src/gallium/drivers/radeon/radeon_vce.c src/gallium/drivers/radeon/radeon_vce.c
index 84d3c1e2fa4..652b4250654 100644
--- src/gallium/drivers/radeon/radeon_vce.c
+++ src/gallium/drivers/radeon/radeon_vce.c
@@ -48,6 +48,10 @@
#define FW_52_8_3 ((52 << 24) | (8 << 16) | (3 << 8))
#define FW_53 (53 << 24)
+/* version specific function for getting parameters */
+static void (*si_get_pic_param)(struct rvce_encoder *enc,
+ struct pipe_h264_enc_picture_desc *pic) = NULL;
+
/**
* flush commands to the hardware
*/
diff --git src/gallium/drivers/radeon/radeon_vce.h src/gallium/drivers/radeon/radeon_vce.h
index cf625e6fed7..b5cfe178061 100644
--- src/gallium/drivers/radeon/radeon_vce.h
+++ src/gallium/drivers/radeon/radeon_vce.h
@@ -437,10 +437,6 @@ void si_vce_50_init(struct rvce_encoder *enc);
/* init vce fw 52 specific callbacks */
void si_vce_52_init(struct rvce_encoder *enc);
-/* version specific function for getting parameters */
-void (*si_get_pic_param)(struct rvce_encoder *enc,
- struct pipe_h264_enc_picture_desc *pic);
-
/* get parameters for vce 40.2.2 */
void si_vce_40_2_2_get_param(struct rvce_encoder *enc,
struct pipe_h264_enc_picture_desc *pic);

28
graphics/mesa-dri/files/patch-bd4380c6.c Normal file
View File

@ -0,0 +1,28 @@
commit bd4380c63c3b8b8b5f60dc840809dbe96a222fd7
Author: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Tue Jan 21 11:49:55 2020 +0100
radv: Remove syncobj_handle variable in header.
I strongly suspect it was supposed to be a typedef. However, used
nowhere, we should remove it.
Fixes: eaa56eab6da "radv: initial support for shared semaphores (v2)"
Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2385
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3479>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3479>
diff --git src/amd/vulkan/radv_radeon_winsys.h src/amd/vulkan/radv_radeon_winsys.h
index c8790917bcc..5c7b1ab5118 100644
--- src/amd/vulkan/radv_radeon_winsys.h
+++ src/amd/vulkan/radv_radeon_winsys.h
@@ -156,7 +156,6 @@ struct radeon_bo_metadata {
uint32_t metadata[64];
};
-uint32_t syncobj_handle;
struct radeon_winsys_fence;
struct radeon_winsys_bo {

36
graphics/mesa-dri/files/patch-eda36feb.c Normal file
View File

@ -0,0 +1,36 @@
commit eda36feb2b7eef8347f579c3c8590a8f09017cf0
Author: Mark Janes <mark.a.janes@intel.com>
Date: Fri Apr 5 11:39:18 2019 -0700
intel/tools: Remove redundant definitions of INTEL_DEBUG
INTEL_DEBUG is declared extern and defined in gen_debug.c
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
diff --git src/intel/common/gen_disasm.c src/intel/common/gen_disasm.c
index 4f835c19883..656613cd931 100644
--- src/intel/common/gen_disasm.c
+++ src/intel/common/gen_disasm.c
@@ -28,8 +28,6 @@
#include "gen_disasm.h"
-uint64_t INTEL_DEBUG;
-
struct gen_disasm {
struct gen_device_info devinfo;
};
diff --git src/intel/tools/i965_disasm.c src/intel/tools/i965_disasm.c
index 79434e6462a..5fe4afa35ff 100644
--- src/intel/tools/i965_disasm.c
+++ src/intel/tools/i965_disasm.c
@@ -29,8 +29,6 @@
#include "compiler/brw_eu.h"
#include "dev/gen_device_info.h"
-uint64_t INTEL_DEBUG;
-
/* Return size of file in bytes pointed by fp */
static size_t
i965_disasm_get_file_size(FILE *fp)