Installer: Add support to install 32-bit vulkaninfo

Add support to install 32-bit vulkaninfo

diff --git a/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1 b/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1
index ce3ab23..d273c2a 100644 (file)
--- a/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1
+++ b/windowsRuntimeInstaller/ConfigLayersAndVulkanDLL.ps1
@@ -206,7 +206,6 @@ Get-ChildItem -Path Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\Curr
 \r
 $VulkanSdkDirs+="C:\VulkanSDK\0.9.3"\r
 \r
-\r
 # Remove layer registry entries associated with all installed Vulkan SDKs.\r
 # Note that we remove only those entries created by Vulkan SDKs. If other\r
 # layers were installed that are not from an SDK, we don't mess with them.\r

diff --git a/windowsRuntimeInstaller/InstallerRT.nsi b/windowsRuntimeInstaller/InstallerRT.nsi
index 8473042..9cb1ac9 100644 (file)
--- a/windowsRuntimeInstaller/InstallerRT.nsi
+++ b/windowsRuntimeInstaller/InstallerRT.nsi
@@ -290,7 +290,9 @@ Section "uninstall"
         # It will be deleted later when we remove the install directory.
         File ConfigLayersAndVulkanDLL.ps1
 
-        # Delete vulkaninfo.exe in C:\Windows\System32
+        # Delete vulkaninfo.exe in C:\Windows\System32 and C:\Windows\SysWOW64
+        Delete /REBOOTOK $WINDIR\SysWow64\vulkaninfo.exe
+        Delete /REBOOTOK "$WINDIR\SysWow64\vulkaninfo-$FileVersion.exe"
         Delete /REBOOTOK $WINDIR\System32\vulkaninfo.exe
         Delete /REBOOTOK "$WINDIR\System32\vulkaninfo-$FileVersion.exe"