Skip to content

Commit 0f01c3d

Browse files
mmozeikommozeiko
committed
mesa 25.0.0
1 parent 350cf0c commit 0f01c3d

File tree

4 files changed

+86
-47
lines changed

4 files changed

+86
-47
lines changed

‎.github/workflows/build-mesa.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,18 @@ jobs:
2121
- name: checkout
2222
uses: actions/checkout@v4
2323

24+
- name: install vulkan sdk
25+
shell: cmd
26+
run: |
27+
curl -fL -o vulkan-sdk.exe https://sdk.lunarg.com/sdk/download/1.4.304.1/windows/VulkanSDK-1.4.304.1-Installer.exe || exit /b 1
28+
vulkan-sdk.exe --root %cd%\vulkan --accept-licenses --default-answer --confirm-command install com.lunarg.vulkan || exit /b 1
29+
2430
- name: build
2531
id: build
2632
shell: cmd
27-
run: call build.cmd ${{ matrix.arch }}
33+
run: |
34+
set PATH=%cd%\vulkan\bin;%PATH%
35+
call build.cmd ${{ matrix.arch }}
2836
2937
- name: upload artifacts
3038
uses: actions/upload-artifact@v4

‎build.cmd

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
@echo off
22
setlocal enabledelayedexpansion
33

4-
set LLVM_VERSION=19.1.7
5-
set MESA_VERSION=24.3.4
4+
set LLVM_VERSION=20.1.0-rc2
5+
set MESA_VERSION=25.0.0
66

77
rem *** architectures ***
88

@@ -222,7 +222,6 @@ if "!TARGET_ARCH!" neq "!HOST_ARCH!" (
222222
-D LLVM_ENABLE_BACKTRACES=OFF ^
223223
-D LLVM_ENABLE_UNWIND_TABLES=OFF ^
224224
-D LLVM_ENABLE_CRASH_OVERRIDES=OFF ^
225-
-D LLVM_ENABLE_TERMINFO=OFF ^
226225
-D LLVM_ENABLE_LIBXML2=OFF ^
227226
-D LLVM_ENABLE_LIBEDIT=OFF ^
228227
-D LLVM_ENABLE_LIBPFM=OFF ^
@@ -268,7 +267,6 @@ cmake ^
268267
-D LLVM_ENABLE_BACKTRACES=OFF ^
269268
-D LLVM_ENABLE_UNWIND_TABLES=OFF ^
270269
-D LLVM_ENABLE_CRASH_OVERRIDES=OFF ^
271-
-D LLVM_ENABLE_TERMINFO=OFF ^
272270
-D LLVM_ENABLE_LIBXML2=OFF ^
273271
-D LLVM_ENABLE_LIBEDIT=OFF ^
274272
-D LLVM_ENABLE_LIBPFM=OFF ^
@@ -320,7 +318,7 @@ meson setup ^
320318
-Dvulkan-drivers=swrast ^
321319
!MESON_CROSS! || exit /b 1
322320
ninja -C mesa.build-%MESA_ARCH% install || exit /b 1
323-
python mesa.src\src\vulkan\util\vk_icd_gen.py --api-version 1.3 --xml mesa.src\src\vulkan\registry\vk.xml --lib-path vulkan_lvp.dll --out mesa-llvmpipe-%MESA_ARCH%\bin\lvp_icd.!TARGET_ARCH_NAME!.json || exit /b 1
321+
python mesa.src\src\vulkan\util\vk_icd_gen.py --api-version 1.4 --xml mesa.src\src\vulkan\registry\vk.xml --lib-path vulkan_lvp.dll --out mesa-llvmpipe-%MESA_ARCH%\bin\lvp_icd.!TARGET_ARCH_NAME!.json || exit /b 1
324322

325323
rem *** d3d12, dzn ***
326324

‎mesa.patch

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
diff --git meson.build meson.build
2-
index 9fb4160..6f62a3f 100644
2+
index 597a32e..5fd5a25 100644
33
--- meson.build
44
+++ meson.build
5-
@@ -579,7 +579,7 @@ if with_gallium_kmsro and (with_platform_x11 and not with_dri3)
5+
@@ -598,7 +598,7 @@ if with_dri
66
endif
77

88
dep_dxheaders = null_dep
9-
-if with_gallium_d3d12 or with_microsoft_clc or with_microsoft_vk
9+
-if with_gallium_d3d12 or with_microsoft_clc or with_microsoft_vk or with_gfxstream_vk and host_machine.system() == 'windows'
1010
+if true
1111
dep_dxheaders = dependency('directx-headers', required : false)
1212
if not dep_dxheaders.found()
1313
dep_dxheaders = dependency('DirectX-Headers',
14-
@@ -954,9 +954,6 @@ except:
14+
@@ -946,9 +946,6 @@ except:
1515
import mako
1616
assert Version(mako.__version__) >= Version("0.8.0")
1717
''', check: false)
@@ -21,32 +21,14 @@ index 9fb4160..6f62a3f 100644
2121

2222
has_yaml = run_command(
2323
prog_python, '-c',
24-
@@ -1104,7 +1101,6 @@ if cc.get_argument_syntax() == 'msvc'
24+
@@ -1096,7 +1093,6 @@ if cc.get_argument_syntax() == 'msvc'
2525
'/wd5105', # macro expansion producing 'defined' has undefined behavior (winbase.h, need Windows SDK upgrade)
2626
'/we4020', # Error when passing the wrong number of parameters
2727
'/we4024', # Error when passing different type of parameter
2828
- '/we4189', # 'identifier' : local variable is initialized but not referenced
2929
'/Zc:__cplusplus', #Set __cplusplus macro to match the /std:c++<version> on the command line
3030
]
3131
c_args += cc.get_supported_arguments(_trial)
32-
@@ -1539,7 +1535,7 @@ if cc.links('int main() { return 0; }',
33-
args : '-Wl,--dynamic-list=@0@'.format(
34-
join_paths(meson.current_source_dir(), 'build-support/conftest.dyn')),
35-
name : 'dynamic-list')
36-
- with_ld_dynamic_list = true
37-
+ with_ld_dynamic_list = false
38-
endif
39-
40-
ld_args_build_id = cc.get_supported_link_arguments('-Wl,--build-id=sha1')
41-
@@ -1735,7 +1731,7 @@ if dep_libudev.found()
42-
pre_args += '-DHAVE_LIBUDEV'
43-
endif
44-
45-
-llvm_modules = ['bitwriter', 'engine', 'mcdisassembler', 'mcjit', 'core', 'executionengine', 'scalaropts', 'transformutils', 'instcombine']
46-
+llvm_modules = ['bitwriter', 'engine', 'mcdisassembler', 'mcjit', 'core', 'executionengine', 'scalaropts', 'transformutils', 'instcombine', 'passes']
47-
llvm_optional_modules = ['coroutines']
48-
if with_amd_vk or with_gallium_radeonsi or with_gallium_r600
49-
llvm_modules += ['amdgpu', 'bitreader', 'ipo']
5032
diff --git src/gallium/drivers/llvmpipe/lp_tex_sample.h src/gallium/drivers/llvmpipe/lp_tex_sample.h
5133
index 9e8baa0..e04f98a 100644
5234
--- src/gallium/drivers/llvmpipe/lp_tex_sample.h

‎meson.llvm.build

Lines changed: 69 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,83 @@ project('llvm', ['cpp'])
22

33
cpp = meson.get_compiler('cpp')
44

5-
deps = ['LLVMAggressiveInstCombine', 'LLVMAnalysis', 'LLVMAsmParser', 'LLVMAsmPrinter',
6-
'LLVMBinaryFormat', 'LLVMBitReader', 'LLVMBitstreamReader', 'LLVMBitWriter',
7-
'LLVMCFGuard', 'LLVMCodeGen', 'LLVMCodeGenTypes', 'LLVMCore', 'LLVMCoroutines',
8-
'LLVMDebugInfoBTF', 'LLVMDebugInfoCodeView', 'LLVMDebugInfoDWARF',
9-
'LLVMDebugInfoMSF', 'LLVMDebugInfoPDB', 'LLVMDemangle', 'LLVMExecutionEngine',
10-
'LLVMFrontendOffloading', 'LLVMFrontendOpenMP', 'LLVMGlobalISel', 'LLVMHipStdPar',
11-
'LLVMInstCombine', 'LLVMInstrumentation', 'LLVMInterpreter', 'LLVMipo',
12-
'LLVMIRPrinter', 'LLVMIRReader', 'LLVMLinker', 'LLVMMC', 'LLVMMCA',
13-
'LLVMMCDisassembler', 'LLVMMCJIT', 'LLVMMCParser', 'LLVMObjCARCOpts',
14-
'LLVMObject', 'LLVMOrcShared', 'LLVMOrcTargetProcess', 'LLVMPasses',
15-
'LLVMProfileData', 'LLVMRemarks', 'LLVMRuntimeDyld', 'LLVMScalarOpts',
16-
'LLVMSelectionDAG', 'LLVMSupport', 'LLVMSymbolize', 'LLVMTarget',
17-
'LLVMTargetParser', 'LLVMTextAPI', 'LLVMTransformUtils', 'LLVMVectorize']
5+
deps = ['LLVMAggressiveInstCombine',
6+
'LLVMAnalysis',
7+
'LLVMAsmParser',
8+
'LLVMAsmPrinter',
9+
'LLVMBinaryFormat',
10+
'LLVMBitReader',
11+
'LLVMBitstreamReader',
12+
'LLVMBitWriter',
13+
'LLVMCFGuard',
14+
'LLVMCGData',
15+
'LLVMCodeGen',
16+
'LLVMCodeGenTypes',
17+
'LLVMCore',
18+
'LLVMCoroutines',
19+
'LLVMDebugInfoBTF',
20+
'LLVMDebugInfoCodeView',
21+
'LLVMDebugInfoDWARF',
22+
'LLVMDebugInfoMSF',
23+
'LLVMDebugInfoPDB',
24+
'LLVMDemangle',
25+
'LLVMExecutionEngine',
26+
'LLVMFrontendAtomic',
27+
'LLVMFrontendOffloading',
28+
'LLVMFrontendOpenMP',
29+
'LLVMGlobalISel',
30+
'LLVMHipStdPar',
31+
'LLVMInstCombine',
32+
'LLVMInstrumentation',
33+
'LLVMInterpreter',
34+
'LLVMipo',
35+
'LLVMIRPrinter',
36+
'LLVMIRReader',
37+
'LLVMLinker',
38+
'LLVMMC',
39+
'LLVMMCA',
40+
'LLVMMCDisassembler',
41+
'LLVMMCJIT',
42+
'LLVMMCParser',
43+
'LLVMObjCARCOpts',
44+
'LLVMObject',
45+
'LLVMOrcShared',
46+
'LLVMOrcTargetProcess',
47+
'LLVMPasses',
48+
'LLVMProfileData',
49+
'LLVMRemarks',
50+
'LLVMRuntimeDyld',
51+
'LLVMSandboxIR',
52+
'LLVMScalarOpts',
53+
'LLVMSelectionDAG',
54+
'LLVMSupport',
55+
'LLVMSymbolize',
56+
'LLVMTarget',
57+
'LLVMTargetParser',
58+
'LLVMTextAPI',
59+
'LLVMTransformUtils',
60+
'LLVMVectorize']
1861

1962
if host_machine.cpu_family() == 'aarch64'
2063
folder = '../../../llvm-arm64'
21-
deps += ['LLVMAArch64AsmParser', 'LLVMAArch64CodeGen', 'LLVMAArch64Desc',
22-
'LLVMAArch64Disassembler', 'LLVMAArch64Info', 'LLVMAArch64Utils']
64+
deps += ['LLVMAArch64AsmParser',
65+
'LLVMAArch64CodeGen',
66+
'LLVMAArch64Desc',
67+
'LLVMAArch64Disassembler',
68+
'LLVMAArch64Info',
69+
'LLVMAArch64Utils']
2370
else
2471
if host_machine.cpu_family() == 'x86_64'
2572
folder = '../../../llvm-x64'
2673
else
2774
folder = '../../../llvm-x86'
2875
endif
29-
deps += ['LLVMX86AsmParser', 'LLVMX86CodeGen', 'LLVMX86Desc', 'LLVMX86Disassembler',
30-
'LLVMX86Info', 'LLVMX86TargetMCA']
76+
deps += ['LLVMX86AsmParser',
77+
'LLVMX86CodeGen',
78+
'LLVMX86Desc',
79+
'LLVMX86Disassembler',
80+
'LLVMX86Info',
81+
'LLVMX86TargetMCA']
3182
endif
3283

3384
_deps = []
@@ -39,5 +90,5 @@ endforeach
3990
dep_llvm = declare_dependency(
4091
include_directories : include_directories(folder + '/include'),
4192
dependencies : _deps,
42-
version : '19.1.2',
93+
version : '20.1.0',
4394
)

0 commit comments

Comments
 (0)