Add more checks

microsoft · Aug 30, 2024 · 2ac780e · 2ac780e
1 parent 16c9c64
commit 2ac780e
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/Src/Shaders/CompileShaders.cmd b/Src/Shaders/CompileShaders.cmd
@@ -59,11 +59,6 @@ if exist %PCDXC% goto dxilver
 set PCDXC=dxc.exe
 goto continue
 
-:dxcviaenv
-set PCDXC="%DirectXShaderCompiler%"
-if exist %PCDXC% goto continue
-goto needdxil
-
 :dxilver
 if not defined WindowsSDKVersion goto continue
 REM known DXC.EXE versions that don't support -HV 2021
@@ -72,6 +67,15 @@ if not "x%WindowsSDKVersion:10.0.20348.0=%"=="x%WindowsSDKVersion%" set DXILOPTS
 if not "x%WindowsSDKVersion:10.0.22000.0=%"=="x%WindowsSDKVersion%" set DXILOPTS=%DXILOPTS:-HV 2021=%
 goto continue
 
+:dxcviaenv
+set PCDXC="%DirectXShaderCompiler%"
+if not exist %PCDXC% goto needdxil
+
+if not "x%DirectXShaderCompiler:10.0.19041.0=%"=="x%DirectXShaderCompiler%" set DXILOPTS=%DXILOPTS:-HV 2021=%
+if not "x%DirectXShaderCompiler:10.0.20348.0=%"=="x%DirectXShaderCompiler%" set DXILOPTS=%DXILOPTS:-HV 2021=%
+if not "x%DirectXShaderCompiler:10.0.22000.0=%"=="x%DirectXShaderCompiler%" set DXILOPTS=%DXILOPTS:-HV 2021=%
+goto continue
+
 :continuepc
 set PCOPTS=