Adjust patch fixing d3d10umd build aplicability

It is expected to land in 23.3.4
pal1000 · Jan 11, 2024 · 19f0abc · 19f0abc
1 parent afc6b50
commit 19f0abc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/buildscript/modules/mesa3d.cmd b/buildscript/modules/mesa3d.cmd
@@ -144,7 +144,7 @@
 @rem Fix d3d10sw MSVC build
 @IF %intmesaver% GEQ 21200 IF %intmesaver% LSS 22000 call "%devroot%\%projectname%\buildscript\modules\applypatch.cmd" d3d10sw
 @IF %intmesaver% GEQ 21300 IF %intmesaver% LSS 22000 call "%devroot%\%projectname%\buildscript\modules\applypatch.cmd" d3d10sw-2
-@IF %intmesaver% GEQ 23300 call "%devroot%\%projectname%\buildscript\modules\applypatch.cmd" d3d10sw-3
+@IF %intmesaver% GEQ 23300 IF %intmesaver% LSS 23354 call "%devroot%\%projectname%\buildscript\modules\applypatch.cmd" d3d10sw-3
 
 @rem Clover build on Windows
 @rem IF %intmesaver% GEQ 21300 call "%devroot%\%projectname%\buildscript\modules\applypatch.cmd" clover
@@ -357,6 +357,7 @@
 @if /I NOT "%glswrast%"=="y" set cand3d10umd=0
 @IF NOT %toolchain%==msvc set cand3d10umd=0
 @IF %intmesaver% LSS 22000 IF %disableootpatch% EQU 1 set cand3d10umd=0
+@IF %intmesaver% GEQ 23300 IF %intmesaver% LSS 23354 IF %disableootpatch% EQU 1 set cand3d10umd=0
 @IF %cand3d10umd% EQU 1 for /f delims^=^ eol^= %%a in ('@call "%devroot%\%projectname%\buildscript\modules\wdkcheck.cmd"') do @IF NOT "%%a"=="OK" set cand3d10umd=0
 @IF %cand3d10umd% EQU 1 set /p d3d10umd=Build Mesa3D D3D10 software renderer (y/n):
 @IF %cand3d10umd% EQU 1 echo.

diff --git a/releasenotes.md b/releasenotes.md
@@ -1,3 +1,5 @@
+### Out of tree patches
+- Adjust patch fixing d3d10umd build aplicability, it is expected to land in 23.3.4.
 ### Binary versionning
 - Update for year 2024.
 ### Build script