Skip to content

Commit

Permalink
mesa: update to 24.3.0~rc2+dxheaders1.614.1
Browse files Browse the repository at this point in the history
Track patches at AOSC-Tracking/mesa @ aosc/mesa-24.3.0-rc2
(HEAD: 47d42a1f82eecacc202a5b41cc74280571671f5f).
  • Loading branch information
MingcongBai committed Nov 15, 2024
1 parent 84e9a60 commit f5f7e52
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 58 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 14de61e0dadd762ea37d32a0f1c186357519a863 Mon Sep 17 00:00:00 2001
From d6b475611343534c763e5d92e11fdaa473afe808 Mon Sep 17 00:00:00 2001
From: "Lain \"Fearyncess\" Yang" <[email protected]>
Date: Fri, 30 Aug 2024 17:27:37 +0800
Subject: [PATCH 2/5] r600: disable buggy vc-1 hardware decoding
Subject: [PATCH 1/4] r600: disable buggy vc-1 hardware decoding

---
src/gallium/drivers/r600/radeon_video.c | 2 +-
Expand All @@ -21,5 +21,5 @@ index 670e0aafb9e..6e5abd8d1a1 100644
return false;
case PIPE_VIDEO_FORMAT_JPEG:
--
2.46.0.windows.1
2.47.0

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From a25fd75300e44368f5e68c4f6ef01cb66b997822 Mon Sep 17 00:00:00 2001
From 95bd2c20cb05fabc789ec9a762facc3f25aa05d7 Mon Sep 17 00:00:00 2001
From: Mingcong Bai <[email protected]>
Date: Tue, 12 Mar 2024 00:17:46 +0800
Subject: [PATCH 3/5] [LOONGARCH64] fix(iris_bufmgr.c): set PAGE_SIZE as 16384
Subject: [PATCH 2/4] [LOONGARCH64] fix(iris_bufmgr.c): set PAGE_SIZE as 16384

Obviously not ideal, but this is simply meant as a preview/PoC.
---
Expand All @@ -22,5 +22,5 @@ index 0dde4b2e3d1..341dbf6b635 100644

#define WARN_ONCE(cond, fmt...) do { \
--
2.46.0.windows.1
2.47.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From a1c324aae6e5722009d3a2b412b686fe0cdb795f Mon Sep 17 00:00:00 2001
From 0e5c6e1aa10c199732c6623bd0c41b19b04835f1 Mon Sep 17 00:00:00 2001
From: Kexy Biscuit <[email protected]>
Date: Wed, 11 Sep 2024 19:30:18 +0800
Subject: [PATCH 4/5] Revert "dril: also create double-buffered configs in
Subject: [PATCH 3/4] Revert "dril: also create double-buffered configs in
swrast fallback"

This reverts commit 56ac37845487b62f495428b0f20d145489f621e2.
Expand All @@ -13,10 +13,10 @@ Ref: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11840
1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/gallium/targets/dril/dril_target.c b/src/gallium/targets/dril/dril_target.c
index a94ab09858f..0caa3514dde 100644
index 583728e4093..95007e22674 100644
--- a/src/gallium/targets/dril/dril_target.c
+++ b/src/gallium/targets/dril/dril_target.c
@@ -437,16 +437,9 @@ drilCreateNewScreen(int scrn, int fd,
@@ -455,16 +455,9 @@ drilCreateNewScreen(int scrn, int fd,
const __DRIconfig **configs = init_dri2_configs(fd);
if (!configs && fd == -1) {
// otherwise set configs to point to our config list
Expand All @@ -36,5 +36,5 @@ index a94ab09858f..0caa3514dde 100644
}

--
2.46.0.windows.1
2.47.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b083cbcd280703b73f3f665f4e90622f426b4725 Mon Sep 17 00:00:00 2001
From 47d42a1f82eecacc202a5b41cc74280571671f5f Mon Sep 17 00:00:00 2001
From: Kexy Biscuit <[email protected]>
Date: Wed, 11 Sep 2024 19:31:04 +0800
Subject: [PATCH 5/5] Revert "dril: use the super fallback path for software
Subject: [PATCH 4/4] Revert "dril: use the super fallback path for software
fallback"

This reverts commit 06d417af80bc1f171cadc338e63a7aa75c877754.
Expand All @@ -13,10 +13,10 @@ Ref: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11840
1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/gallium/targets/dril/dril_target.c b/src/gallium/targets/dril/dril_target.c
index 0caa3514dde..b7a6ada5197 100644
index 95007e22674..043700e5cca 100644
--- a/src/gallium/targets/dril/dril_target.c
+++ b/src/gallium/targets/dril/dril_target.c
@@ -435,13 +435,8 @@ drilCreateNewScreen(int scrn, int fd,
@@ -453,13 +453,8 @@ drilCreateNewScreen(int scrn, int fd,
const __DRIconfig ***driver_configs, void *data)
{
const __DRIconfig **configs = init_dri2_configs(fd);
Expand All @@ -33,5 +33,5 @@ index 0caa3514dde..b7a6ada5197 100644
// outpointer it
*driver_configs = configs;
--
2.46.0.windows.1
2.47.0

6 changes: 3 additions & 3 deletions runtime-display/mesa/spec
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
UPSTREAM_VER=24.2.6
UPSTREAM_VER=24.3.0-rc2
DXHEADERS_VER=1.614.1
VER=${UPSTREAM_VER}+dxheaders${DXHEADERS_VER}
VER=${UPSTREAM_VER/\-/~}+dxheaders${DXHEADERS_VER}

SRCS="tbl::https://archive.mesa3d.org/mesa-${UPSTREAM_VER}.tar.xz \
git::commit=tags/v${DXHEADERS_VER};rename=dxheaders::https://github.com/microsoft/DirectX-Headers.git"
CHKSUMS="sha256::2b68c4a6f204c1999815a457299f81c41ba7bf48c4674b0b2d1d8864f41f3709 \
CHKSUMS="sha256::3bcc1be0ae71eabb18d51c0bd9c84374e6dc4594a1b3261cd24901263c971e35 \
SKIP"
SUBDIR="mesa-${UPSTREAM_VER}"
CHKUPDATE="anitya::id=1970"

0 comments on commit f5f7e52

Please sign in to comment.