Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / mesa
Commits:
-
0bc015a4
by Timo Aaltonen at 2024-09-05T11:21:31+03:00
-
111592c1
by Timo Aaltonen at 2024-09-05T11:23:41+03:00
-
4acd2f3c
by Timo Aaltonen at 2024-09-05T11:49:41+03:00
5 changed files:
- debian/changelog
- + debian/patches/0001-dril-also-create-double-buffered-configs-in-swrast-f.patch
- + debian/patches/0001-dril-use-the-super-fallback-path-for-software-fallba.patch
- debian/patches/series
- debian/rules
Changes:
| 1 | +mesa (24.2.1-4) unstable; urgency=medium
|
|
| 2 | + |
|
| 3 | + * patches: Add patches to fix autopkgtest regressions in dril.
|
|
| 4 | + * rules: Enable softpipe everywhere again. (Closes: #1080475)
|
|
| 5 | + |
|
| 6 | + -- Timo Aaltonen <tjaalton@debian.org> Thu, 05 Sep 2024 11:49:34 +0300
|
|
| 7 | + |
|
| 1 | 8 | mesa (24.2.1-3) unstable; urgency=medium
|
| 2 | 9 | |
| 3 | 10 | * rules: Set MESON_PACKAGE_CACHE_DIR only for archs where nvk is
|
| 1 | +From 56ac37845487b62f495428b0f20d145489f621e2 Mon Sep 17 00:00:00 2001
|
|
| 2 | +From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
|
|
| 3 | +Date: Wed, 4 Sep 2024 06:44:45 -0400
|
|
| 4 | +Subject: [PATCH] dril: also create double-buffered configs in swrast fallback
|
|
| 5 | + |
|
| 6 | +Fixes: 06d417af80b ("dril: use the super fallback path for software fallback")
|
|
| 7 | +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31013>
|
|
| 8 | +---
|
|
| 9 | + src/gallium/targets/dril/dril_target.c | 11 +++++++++--
|
|
| 10 | + 1 file changed, 9 insertions(+), 2 deletions(-)
|
|
| 11 | + |
|
| 12 | +diff --git a/src/gallium/targets/dril/dril_target.c b/src/gallium/targets/dril/dril_target.c
|
|
| 13 | +index 0caa3514dde..a94ab09858f 100644
|
|
| 14 | +--- a/src/gallium/targets/dril/dril_target.c
|
|
| 15 | ++++ b/src/gallium/targets/dril/dril_target.c
|
|
| 16 | +@@ -437,9 +437,16 @@ drilCreateNewScreen(int scrn, int fd,
|
|
| 17 | + const __DRIconfig **configs = init_dri2_configs(fd);
|
|
| 18 | + if (!configs && fd == -1) {
|
|
| 19 | + // otherwise set configs to point to our config list
|
|
| 20 | +- configs = calloc(ARRAY_SIZE(drilConfigs) + 1, sizeof(void *));
|
|
| 21 | ++ configs = calloc(ARRAY_SIZE(drilConfigs) * 2 + 1, sizeof(void *));
|
|
| 22 | ++ int c = 0;
|
|
| 23 | + for (int i = 0; i < ARRAY_SIZE(drilConfigs); i++) {
|
|
| 24 | +- configs[i] = mem_dup(&drilConfigs[i], sizeof(drilConfigs[i]));
|
|
| 25 | ++ /* create normal config */
|
|
| 26 | ++ configs[c++] = mem_dup(&drilConfigs[i], sizeof(drilConfigs[i]));
|
|
| 27 | ++
|
|
| 28 | ++ /* create double-buffered config */
|
|
| 29 | ++ configs[c] = mem_dup(&drilConfigs[i], sizeof(drilConfigs[i]));
|
|
| 30 | ++ struct gl_config *cfg = (void*)configs[c++];
|
|
| 31 | ++ cfg->doubleBufferMode = 1;
|
|
| 32 | + }
|
|
| 33 | + }
|
|
| 34 | +
|
|
| 35 | +--
|
|
| 36 | +2.43.0
|
|
| 37 | + |
| 1 | +From 06d417af80bc1f171cadc338e63a7aa75c877754 Mon Sep 17 00:00:00 2001
|
|
| 2 | +From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
|
|
| 3 | +Date: Mon, 2 Sep 2024 10:42:50 -0400
|
|
| 4 | +Subject: [PATCH] dril: use the super fallback path for software fallback
|
|
| 5 | + |
|
| 6 | +just in case gbm init fails somehow, swrast should still be able to
|
|
| 7 | +return some kind of fbconfigs
|
|
| 8 | + |
|
| 9 | +Fixes: ef88af84676 ("dril: always take the egl init path")
|
|
| 10 | +Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30979>
|
|
| 11 | +---
|
|
| 12 | + src/gallium/targets/dril/dril_target.c | 9 +++++++--
|
|
| 13 | + 1 file changed, 7 insertions(+), 2 deletions(-)
|
|
| 14 | + |
|
| 15 | +diff --git a/src/gallium/targets/dril/dril_target.c b/src/gallium/targets/dril/dril_target.c
|
|
| 16 | +index b7a6ada5197..0caa3514dde 100644
|
|
| 17 | +--- a/src/gallium/targets/dril/dril_target.c
|
|
| 18 | ++++ b/src/gallium/targets/dril/dril_target.c
|
|
| 19 | +@@ -435,8 +435,13 @@ drilCreateNewScreen(int scrn, int fd,
|
|
| 20 | + const __DRIconfig ***driver_configs, void *data)
|
|
| 21 | + {
|
|
| 22 | + const __DRIconfig **configs = init_dri2_configs(fd);
|
|
| 23 | +- if (!configs)
|
|
| 24 | +- return NULL;
|
|
| 25 | ++ if (!configs && fd == -1) {
|
|
| 26 | ++ // otherwise set configs to point to our config list
|
|
| 27 | ++ configs = calloc(ARRAY_SIZE(drilConfigs) + 1, sizeof(void *));
|
|
| 28 | ++ for (int i = 0; i < ARRAY_SIZE(drilConfigs); i++) {
|
|
| 29 | ++ configs[i] = mem_dup(&drilConfigs[i], sizeof(drilConfigs[i]));
|
|
| 30 | ++ }
|
|
| 31 | ++ }
|
|
| 32 | +
|
|
| 33 | + // outpointer it
|
|
| 34 | + *driver_configs = configs;
|
|
| 35 | +--
|
|
| 36 | +2.43.0
|
|
| 37 | + |
| 1 | 1 | path_max.diff
|
| 2 | 2 | src_glx_dri_common.h.diff
|
| 3 | +0001-dril-use-the-super-fallback-path-for-software-fallba.patch
|
|
| 4 | +0001-dril-also-create-double-buffered-configs-in-swrast-f.patch |
| ... | ... | @@ -43,7 +43,7 @@ buildflags = $(shell \ |
| 43 | 43 | dpkg-buildflags --export=configure)
|
| 44 | 44 | |
| 45 | 45 | EGL_PLATFORMS = x11
|
| 46 | -GALLIUM_DRIVERS =
|
|
| 46 | +GALLIUM_DRIVERS = softpipe
|
|
| 47 | 47 | VULKAN_DRIVERS =
|
| 48 | 48 | VULKAN_LAYERS =
|
| 49 | 49 | |
| ... | ... | @@ -60,7 +60,6 @@ WINE_ARCHS = amd64 arm64 armel armhf i386 |
| 60 | 60 | |
| 61 | 61 | # hurd doesn't do direct rendering
|
| 62 | 62 | ifeq ($(DEB_HOST_ARCH_OS), hurd)
|
| 63 | - GALLIUM_DRIVERS += softpipe
|
|
| 64 | 63 | confflags_DIRECT_RENDERING = -Dglx-direct=false
|
| 65 | 64 | confflags_GBM = -Dgbm=disabled
|
| 66 | 65 | else
|
| ... | ... | @@ -144,7 +143,6 @@ else |
| 144 | 143 | confflags_GALLIUM += -Dgallium-nine=true
|
| 145 | 144 | endif
|
| 146 | 145 | else
|
| 147 | - GALLIUM_DRIVERS += softpipe
|
|
| 148 | 146 | confflags_GALLIUM += -Dllvm=disabled
|
| 149 | 147 | endif
|
| 150 | 148 |