Skip to content

Commit 9140efb

Browse files
Update 'mesa-vulkan-wrapper', Fix Build
1 parent 9ea1d68 commit 9140efb

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

packages/mesa-vulkan-wrapper/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ PKG_PRETTY_NAME="Mesa Android Wrapper"
44
VK_DRIVER_LIB="libvulkan_wrapper.so"
55

66
GIT_URL=https://github.com/KreitinnSoftware/mesa
7-
GIT_COMMIT=aa4faf628dd477ea7b05f416b4d8da07f75ab399
7+
GIT_COMMIT=7227cf46526196d54b22bd9ee53a265824f37420
88
LDFLAGS="-L$PREFIX/lib -landroid-shmem"
99
MESON_ARGS="-Dgallium-drivers= -Dvulkan-drivers=wrapper -Dglvnd=disabled -Dplatforms=x11 -Dxmlconfig=enabled -Dllvm=disabled -Dopengl=false -Degl=disabled -Dzstd=enabled"

packages/mesa-zink/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PKG_VER=24.3.0
1+
PKG_VER=25.1.4
22
PKG_CATEGORY="OpenGLDriver"
33
PKG_PRETTY_NAME="Mesa Zink Driver"
44

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
`_mesa_glapi_tls_Context` and `_mesa_glapi_tls_Dispatch` is declared as thread_local.
2+
Their symbol names will be `__emutls_v._mesa_glapi_tls_Context` and `__emutls_v._mesa_glapi_tls_Dispatch`
3+
as emulated TLS is enabled by NDK when `__ANDROID_API__` <= 28.
4+
5+
--- a/src/gallium/targets/dri/dri.sym.in
6+
+++ b/src/gallium/targets/dri/dri.sym.in
7+
@@ -8,8 +8,8 @@
8+
_mesa_glapi_get_proc_offset;
9+
_mesa_glapi_set_context;
10+
_mesa_glapi_set_dispatch;
11+
- _mesa_glapi_tls_Context;
12+
- _mesa_glapi_tls_Dispatch;
13+
+ __emutls_v._mesa_glapi_tls_Context;
14+
+ __emutls_v._mesa_glapi_tls_Dispatch;
15+
16+
ddebug_screen_create;
17+
noop_screen_create;

0 commit comments

Comments
 (0)