Make d3d10umd deployment easier by matching Microsoft WARP filename

when using 24.1.0-devel source or newer
pal1000 · Feb 8, 2024 · c295782 · c295782
1 parent e3a38b8
commit c295782
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/buildscript/modules/addversioninfo.cmd b/buildscript/modules/addversioninfo.cmd
@@ -64,6 +64,7 @@
 
 @rem Add version info to Mesa3D D3D10 software rendering driver
 @call "%devroot%\%projectname%\buildscript\modules\rcgen.cmd" "Mesa3D D3D10 software rendering driver" "%devroot%\%projectname%\bin\%abi%\d3d10sw.dll" %abi% %mesaver% "VMware Inc."
+@call "%devroot%\%projectname%\buildscript\modules\rcgen.cmd" "Mesa3D D3D10 software rendering driver" "%devroot%\%projectname%\bin\%abi%\d3d10warp.dll" %abi% %mesaver% "VMware Inc."
 
 @rem Add version info to Gallium raw interface without API frontend
 @call "%devroot%\%projectname%\buildscript\modules\rcgen.cmd" "Gallium raw interface with GDI window support" "%devroot%\%projectname%\bin\%abi%\graw.dll" %abi% %mesaver% "Mesa/X.org"

diff --git a/buildscript/modules/mesa3d.cmd b/buildscript/modules/mesa3d.cmd
@@ -361,6 +361,7 @@
 @IF %cand3d10umd% EQU 1 set /p d3d10umd=Build Mesa3D D3D10 software renderer (y/n):
 @IF %cand3d10umd% EQU 1 echo.
 @if /I "%d3d10umd%"=="y" set buildconf=%buildconf% -Dgallium-d3d10umd=true
+@if /I "%d3d10umd%"=="y" IF %intmesaver% GEQ 24100 set buildconf=%buildconf% -Dgallium-d3d10-dll-name=d3d10warp
 @if /I NOT "%d3d10umd%"=="y" IF %intmesaver% GEQ 21200 set buildconf=%buildconf% -Dgallium-d3d10umd=false
 
 @set spirvtodxil=n

diff --git a/releasenotes.md b/releasenotes.md
@@ -1,7 +1,8 @@
 ### Out of tree patching
 - Remove llvmpipe headers compatibility patch with LLVM 17 as it appears it stopped being necessary as of LLVM 17.0.5 or 17.0.6, maybe a fix in LLVM made [original patch](https://gitlab.freedesktop.org/mesa/mesa/-/commits/main?search=only+include+old+Transform+includes+when+needed) sufficient.
 ### Build script
-- Support configuring video acceleration codecs without VA-API dependency as this configuration is also used by Vulkan video extensions.
+- Support configuring video acceleration codecs without VA-API dependency as this configuration is also used by Vulkan video extensions;
+- Make d3d10umd deployment easier by matching Microsoft WARP filename when using 24.1.0-devel source or newer. 
 # 23.3.5 and 24.0.0
 - Updated Mesa3D to [23.3.5](https://gitlab.freedesktop.org/mesa/mesa/-/blob/23.3/docs/relnotes/23.3.5.rst?ref_type=heads&plain=0) and [24.0.0](https://gitlab.freedesktop.org/mesa/mesa/-/blob/24.0/docs/relnotes/24.0.0.rst?ref_type=heads&plain=0).
 ### Build configuration