Accepting request 778189 from home:seilerphilipp:mesa
- update to mesa 20.0.0 * changelog https://mesa3d.org/relnotes/20.0.0.html - supersedes U_0001-gallium-Fix-a-couple-of-multiple-definition-warnings.patch - supersedes U_0002-r600-Move-get_pic_param-to-radeon_vce.c.patch - supersedes U_0003-radeon-Move-si_get_pic_param-to-radeon_vce.c.patch - supersedes U_0004-radeon-Fix-multiple-definition-error-with-radeon_deb.patch - supersedes U_0006-nouveau-nvc0-add-extern-keyword-to-nvc0_miptree_vtbl.patch - update to patch n_add-Mesa-headers-again.patch to fit v20.0.0 sources - update to patch n_drirc-disable-rgb10-for-chromium-on-amd.patch to fit v20.0.0 sources (fixed patch itself so it fits the correct section again) OBS-URL: https://build.opensuse.org/request/show/778189 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=929
This commit is contained in:
Git OBS Bridge
parent
554408d320
commit
ffe6cd2257
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 21 13:18:18 UTC 2020 - Philipp Seiler <p.seiler@linuxmail.org>
|
||||
|
||||
- update to mesa 20.0.0
|
||||
* changelog https://mesa3d.org/relnotes/20.0.0.html
|
||||
- supersedes U_0001-gallium-Fix-a-couple-of-multiple-definition-warnings.patch
|
||||
- supersedes U_0002-r600-Move-get_pic_param-to-radeon_vce.c.patch
|
||||
- supersedes U_0003-radeon-Move-si_get_pic_param-to-radeon_vce.c.patch
|
||||
- supersedes U_0004-radeon-Fix-multiple-definition-error-with-radeon_deb.patch
|
||||
- supersedes U_0006-nouveau-nvc0-add-extern-keyword-to-nvc0_miptree_vtbl.patch
|
||||
- update to patch n_add-Mesa-headers-again.patch to fit v20.0.0 sources
|
||||
- update to patch n_drirc-disable-rgb10-for-chromium-on-amd.patch to fit v20.0.0 sources
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 21 05:09:10 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
|
||||
%define glamor 1
|
||||
%define _name_archive mesa
|
||||
%define _version 19.3.4
|
||||
%define _version 20.0.0
|
||||
%define with_opencl 0
|
||||
%define with_vulkan 0
|
||||
%define with_llvm 0
|
||||
@ -110,7 +110,7 @@
|
||||
%endif
|
||||
|
||||
Name: Mesa-drivers
|
||||
Version: 19.3.4
|
||||
Version: 20.0.0
|
||||
Release: 0
|
||||
Summary: System for rendering 3-D graphics
|
||||
License: MIT
|
||||
@ -129,11 +129,6 @@ Patch2: n_add-Mesa-headers-again.patch
|
||||
# never to be upstreamed
|
||||
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
|
||||
Patch58: u_dep_xcb.patch
|
||||
Patch61: U_0001-gallium-Fix-a-couple-of-multiple-definition-warnings.patch
|
||||
Patch62: U_0002-r600-Move-get_pic_param-to-radeon_vce.c.patch
|
||||
Patch63: U_0003-radeon-Move-si_get_pic_param-to-radeon_vce.c.patch
|
||||
Patch64: U_0004-radeon-Fix-multiple-definition-error-with-radeon_deb.patch
|
||||
Patch66: U_0006-nouveau-nvc0-add-extern-keyword-to-nvc0_miptree_vtbl.patch
|
||||
BuildRequires: bison
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: flex
|
||||
@ -749,11 +744,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
|
||||
%patch2 -p1
|
||||
%patch54 -p1
|
||||
%patch58 -p1
|
||||
%patch61 -p1
|
||||
%patch62 -p1
|
||||
%patch63 -p1
|
||||
%patch64 -p1
|
||||
%patch66 -p1
|
||||
|
||||
# Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
|
||||
# disabling libglvnd build; ugly ...
|
||||
|
||||
13
Mesa.changes
13
Mesa.changes
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 21 13:18:18 UTC 2020 - Philipp Seiler <p.seiler@linuxmail.org>
|
||||
|
||||
- update to mesa 20.0.0
|
||||
* changelog https://mesa3d.org/relnotes/20.0.0.html
|
||||
- supersedes U_0001-gallium-Fix-a-couple-of-multiple-definition-warnings.patch
|
||||
- supersedes U_0002-r600-Move-get_pic_param-to-radeon_vce.c.patch
|
||||
- supersedes U_0003-radeon-Move-si_get_pic_param-to-radeon_vce.c.patch
|
||||
- supersedes U_0004-radeon-Fix-multiple-definition-error-with-radeon_deb.patch
|
||||
- supersedes U_0006-nouveau-nvc0-add-extern-keyword-to-nvc0_miptree_vtbl.patch
|
||||
- update to patch n_add-Mesa-headers-again.patch to fit v20.0.0 sources
|
||||
- update to patch n_drirc-disable-rgb10-for-chromium-on-amd.patch to fit v20.0.0 sources
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 21 05:09:10 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
|
||||
14
Mesa.spec
14
Mesa.spec
@ -41,7 +41,7 @@
|
||||
|
||||
%define glamor 1
|
||||
%define _name_archive mesa
|
||||
%define _version 19.3.4
|
||||
%define _version 20.0.0
|
||||
%define with_opencl 0
|
||||
%define with_vulkan 0
|
||||
%define with_llvm 0
|
||||
@ -109,7 +109,7 @@
|
||||
%endif
|
||||
|
||||
Name: Mesa
|
||||
Version: 19.3.4
|
||||
Version: 20.0.0
|
||||
Release: 0
|
||||
Summary: System for rendering 3-D graphics
|
||||
License: MIT
|
||||
@ -128,11 +128,6 @@ Patch2: n_add-Mesa-headers-again.patch
|
||||
# never to be upstreamed
|
||||
Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
|
||||
Patch58: u_dep_xcb.patch
|
||||
Patch61: U_0001-gallium-Fix-a-couple-of-multiple-definition-warnings.patch
|
||||
Patch62: U_0002-r600-Move-get_pic_param-to-radeon_vce.c.patch
|
||||
Patch63: U_0003-radeon-Move-si_get_pic_param-to-radeon_vce.c.patch
|
||||
Patch64: U_0004-radeon-Fix-multiple-definition-error-with-radeon_deb.patch
|
||||
Patch66: U_0006-nouveau-nvc0-add-extern-keyword-to-nvc0_miptree_vtbl.patch
|
||||
BuildRequires: bison
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: flex
|
||||
@ -748,11 +743,6 @@ rm -rf docs/README.{VMS,WIN32,OS2}
|
||||
%patch2 -p1
|
||||
%patch54 -p1
|
||||
%patch58 -p1
|
||||
%patch61 -p1
|
||||
%patch62 -p1
|
||||
%patch63 -p1
|
||||
%patch64 -p1
|
||||
%patch66 -p1
|
||||
|
||||
# Remove requires to libglvnd/libglvnd-devel from baselibs.conf when
|
||||
# disabling libglvnd build; ugly ...
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
From 8e22df3aec9190518a23818be7690ac345f0bc20 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Timur=20Krist=C3=B3f?= <timur.kristof@gmail.com>
|
||||
Date: Tue, 21 Jan 2020 16:12:16 +0100
|
||||
Subject: [PATCH] gallium: Fix a couple of multiple definition warnings.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
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>
|
||||
---
|
||||
src/gallium/auxiliary/target-helpers/drm_helper_public.h | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/gallium/auxiliary/target-helpers/drm_helper_public.h b/src/gallium/auxiliary/target-helpers/drm_helper_public.h
|
||||
index 82dfe9e2575..ab0fc8d1b1a 100644
|
||||
--- a/src/gallium/auxiliary/target-helpers/drm_helper_public.h
|
||||
+++ b/src/gallium/auxiliary/target-helpers/drm_helper_public.h
|
||||
@@ -4,10 +4,10 @@
|
||||
struct pipe_screen;
|
||||
struct pipe_screen_config;
|
||||
|
||||
-const char *iris_driconf_xml;
|
||||
-const char *radeonsi_driconf_xml;
|
||||
-const char *v3d_driconf_xml;
|
||||
-const char *virgl_driconf_xml;
|
||||
+extern const char *iris_driconf_xml;
|
||||
+extern const char *radeonsi_driconf_xml;
|
||||
+extern const char *v3d_driconf_xml;
|
||||
+extern const char *virgl_driconf_xml;
|
||||
|
||||
struct pipe_screen *
|
||||
pipe_i915_create_screen(int fd, const struct pipe_screen_config *config);
|
||||
--
|
||||
2.16.4
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
From a134ac5ee9355779e015f8d7f9fe3e2ab22cdb86 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Timur=20Krist=C3=B3f?= <timur.kristof@gmail.com>
|
||||
Date: Tue, 21 Jan 2020 16:08:21 +0100
|
||||
Subject: [PATCH] r600: Move get_pic_param to radeon_vce.c
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
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>
|
||||
---
|
||||
src/gallium/drivers/r600/radeon_vce.c | 4 ++++
|
||||
src/gallium/drivers/r600/radeon_vce.h | 4 ----
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/gallium/drivers/r600/radeon_vce.c b/src/gallium/drivers/r600/radeon_vce.c
|
||||
index 4051d73533d..16f48c69456 100644
|
||||
--- a/src/gallium/drivers/r600/radeon_vce.c
|
||||
+++ b/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 a/src/gallium/drivers/r600/radeon_vce.h b/src/gallium/drivers/r600/radeon_vce.h
|
||||
index 71f028721b4..c5e05477763 100644
|
||||
--- a/src/gallium/drivers/r600/radeon_vce.h
|
||||
+++ b/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);
|
||||
--
|
||||
2.16.4
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
From b7f975980916d670dcfc280af1678f4439a59d2f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Timur=20Krist=C3=B3f?= <timur.kristof@gmail.com>
|
||||
Date: Tue, 21 Jan 2020 16:04:33 +0100
|
||||
Subject: [PATCH] radeon: Move si_get_pic_param to radeon_vce.c
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
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>
|
||||
---
|
||||
src/gallium/drivers/radeon/radeon_vce.c | 4 ++++
|
||||
src/gallium/drivers/radeon/radeon_vce.h | 4 ----
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/gallium/drivers/radeon/radeon_vce.c b/src/gallium/drivers/radeon/radeon_vce.c
|
||||
index 84d3c1e2fa4..652b4250654 100644
|
||||
--- a/src/gallium/drivers/radeon/radeon_vce.c
|
||||
+++ b/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 a/src/gallium/drivers/radeon/radeon_vce.h b/src/gallium/drivers/radeon/radeon_vce.h
|
||||
index cf625e6fed7..b5cfe178061 100644
|
||||
--- a/src/gallium/drivers/radeon/radeon_vce.h
|
||||
+++ b/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);
|
||||
--
|
||||
2.16.4
|
||||
|
||||
@ -1,78 +0,0 @@
|
||||
From 75e5720e1a64fac116e19cd9a7682b1d0f530149 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Timur=20Krist=C3=B3f?= <timur.kristof@gmail.com>
|
||||
Date: Tue, 21 Jan 2020 16:36:54 +0100
|
||||
Subject: [PATCH] radeon: Fix multiple definition error with radeon_debug
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
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>
|
||||
---
|
||||
src/mesa/drivers/dri/radeon/radeon_debug.c | 10 +++++++---
|
||||
src/mesa/drivers/dri/radeon/radeon_debug.h | 14 ++++++++++----
|
||||
2 files changed, 17 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/mesa/drivers/dri/radeon/radeon_debug.c b/src/mesa/drivers/dri/radeon/radeon_debug.c
|
||||
index 91f86a96b52..4ac974473e2 100644
|
||||
--- a/src/mesa/drivers/dri/radeon/radeon_debug.c
|
||||
+++ b/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 a/src/mesa/drivers/dri/radeon/radeon_debug.h b/src/mesa/drivers/dri/radeon/radeon_debug.h
|
||||
index df2f1abfbf2..8f56ec6769b 100644
|
||||
--- a/src/mesa/drivers/dri/radeon/radeon_debug.h
|
||||
+++ b/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,
|
||||
--
|
||||
2.16.4
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
From 28eb481bc2156ccc07c106ab517c2a3a42a53de1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Timur=20Krist=C3=B3f?= <timur.kristof@gmail.com>
|
||||
Date: Tue, 21 Jan 2020 17:11:22 +0100
|
||||
Subject: [PATCH] nouveau/nvc0: add extern keyword to nvc0_miptree_vtbl.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
|
||||
Reviewed-by: Karol Herbst <kherbst@redhat.com>
|
||||
---
|
||||
src/gallium/drivers/nouveau/nvc0/nvc0_resource.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_resource.h b/src/gallium/drivers/nouveau/nvc0/nvc0_resource.h
|
||||
index b24fca004ca..78a1d79261e 100644
|
||||
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_resource.h
|
||||
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_resource.h
|
||||
@@ -38,7 +38,7 @@ nvc0_miptree_create(struct pipe_screen *pscreen,
|
||||
const struct pipe_resource *tmp,
|
||||
const uint64_t *modifiers, unsigned int count);
|
||||
|
||||
-const struct u_resource_vtbl nvc0_miptree_vtbl;
|
||||
+extern const struct u_resource_vtbl nvc0_miptree_vtbl;
|
||||
|
||||
struct pipe_surface *
|
||||
nvc0_miptree_surface_new(struct pipe_context *,
|
||||
--
|
||||
2.16.4
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1da467e6ae2799a517e242462331eafd29ae77d9872f3a845df81f7c308e8fe4
|
||||
size 11968288
|
||||
Binary file not shown.
3
mesa-20.0.0.tar.xz
Normal file
3
mesa-20.0.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:bb6db3e54b608d2536d4000b3de7dd3ae115fc114e8acbb5afff4b3bbed04b34
|
||||
size 12153408
|
||||
BIN
mesa-20.0.0.tar.xz.sig
Normal file
BIN
mesa-20.0.0.tar.xz.sig
Normal file
Binary file not shown.
@ -1,19 +1,14 @@
|
||||
diff -u -r mesa-19.2.2.orig/include/meson.build mesa-19.2.2/include/meson.build
|
||||
--- mesa-19.2.2.orig/include/meson.build 2019-10-25 21:55:51.441084000 +0200
|
||||
+++ mesa-19.2.2/include/meson.build 2019-10-25 21:58:07.781272000 +0200
|
||||
@@ -22,7 +22,6 @@
|
||||
diff -dupr mesa-20.0.0.orig/include/meson.build mesa-20.0.0/include/meson.build
|
||||
--- mesa-20.0.0.orig/include/meson.build 2020-02-21 14:11:14.623397341 +0100
|
||||
+++ mesa-20.0.0/include/meson.build 2020-02-21 14:13:05.620425210 +0100
|
||||
@@ -22,10 +22,8 @@ inc_include = include_directories('.')
|
||||
inc_d3d9 = include_directories('D3D9')
|
||||
inc_haikugl = include_directories('HaikuGL')
|
||||
|
||||
-if not glvnd_has_headers_and_pc_files
|
||||
-if not with_glvnd
|
||||
if with_gles1 or with_gles2 or with_opengl or with_egl
|
||||
install_headers('KHR/khrplatform.h', subdir : 'KHR')
|
||||
endif
|
||||
@@ -78,7 +77,6 @@
|
||||
subdir : 'EGL',
|
||||
)
|
||||
endif
|
||||
-endif
|
||||
- endif
|
||||
|
||||
# Non-upstream headers
|
||||
if with_egl
|
||||
if with_gles1
|
||||
install_headers(
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
Index: mesa-19.3.1/src/util/00-mesa-defaults.conf
|
||||
===================================================================
|
||||
--- mesa-19.3.1.orig/src/util/00-mesa-defaults.conf
|
||||
+++ mesa-19.3.1/src/util/00-mesa-defaults.conf
|
||||
@@ -523,6 +523,14 @@ TODO: document the other workarounds.
|
||||
diff -dupr mesa-20.0.0.orig/src/util/00-mesa-defaults.conf mesa-20.0.0/src/util/00-mesa-defaults.conf
|
||||
--- mesa-20.0.0.orig/src/util/00-mesa-defaults.conf 2020-02-19 20:29:32.000000000 +0100
|
||||
+++ mesa-20.0.0/src/util/00-mesa-defaults.conf 2020-02-22 12:10:47.118008543 +0100
|
||||
@@ -556,6 +556,14 @@ TODO: document the other workarounds.
|
||||
<application name="DiRT Rally" executable="DirtRally">
|
||||
<option name="radeonsi_prim_restart_tri_strips_only" value="true"/>
|
||||
</application>
|
||||
@ -14,6 +13,6 @@ Index: mesa-19.3.1/src/util/00-mesa-defaults.conf
|
||||
+ <application name="Totem" executable="totem">
|
||||
+ <option name="allow_rgb10_configs" value="false" />
|
||||
+ </application>
|
||||
</device>
|
||||
<device driver="virtio_gpu">
|
||||
<!-- Some Valve games do a final blit to a BRGA_sRGB surface. On a GLES
|
||||
<application name="Gfx Bench" executable="gfxbench_gl">
|
||||
<!-- Helps offscreen tests -->
|
||||
<option name="mesa_glthread" value="true"/>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user