Skip to content

Commit 6002f52

Browse files
committed
bump(main/mesa): 26.1.0-devel-20260410
- Sync with upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/166c68914b494c45fbd9e4a736a0fe5867581b6a - 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 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 810/825 from whitebelyash's patch: whitebelyash/mesa-tu8@e010ccc
1 parent a196f15 commit 6002f52

6 files changed

Lines changed: 78 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: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
freedreno: enable Adreno 810+825
2+
3+
The source code is from whitebelyash:
4+
https://github.com/whitebelyash/mesa-tu8/commit/e010ccc559f680b89a0867ab34025fcf0a438b82
5+
6+
diff --git a/src/freedreno/common/freedreno_devices.py b/src/freedreno/common/freedreno_devices.py
7+
index ee9bcf86437..0d80ed282d4 100644
8+
--- a/src/freedreno/common/freedreno_devices.py
9+
+++ b/src/freedreno/common/freedreno_devices.py
10+
@@ -1450,5 +1450,58 @@ add_gpus([
11+
raw_magic_regs = a8xx_base_raw_magic_regs,
12+
))
13+
14+
+# gen8_3_0
15+
+add_gpus([
16+
+ GPUId(chip_id=0x44010000, name="Adreno (TM) 810"),
17+
+ ], A6xxGPUInfo(
18+
+ CHIP.A8XX,
19+
+ [a7xx_base, a7xx_gen3, a8xx_base, a8xx_gen2, GPUProps(
20+
+ gmem_vpc_attr_buf_size = 16384,
21+
+ gmem_vpc_pos_buf_size = 12288,
22+
+ gmem_vpc_bv_pos_buf_size = 20480,
23+
+ # Don't show "raytracing disabled"
24+
+ has_ray_intersection = False,
25+
+ has_sw_fuse = False,
26+
+ )],
27+
+ num_ccu = 1, # I'm not sure about this
28+
+ num_slices = 1,
29+
+ tile_align_w = 32,
30+
+ tile_align_h = 16,
31+
+ tile_max_w = 16384,
32+
+ tile_max_h = 16384,
33+
+ num_vsc_pipes = 32,
34+
+ cs_shared_mem_size = 32 * 1024,
35+
+ wave_granularity = 2,
36+
+ fibers_per_sp = 128 * 2 * 16,
37+
+ magic_regs = dict(),
38+
+ raw_magic_regs = a8xx_base_raw_magic_regs,
39+
+ ))
40+
+
41+
+# gen8_6_0
42+
+add_gpus([
43+
+ GPUId(chip_id=0x44030000, name="Adreno (TM) 825"),
44+
+ ], A6xxGPUInfo(
45+
+ CHIP.A8XX,
46+
+ [a7xx_base, a7xx_gen3, a8xx_base, a8xx_gen1, GPUProps(
47+
+ # This is probably not an optimal config for gmem/sysmem, but it was working before and I don't have any a825 device to test (neither I have any trace info)
48+
+ sysmem_ccu_color_cache_fraction = CCUColorCacheFraction.FULL.value,
49+
+ sysmem_per_ccu_color_cache_size = 128 * 1024,
50+
+ sysmem_ccu_depth_cache_fraction = CCUColorCacheFraction.THREE_QUARTER.value,
51+
+ sysmem_per_ccu_depth_cache_size = 96 * 1024,
52+
+ )],
53+
+ num_ccu = 4,
54+
+ num_slices = 2,
55+
+ tile_align_w = 96,
56+
+ tile_align_h = 32,
57+
+ tile_max_w = 16416,
58+
+ tile_max_h = 16384,
59+
+ num_vsc_pipes = 32,
60+
+ cs_shared_mem_size = 32 * 1024,
61+
+ wave_granularity = 2,
62+
+ fibers_per_sp = 128 * 2 * 16,
63+
+ magic_regs = dict(),
64+
+ raw_magic_regs = a8xx_base_raw_magic_regs,
65+
+ ))
66+
+
67+
if __name__ == "__main__":
68+
main()

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.4"
7-
TERMUX_PKG_SRCURL=https://archive.mesa3d.org/mesa-${TERMUX_PKG_VERSION}.tar.xz
8-
TERMUX_PKG_SHA256=6d91541e086f29bb003602d2c81070f2be4c0693a90b181ca91e46fa3953fe78
9-
TERMUX_PKG_AUTO_UPDATE=true
6+
TERMUX_PKG_VERSION="26.1.0"
7+
TERMUX_PKG_SRCURL=git+https://gitlab.freedesktop.org/mesa/mesa.git
8+
TERMUX_PKG_GIT_BRANCH=main
9+
_COMMIT=166c68914b494c45fbd9e4a736a0fe5867581b6a
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)