Skip to content

Commit da992d3

Browse files
committed
bump(main/mesa): 26.2.0-devel-20260511
- Sync with upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/e471e83a6581120214a67b91b5b5fa94ae7a5de1 - Remove unofficial support for Adreno 830, as upstream has added official support: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39874 - Remove unofficial support for Adreno 829, as upstream has added official support: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40655 - Remove unofficial support for Adreno 810, as upstream has added official support: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40613 - Remove patch "0019-UBWC_5-and-UBWC_6-support.patch", as upstream has merged it: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40758 - Update unofficial support for Adreno 825 from whitebelyash's patch: whitebelyash/mesa-unified@efb4500
1 parent 74da045 commit da992d3

7 files changed

Lines changed: 85 additions & 286 deletions

packages/mesa/0003-fix-for-anon-file.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ Fallback to `@TERMUX_PREFIX@/tmp` if env `XDG_RUNTIME_DIR` is not set.
22

33
--- a/src/util/anon_file.c
44
+++ b/src/util/anon_file.c
5-
@@ -122,7 +122,7 @@ get_or_create_user_temp_dir(char* buf, size_t len) {
5+
@@ -125,7 +125,7 @@ get_or_create_user_temp_dir(void) {
66
return buf;
77
}
88

9-
- snprintf(buf, len, "/tmp/xdg-runtime-mesa-%ld", (long)getuid());
10-
+ snprintf(buf, len, "@TERMUX_PREFIX@/tmp/xdg-runtime-mesa-%ld", (long)getuid());
9+
- n = asprintf(&buf, "/tmp/xdg-runtime-mesa-%ld", (long)getuid());
10+
+ n = asprintf(&buf, "@TERMUX_PREFIX@/tmp/xdg-runtime-mesa-%ld", (long)getuid());
11+
if (n < 0)
12+
return NULL;
1113
mesa_logd("%s: XDG_RUNTIME_DIR not set; falling back to temp dir %s",
12-
__func__, buf);
13-
if (stat(buf, &st) == 0) {

packages/mesa/0019-UBWC_5-and-UBWC_6-support.patch

Lines changed: 0 additions & 24 deletions
This file was deleted.

packages/mesa/0020-unofficial-support-adreno-830.patch

Lines changed: 0 additions & 85 deletions
This file was deleted.

packages/mesa/0021-unofficial-support-adreno-810-825-829.patch

Lines changed: 0 additions & 168 deletions
This file was deleted.
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
freedreno/common: enable A825
2+
3+
The source code is from whitebelyash:
4+
https://github.com/whitebelyash/mesa-unified/commit/efb4500439dca28f50bc6c874e271708dca2f821
5+
6+
diff --git a/src/freedreno/common/freedreno_devices.py b/src/freedreno/common/freedreno_devices.py
7+
index 4b2a004af7c..9f9f914c9ec 100644
8+
--- a/src/freedreno/common/freedreno_devices.py
9+
+++ b/src/freedreno/common/freedreno_devices.py
10+
@@ -1423,6 +1423,31 @@ add_gpus([
11+
raw_magic_regs = a8xx_base_raw_magic_regs,
12+
))
13+
14+
+add_gpus([
15+
+ GPUId(chip_id=0x44030000, name="Adreno (TM) 825"),
16+
+ ], A6xxGPUInfo(
17+
+ CHIP.A8XX,
18+
+ [a7xx_base, a7xx_gen3, a8xx_base, a8xx_gen1, GPUProps(
19+
+ # This is probably not an optimal config for gmem/sysmem, but it was working before and I don't have any 825 device to test (neither I have any trace info)
20+
+ sysmem_ccu_color_cache_fraction = CCUColorCacheFraction.FULL.value,
21+
+ sysmem_per_ccu_color_cache_size = 128 * 1024,
22+
+ sysmem_ccu_depth_cache_fraction = CCUColorCacheFraction.THREE_QUARTER.value,
23+
+ sysmem_per_ccu_depth_cache_size = 96 * 1024,
24+
+ )],
25+
+ num_ccu = 4,
26+
+ num_slices = 2,
27+
+ tile_align_w = 96,
28+
+ tile_align_h = 32,
29+
+ tile_max_w = 16416,
30+
+ tile_max_h = 16384,
31+
+ num_vsc_pipes = 32,
32+
+ cs_shared_mem_size = 32 * 1024,
33+
+ wave_granularity = 2,
34+
+ fibers_per_sp = 128 * 2 * 16,
35+
+ magic_regs = dict(),
36+
+ raw_magic_regs = a8xx_base_raw_magic_regs,
37+
+ ))
38+
+
39+
add_gpus([
40+
GPUId(chip_id=0xffff44050A31, name="Adreno (TM) 840"),
41+
], A6xxGPUInfo(
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
Created by, or sourced from, Vauzi-17
2+
https://github.com/Vauzi-17/710/commit/df5319f68ee857c598fffd18012d066c91ed5c08
3+
4+
diff --git a/src/freedreno/common/freedreno_devices.py b/src/freedreno/common/freedreno_devices.py
5+
index 9f9f914c9ec..d1f4fa4712a 100644
6+
--- a/src/freedreno/common/freedreno_devices.py
7+
+++ b/src/freedreno/common/freedreno_devices.py
8+
@@ -1014,6 +1014,26 @@ add_gpus([
9+
raw_magic_regs = a730_raw_magic_regs,
10+
))
11+
12+
+add_gpus([
13+
+ GPUId(chip_id=0x43020100, name="FD722"),
14+
+ GPUId(chip_id=0xffff43020100, name="FD722"),
15+
+ ], A6xxGPUInfo(
16+
+ CHIP.A7XX,
17+
+ [a7xx_base, a7xx_gen1],
18+
+ num_ccu = 3,
19+
+ tile_align_w = 64,
20+
+ tile_align_h = 32,
21+
+ tile_max_w = 1024,
22+
+ tile_max_h = 1024,
23+
+ num_vsc_pipes = 32,
24+
+ cs_shared_mem_size = 32 * 1024,
25+
+ wave_granularity = 2,
26+
+ fibers_per_sp = 128 * 2 * 16,
27+
+ highest_bank_bit = 16,
28+
+ magic_regs = a730_magic_regs,
29+
+ raw_magic_regs = a730_raw_magic_regs,
30+
+ ))
31+
+
32+
add_gpus([
33+
GPUId(chip_id=0x07030001, name="FD730"), # KGSL, no speedbin data
34+
GPUId(chip_id=0xffff07030001, name="FD730"), # Default no-speedbin fallback

packages/mesa/build.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ TERMUX_PKG_DESCRIPTION="An open-source implementation of the OpenGL specificatio
33
TERMUX_PKG_LICENSE="MIT"
44
TERMUX_PKG_LICENSE_FILE="docs/license.rst"
55
TERMUX_PKG_MAINTAINER="@termux"
6-
TERMUX_PKG_VERSION="26.0.6"
7-
TERMUX_PKG_SRCURL=https://archive.mesa3d.org/mesa-${TERMUX_PKG_VERSION}.tar.xz
8-
TERMUX_PKG_SHA256=1d3c3b8a8363b8cc354175bb4a684ad8b035211cc1d6fa17aeb9b9623c513f89
9-
TERMUX_PKG_AUTO_UPDATE=true
6+
TERMUX_PKG_VERSION="26.2.0"
7+
TERMUX_PKG_SRCURL=git+https://gitlab.freedesktop.org/mesa/mesa.git
8+
TERMUX_PKG_GIT_BRANCH=main
9+
_COMMIT=e471e83a6581120214a67b91b5b5fa94ae7a5de1
10+
TERMUX_PKG_AUTO_UPDATE=false
1011
TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, libdrm, libglvnd, libllvm (<< $TERMUX_LLVM_NEXT_MAJOR_VERSION), libwayland, libx11, libxext, libxfixes, libxshmfence, libxxf86vm, ncurses, vulkan-loader, zlib, zstd"
1112
TERMUX_PKG_SUGGESTS="mesa-dev"
1213
TERMUX_PKG_BUILD_DEPENDS="libclc, libwayland-protocols, libxrandr, llvm, llvm-tools, mlir, spirv-tools, xorgproto"

0 commit comments

Comments
 (0)