Skip to content

Commit

Permalink
mesa 24.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
mmozeiko committed Mar 15, 2024
1 parent cd980df commit 5517480
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 18 deletions.
9 changes: 4 additions & 5 deletions build.cmd
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
@echo off
setlocal enabledelayedexpansion

set LLVM_VERSION=18.1.0rc4
set LLVM2_VERSION=18.1.0-rc4
set MESA_VERSION=24.0.2
set LLVM_VERSION=18.1.1
set MESA_VERSION=24.0.3

set PATH=%CD%\llvm\bin;%CD%\winflexbison;%PATH%

Expand Down Expand Up @@ -81,10 +80,10 @@ where /Q cl.exe || (
rem *** download sources ***

echo Downloading llvm
curl -sfL https://github.com/llvm/llvm-project/releases/download/llvmorg-%LLVM2_VERSION%/llvm-%LLVM_VERSION%.src.tar.xz ^
curl -sfL https://github.com/llvm/llvm-project/releases/download/llvmorg-%LLVM_VERSION%/llvm-%LLVM_VERSION%.src.tar.xz ^
| %SZIP% x -bb0 -txz -si -so ^
| %SZIP% x -bb0 -ttar -si -aoa 1>nul 2>nul
curl -sfL https://github.com/llvm/llvm-project/releases/download/llvmorg-%LLVM2_VERSION%/cmake-%LLVM_VERSION%.src.tar.xz ^
curl -sfL https://github.com/llvm/llvm-project/releases/download/llvmorg-%LLVM_VERSION%/cmake-%LLVM_VERSION%.src.tar.xz ^
| %SZIP% x -bb0 -txz -si -so ^
| %SZIP% x -bb0 -ttar -si -aoa 1>nul 2>nul
move llvm-%LLVM_VERSION%.src llvm.src
Expand Down
13 changes: 0 additions & 13 deletions mesa.patch
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,6 @@ index 9e8baa0..e04f98a 100644

struct lp_build_sampler_soa *
lp_llvm_sampler_soa_create(const struct lp_sampler_static_state *static_state,
diff --git src/gallium/frontends/wgl/stw_device.c src/gallium/frontends/wgl/stw_device.c
index 2db745f..b1ab22b 100644
--- src/gallium/frontends/wgl/stw_device.c
+++ src/gallium/frontends/wgl/stw_device.c
@@ -253,7 +253,7 @@ stw_cleanup(void)
st_screen_destroy(stw_dev->fscreen);
FREE(stw_dev->fscreen);

- stw_dev->screen->destroy(stw_dev->screen);
+ if (stw_dev->screen) stw_dev->screen->destroy(stw_dev->screen);

stw_tls_cleanup();

diff --git src/gallium/targets/libgl-gdi/meson.build src/gallium/targets/libgl-gdi/meson.build
index 7e1b87b..92f786a 100644
--- src/gallium/targets/libgl-gdi/meson.build
Expand Down

0 comments on commit 5517480

Please sign in to comment.