project: Fix tabs, whitespace and line endings

Change-Id: I9cca32a98a1b984b44eca42e4805461c220ae04f

diff --git a/determine_vs_version.py b/determine_vs_version.py
index c389ccd..9dec722 100644 (file)
--- a/determine_vs_version.py
+++ b/determine_vs_version.py
@@ -40,76 +40,76 @@ def find_executable(program):
                 return exe_file
 
     return None
-       
+    
 def determine_year(version):
-       if version == 8:
-               return 2005
-       elif version == 9:
-               return 2008
-       elif version == 10:
-               return 2010
-       elif version == 11:
-               return 2012
-       elif version == 12:
-               return 2013
-       elif version == 14:
-               return 2015
-       else:
-               return 0000
-       
+    if version == 8:
+        return 2005
+    elif version == 9:
+        return 2008
+    elif version == 10:
+        return 2010
+    elif version == 11:
+        return 2012
+    elif version == 12:
+        return 2013
+    elif version == 14:
+        return 2015
+    else:
+        return 0000
+    
 # Determine if msbuild is in the path, then call it to determine the version and parse
 # it into a format we can use, which is "<version_num> <version_year>".
 if __name__ == '__main__':
-       exeName     = 'msbuild.exe'
-       versionCall = exeName + ' /ver'
+    exeName     = 'msbuild.exe'
+    versionCall = exeName + ' /ver'
 
-       # Determine if the executable exists in the path, this is critical.
-       #
-       foundExeName = find_executable(exeName)
+    # Determine if the executable exists in the path, this is critical.
+    #
+    foundExeName = find_executable(exeName)
 
-       # If not found, return an invalid number but in the appropriate format so it will
-       # fail if the program above tries to use it.
-       if foundExeName == None:
-               print('00 0000')
-               print('Executable ' + exeName + ' not found in PATH!')          
-       else:
-               sysCallOut = os.popen(versionCall).read()
-               
-               version = None
+    # If not found, return an invalid number but in the appropriate format so it will
+    # fail if the program above tries to use it.
+    if foundExeName == None:
+        print('00 0000')
+        print('Executable ' + exeName + ' not found in PATH!')
+    else:
+        sysCallOut = os.popen(versionCall).read()
+        
+        version = None
 
-               # Split around any spaces first
-               spaceList  = sysCallOut.split(' ')
-               for spaceString in spaceList:
+        # Split around any spaces first
+        spaceList  = sysCallOut.split(' ')
+        for spaceString in spaceList:
 
-                       # If we've already found it, bail.
-                       if version != None:
-                               break
-               
-                       # Now split around line feeds
-                       lineList = spaceString.split('\n')
-                       for curLine in lineList:
+            # If we've already found it, bail.
+            if version != None:
+                break
+        
+            # Now split around line feeds
+            lineList = spaceString.split('\n')
+            for curLine in lineList:
 
-                               # If we've already found it, bail.
-                               if version != None:
-                                       break
-                       
-                               # We only want to continue if there's a period in the list
-                               if '.' not in curLine:
-                                       continue
+                # If we've already found it, bail.
+                if version != None:
+                    break
+            
+                # We only want to continue if there's a period in the list
+                if '.' not in curLine:
+                    continue
 
-                               # Get the first element and determine if it is a number, if so, we've
-                               # got our number.
-                               splitAroundPeriod = curLine.split('.')
-                               if splitAroundPeriod[0].isdigit():
-                                       version = int (splitAroundPeriod[0])
-                                       break
-               
-               # Failsafe to return a number in the proper format, but one that will fail.
-               if version == None:
-                       version = 00
+                # Get the first element and determine if it is a number, if so, we've
+                # got our number.
+                splitAroundPeriod = curLine.split('.')
+                if splitAroundPeriod[0].isdigit():
+                    version = int (splitAroundPeriod[0])
+                    break
+        
+        # Failsafe to return a number in the proper format, but one that will fail.
+        if version == None:
+            version = 00
 
-               # Determine the year associated with that version
-               year = determine_year(version)
+        # Determine the year associated with that version
+        year = determine_year(version)
         
-               # Output the string we need for Cmake to properly build for this version
-               print(str(version) + ' ' + str(year))
+        # Output the string we need for Cmake to properly build for this version
+        print(str(version) + ' ' + str(year))

diff --git a/update_external_sources.bat b/update_external_sources.bat
index e4f1cae..afe63d0 100755 (executable)
--- a/update_external_sources.bat
+++ b/update_external_sources.bat
@@ -1,386 +1,386 @@
-@echo off\r
-REM Update source for glslang, spirv-tools\r
-\r
-REM Determine the appropriate CMake strings for the current version of Visual Studio\r
-echo Determining VS version\r
-python .\determine_vs_version.py > vsversion.tmp\r
-set /p VS_VERSION=< vsversion.tmp\r
-echo Detected Visual Studio Version as %VS_VERSION%\r
-\r
-REM Cleanup the file we used to collect the VS version output since it's no longer needed.\r
-del /Q /F vsversion.tmp\r
-\r
-setlocal EnableDelayedExpansion\r
-set errorCode=0\r
-set BUILD_DIR=%~dp0\r
+@echo off
+REM Update source for glslang, spirv-tools
+
+REM Determine the appropriate CMake strings for the current version of Visual Studio
+echo Determining VS version
+python .\determine_vs_version.py > vsversion.tmp
+set /p VS_VERSION=< vsversion.tmp
+echo Detected Visual Studio Version as %VS_VERSION%
+
+REM Cleanup the file we used to collect the VS version output since it's no longer needed.
+del /Q /F vsversion.tmp
+
+setlocal EnableDelayedExpansion
+set errorCode=0
+set BUILD_DIR=%~dp0
 set BASE_DIR=%BUILD_DIR%external
-set GLSLANG_DIR=%BASE_DIR%\glslang\r
-set SPIRV_TOOLS_DIR=%BASE_DIR%\spirv-tools\r
-\r
-REM // ======== Parameter parsing ======== //\r
-\r
-   if "%1" == "" (\r
-      echo usage: update_external_sources.bat [options]\r
-      echo.\r
-      echo Available options:\r
-      echo   --sync-glslang      just pull glslang_revision\r
-      echo   --sync-spirv-tools  just pull spirv-tools_revision\r
-      echo   --build-glslang     pulls glslang_revision, configures CMake, builds Release and Debug\r
-      echo   --build-spirv-tools pulls spirv-tools_revision, configures CMake, builds Release and Debug\r
-      echo   --all               sync and build glslang, LunarGLASS, spirv-tools\r
-      goto:finish\r
-   )\r
-\r
-   set sync-glslang=0\r
-   set sync-spirv-tools=0\r
-   set build-glslang=0\r
-   set build-spirv-tools=0\r
-   set check-glslang-build-dependencies=0\r
-\r
-   :parameterLoop\r
-\r
-      if "%1"=="" goto:parameterContinue\r
-\r
-      if "%1" == "--sync-glslang" (\r
-         set sync-glslang=1\r
-         shift\r
-         goto:parameterLoop\r
-      )\r
-\r
-         if "%1" == "--sync-spirv-tools" (\r
-         set sync-spirv-tools=1\r
-         shift\r
-         goto:parameterLoop\r
-      )\r
-\r
-      if "%1" == "--build-glslang" (\r
-         set sync-glslang=1\r
-         set check-glslang-build-dependencies=1\r
-         set build-glslang=1\r
-         shift\r
-         goto:parameterLoop\r
-      )\r
-\r
-         if "%1" == "--build-spirv-tools" (\r
-         set sync-spirv-tools=1\r
-                REM glslang has the same needs as spirv-tools\r
-         set check-glslang-build-dependencies=1\r
-         set build-spirv-tools=1\r
-         shift\r
-         goto:parameterLoop\r
-      )\r
-\r
-      if "%1" == "--all" (\r
-         set sync-glslang=1\r
-         set sync-spirv-tools=1\r
-         set build-glslang=1\r
-         set build-spirv-tools=1\r
-         set check-glslang-build-dependencies=1\r
-         shift\r
-         goto:parameterLoop\r
-      )\r
-\r
-      echo Unrecognized options "%1"\r
-      goto:error\r
-\r
-   :parameterContinue\r
-\r
-REM // ======== end Parameter parsing ======== //\r
-\r
-\r
-REM // ======== Dependency checking ======== //\r
-   REM git is required for all paths\r
-   for %%X in (git.exe) do (set FOUND=%%~$PATH:X)\r
-   if not defined FOUND (\r
-      echo Dependency check failed:\r
-      echo   git.exe not found\r
-      echo   Git for Windows can be downloaded here:  https://git-scm.com/download/win\r
-      echo   Install and ensure git.exe makes it into your PATH\r
-      set errorCode=1\r
-   )\r
-\r
-   if %check-glslang-build-dependencies% equ 1 (\r
-      for %%X in (cmake.exe) do (set FOUND=%%~$PATH:X)\r
-      if not defined FOUND (\r
-         echo Dependency check failed:\r
-         echo   cmake.exe not found\r
-         echo   Get CNake 2.8 for Windows here:  http://www.cmake.org/cmake/resources/software.html\r
-         echo   Install and ensure each makes it into your PATH, default is "C:\Program Files (x86)\CMake\bin"\r
-         set errorCode=1\r
-      )\r
-   )\r
-\r
-\r
-   REM goto:main\r
-\r
-REM // ======== end Dependency checking ======== //\r
-\r
-:main\r
-\r
-if %errorCode% neq 0 (goto:error)\r
-\r
-REM Read the target versions from external file, which is shared with Linux script\r
-\r
-if not exist glslang_revision (\r
-   echo.\r
-   echo Missing glslang_revision file!  Place it next to this script with target version in it.\r
-   set errorCode=1\r
-   goto:error\r
-)\r
-\r
-if not exist spirv-tools_revision (\r
-   echo.\r
-   echo Missing spirv-tools_revision file!  Place it next to this script with target version in it.\r
-   set errorCode=1\r
-   goto:error\r
-)\r
-\r
-set /p GLSLANG_REVISION= < glslang_revision\r
-set /p SPIRV_TOOLS_REVISION= < spirv-tools_revision\r
-echo GLSLANG_REVISION=%GLSLANG_REVISION%\r
-echo SPIRV_TOOLS_REVISION=%SPIRV_TOOLS_REVISION%\r
-\r
-\r
-echo Creating and/or updating glslang, spirv-tools in %BASE_DIR%\r
-\r
-if %sync-glslang% equ 1 (\r
-   if exist %GLSLANG_DIR% (\r
-      rd /S /Q %GLSLANG_DIR%\r
-   )\r
-   if not exist %GLSLANG_DIR% (\r
-      call:create_glslang\r
-   )\r
-   if %errorCode% neq 0 (goto:error)\r
-   call:update_glslang\r
-   if %errorCode% neq 0 (goto:error)\r
-)\r
-\r
-if %sync-spirv-tools% equ 1 (\r
-   if exist %SPIRV_TOOLS_DIR% (\r
-      rd /S /Q %SPIRV_TOOLS_DIR%\r
-   )\r
-   if %errorlevel% neq 0 (goto:error)\r
-   if not exist %SPIRV_TOOLS_DIR% (\r
-      call:create_spirv-tools\r
-   )\r
-   if %errorCode% neq 0 (goto:error)\r
-   call:update_spirv-tools\r
-   if %errorCode% neq 0 (goto:error)\r
-)\r
-\r
-if %build-glslang% equ 1 (\r
-   call:build_glslang\r
-   if %errorCode% neq 0 (goto:error)\r
-)\r
-\r
-if %build-spirv-tools% equ 1 (\r
-   call:build_spirv-tools\r
-   if %errorCode% neq 0 (goto:error)\r
-)\r
-\r
-echo.\r
-echo Exiting\r
-goto:finish\r
-\r
-:error\r
-echo.\r
-echo Halting due to error\r
-goto:finish\r
-\r
-:finish\r
-if not "%cd%\" == "%BUILD_DIR%" ( cd %BUILD_DIR% )\r
-endlocal\r
-goto:eof\r
-\r
-\r
-\r
-REM // ======== Functions ======== //\r
-\r
-:create_glslang\r
-   echo.\r
-   echo Creating local glslang repository %GLSLANG_DIR%)\r
-   mkdir %GLSLANG_DIR%\r
-   cd %GLSLANG_DIR%\r
-   git clone https://github.com/KhronosGroup/glslang.git .\r
-   git checkout %GLSLANG_REVISION%\r
-   if not exist %GLSLANG_DIR%\SPIRV (\r
-      echo glslang source download failed!\r
-      set errorCode=1\r
-   )\r
-goto:eof\r
-\r
-:update_glslang\r
-   echo.\r
-   echo Updating %GLSLANG_DIR%\r
-   cd %GLSLANG_DIR%\r
-   git fetch --all\r
-   git checkout %GLSLANG_REVISION%\r
-goto:eof\r
-\r
-:create_spirv-tools\r
-   echo.\r
-   echo Creating local spirv-tools repository %SPIRV_TOOLS_DIR%)\r
-   mkdir %SPIRV_TOOLS_DIR%\r
-   cd %SPIRV_TOOLS_DIR%\r
+set GLSLANG_DIR=%BASE_DIR%\glslang
+set SPIRV_TOOLS_DIR=%BASE_DIR%\spirv-tools
+
+REM // ======== Parameter parsing ======== //
+
+   if "%1" == "" (
+      echo usage: update_external_sources.bat [options]
+      echo.
+      echo Available options:
+      echo   --sync-glslang      just pull glslang_revision
+      echo   --sync-spirv-tools  just pull spirv-tools_revision
+      echo   --build-glslang     pulls glslang_revision, configures CMake, builds Release and Debug
+      echo   --build-spirv-tools pulls spirv-tools_revision, configures CMake, builds Release and Debug
+      echo   --all               sync and build glslang, LunarGLASS, spirv-tools
+      goto:finish
+   )
+
+   set sync-glslang=0
+   set sync-spirv-tools=0
+   set build-glslang=0
+   set build-spirv-tools=0
+   set check-glslang-build-dependencies=0
+
+   :parameterLoop
+
+      if "%1"=="" goto:parameterContinue
+
+      if "%1" == "--sync-glslang" (
+         set sync-glslang=1
+         shift
+         goto:parameterLoop
+      )
+
+      if "%1" == "--sync-spirv-tools" (
+         set sync-spirv-tools=1
+         shift
+         goto:parameterLoop
+      )
+
+      if "%1" == "--build-glslang" (
+         set sync-glslang=1
+         set check-glslang-build-dependencies=1
+         set build-glslang=1
+         shift
+         goto:parameterLoop
+      )
+
+      if "%1" == "--build-spirv-tools" (
+         set sync-spirv-tools=1
+         REM glslang has the same needs as spirv-tools
+         set check-glslang-build-dependencies=1
+         set build-spirv-tools=1
+         shift
+         goto:parameterLoop
+      )
+
+      if "%1" == "--all" (
+         set sync-glslang=1
+         set sync-spirv-tools=1
+         set build-glslang=1
+         set build-spirv-tools=1
+         set check-glslang-build-dependencies=1
+         shift
+         goto:parameterLoop
+      )
+
+      echo Unrecognized options "%1"
+      goto:error
+
+   :parameterContinue
+
+REM // ======== end Parameter parsing ======== //
+
+
+REM // ======== Dependency checking ======== //
+   REM git is required for all paths
+   for %%X in (git.exe) do (set FOUND=%%~$PATH:X)
+   if not defined FOUND (
+      echo Dependency check failed:
+      echo   git.exe not found
+      echo   Git for Windows can be downloaded here:  https://git-scm.com/download/win
+      echo   Install and ensure git.exe makes it into your PATH
+      set errorCode=1
+   )
+
+   if %check-glslang-build-dependencies% equ 1 (
+      for %%X in (cmake.exe) do (set FOUND=%%~$PATH:X)
+      if not defined FOUND (
+         echo Dependency check failed:
+         echo   cmake.exe not found
+         echo   Get CNake 2.8 for Windows here:  http://www.cmake.org/cmake/resources/software.html
+         echo   Install and ensure each makes it into your PATH, default is "C:\Program Files (x86)\CMake\bin"
+         set errorCode=1
+      )
+   )
+
+
+   REM goto:main
+
+REM // ======== end Dependency checking ======== //
+
+:main
+
+if %errorCode% neq 0 (goto:error)
+
+REM Read the target versions from external file, which is shared with Linux script
+
+if not exist glslang_revision (
+   echo.
+   echo Missing glslang_revision file!  Place it next to this script with target version in it.
+   set errorCode=1
+   goto:error
+)
+
+if not exist spirv-tools_revision (
+   echo.
+   echo Missing spirv-tools_revision file!  Place it next to this script with target version in it.
+   set errorCode=1
+   goto:error
+)
+
+set /p GLSLANG_REVISION= < glslang_revision
+set /p SPIRV_TOOLS_REVISION= < spirv-tools_revision
+echo GLSLANG_REVISION=%GLSLANG_REVISION%
+echo SPIRV_TOOLS_REVISION=%SPIRV_TOOLS_REVISION%
+
+
+echo Creating and/or updating glslang, spirv-tools in %BASE_DIR%
+
+if %sync-glslang% equ 1 (
+   if exist %GLSLANG_DIR% (
+      rd /S /Q %GLSLANG_DIR%
+   )
+   if not exist %GLSLANG_DIR% (
+      call:create_glslang
+   )
+   if %errorCode% neq 0 (goto:error)
+   call:update_glslang
+   if %errorCode% neq 0 (goto:error)
+)
+
+if %sync-spirv-tools% equ 1 (
+   if exist %SPIRV_TOOLS_DIR% (
+      rd /S /Q %SPIRV_TOOLS_DIR%
+   )
+   if %errorlevel% neq 0 (goto:error)
+   if not exist %SPIRV_TOOLS_DIR% (
+      call:create_spirv-tools
+   )
+   if %errorCode% neq 0 (goto:error)
+   call:update_spirv-tools
+   if %errorCode% neq 0 (goto:error)
+)
+
+if %build-glslang% equ 1 (
+   call:build_glslang
+   if %errorCode% neq 0 (goto:error)
+)
+
+if %build-spirv-tools% equ 1 (
+   call:build_spirv-tools
+   if %errorCode% neq 0 (goto:error)
+)
+
+echo.
+echo Exiting
+goto:finish
+
+:error
+echo.
+echo Halting due to error
+goto:finish
+
+:finish
+if not "%cd%\" == "%BUILD_DIR%" ( cd %BUILD_DIR% )
+endlocal
+goto:eof
+
+
+
+REM // ======== Functions ======== //
+
+:create_glslang
+   echo.
+   echo Creating local glslang repository %GLSLANG_DIR%)
+   mkdir %GLSLANG_DIR%
+   cd %GLSLANG_DIR%
+   git clone https://github.com/KhronosGroup/glslang.git .
+   git checkout %GLSLANG_REVISION%
+   if not exist %GLSLANG_DIR%\SPIRV (
+      echo glslang source download failed!
+      set errorCode=1
+   )
+goto:eof
+
+:update_glslang
+   echo.
+   echo Updating %GLSLANG_DIR%
+   cd %GLSLANG_DIR%
+   git fetch --all
+   git checkout %GLSLANG_REVISION%
+goto:eof
+
+:create_spirv-tools
+   echo.
+   echo Creating local spirv-tools repository %SPIRV_TOOLS_DIR%)
+   mkdir %SPIRV_TOOLS_DIR%
+   cd %SPIRV_TOOLS_DIR%
    git clone https://github.com/KhronosGroup/SPIRV-Tools.git .
-   git checkout %SPIRV_TOOLS_REVISION%\r
-   if not exist %SPIRV_TOOLS_DIR%\source (\r
-      echo spirv-tools source download failed!\r
-      set errorCode=1\r
-   )\r
-goto:eof\r
-\r
-:update_spirv-tools\r
-   echo.\r
-   echo Updating %SPIRV_TOOLS_DIR%\r
-   cd %SPIRV_TOOLS_DIR%\r
-   git fetch --all\r
-   git checkout %SPIRV_TOOLS_REVISION%\r
-goto:eof\r
-\r
-:build_glslang\r
-   echo.\r
-   echo Building %GLSLANG_DIR%\r
-   cd  %GLSLANG_DIR%\r
-\r
-   REM Cleanup any old directories lying around.\r
-   if exist build32 (\r
-      rmdir /s /q build32\r
-   )\r
-   if exist build (\r
-      rmdir /s /q build\r
-   )\r
-   \r
-   echo Making 32-bit glslang\r
-   echo *************************\r
-   mkdir build32\r
-   set GLSLANG_BUILD_DIR=%GLSLANG_DIR%\build32\r
-   cd %GLSLANG_BUILD_DIR%\r
-\r
-   echo Generating 32-bit Glslang CMake files for Visual Studio %VS_VERSION% -DCMAKE_INSTALL_PREFIX=install ..\r
-   cmake -G "Visual Studio %VS_VERSION%" -DCMAKE_INSTALL_PREFIX=install ..\r
-   \r
-   echo Building 32-bit Glslang: MSBuild INSTALL.vcxproj /p:Platform=x86 /p:Configuration=Debug\r
-   msbuild INSTALL.vcxproj /p:Platform=x86 /p:Configuration=Debug /verbosity:quiet\r
-   \r
-   REM Check for existence of one lib, even though we should check for all results\r
-   if not exist %GLSLANG_BUILD_DIR%\glslang\Debug\glslang.lib (\r
-      echo.\r
-      echo glslang 32-bit Debug build failed!\r
-      set errorCode=1\r
-   )\r
-   echo Building Glslang: MSBuild INSTALL.vcxproj /p:Platform=x86 /p:Configuration=Release\r
-   msbuild INSTALL.vcxproj /p:Platform=x86 /p:Configuration=Release /verbosity:quiet\r
-   \r
-   REM Check for existence of one lib, even though we should check for all results\r
-   if not exist %GLSLANG_BUILD_DIR%\glslang\Release\glslang.lib (\r
-      echo.\r
-      echo glslang 32-bit Release build failed!\r
-      set errorCode=1\r
-   )\r
-   \r
-   cd ..\r
- \r
-   echo Making 64-bit glslang\r
-   echo *************************\r
-   mkdir build\r
-   set GLSLANG_BUILD_DIR=%GLSLANG_DIR%\build\r
-   cd %GLSLANG_BUILD_DIR%\r
-\r
-   echo Generating 64-bit Glslang CMake files for Visual Studio %VS_VERSION% -DCMAKE_INSTALL_PREFIX=install ..\r
-   cmake -G "Visual Studio %VS_VERSION% Win64" -DCMAKE_INSTALL_PREFIX=install ..\r
-   \r
-   echo Building 64-bit Glslang: MSBuild INSTALL.vcxproj /p:Platform=x64 /p:Configuration=Debug\r
-   msbuild INSTALL.vcxproj /p:Platform=x64 /p:Configuration=Debug /verbosity:quiet\r
-   \r
-   REM Check for existence of one lib, even though we should check for all results\r
-   if not exist %GLSLANG_BUILD_DIR%\glslang\Debug\glslang.lib (\r
-      echo.\r
-      echo glslang 64-bit Debug build failed!\r
-      set errorCode=1\r
-   )\r
-   echo Building Glslang: MSBuild INSTALL.vcxproj /p:Platform=x64 /p:Configuration=Release\r
-   msbuild INSTALL.vcxproj /p:Platform=x64 /p:Configuration=Release /verbosity:quiet\r
-   \r
-   REM Check for existence of one lib, even though we should check for all results\r
-   if not exist %GLSLANG_BUILD_DIR%\glslang\Release\glslang.lib (\r
-      echo.\r
-      echo glslang 64-bit Release build failed!\r
-      set errorCode=1\r
-   )\r
-goto:eof\r
-\r
-:build_spirv-tools\r
-   echo.\r
-   echo Building %SPIRV_TOOLS_DIR%\r
-   cd  %SPIRV_TOOLS_DIR%\r
-\r
-   REM Cleanup any old directories lying around.\r
-   if exist build32 (\r
-      rmdir /s /q build32\r
-   )\r
-   if exist build (\r
-      rmdir /s /q build\r
-   )\r
-\r
-   echo Making 32-bit spirv-tools\r
-   echo *************************\r
-   mkdir build32\r
-   set SPIRV_TOOLS_BUILD_DIR=%SPIRV_TOOLS_DIR%\build32\r
-
-   cd %SPIRV_TOOLS_BUILD_DIR%\r
-   \r
-   echo Generating 32-bit spirv-tools CMake files for Visual Studio %VS_VERSION% ..\r
-   cmake -G "Visual Studio %VS_VERSION%" ..\r
-   \r
-   echo Building 32-bit spirv-tools: MSBuild ALL_BUILD.vcxproj /p:Platform=x86 /p:Configuration=Debug\r
-   msbuild ALL_BUILD.vcxproj /p:Platform=x86 /p:Configuration=Debug /verbosity:quiet\r
-   \r
-   REM Check for existence of one lib, even though we should check for all results\r
-   if not exist %SPIRV_TOOLS_BUILD_DIR%\source\Debug\SPIRV-Tools.lib (\r
-      echo.\r
-      echo spirv-tools 32-bit Debug build failed!\r
-      set errorCode=1\r
-   )\r
-   \r
-   echo Building 32-bit spirv-tools: MSBuild ALL_BUILD.vcxproj /p:Platform=x86 /p:Configuration=Release\r
-   msbuild ALL_BUILD.vcxproj /p:Platform=x86 /p:Configuration=Release /verbosity:quiet\r
-\r
-   REM Check for existence of one lib, even though we should check for all results\r
-   if not exist %SPIRV_TOOLS_BUILD_DIR%\source\Release\SPIRV-Tools.lib (\r
-      echo.\r
-      echo spirv-tools 32-bit Release build failed!\r
-      set errorCode=1\r
-   )\r
-   \r
-   cd ..\r
- \r
-   echo Making 64-bit spirv-tools  \r
-   echo *************************\r
-   mkdir build\r
-   set SPIRV_TOOLS_BUILD_DIR=%SPIRV_TOOLS_DIR%\build\r
-   cd %SPIRV_TOOLS_BUILD_DIR%\r
-
-   echo Generating 64-bit spirv-tools CMake files for Visual Studio %VS_VERSION% ..\r
-   cmake -G "Visual Studio %VS_VERSION% Win64" ..\r
-   \r
-   echo Building 64-bit spirv-tools: MSBuild ALL_BUILD.vcxproj /p:Platform=x64 /p:Configuration=Debug\r
-   msbuild ALL_BUILD.vcxproj /p:Platform=x64 /p:Configuration=Debug /verbosity:quiet\r
-   \r
-   REM Check for existence of one lib, even though we should check for all results\r
-   if not exist %SPIRV_TOOLS_BUILD_DIR%\source\Debug\SPIRV-Tools.lib (\r
-      echo.\r
-      echo spirv-tools 64-bit Debug build failed!\r
-      set errorCode=1\r
-   )\r
-   \r
-   echo Building 64-bit spirv-tools: MSBuild ALL_BUILD.vcxproj /p:Platform=x64 /p:Configuration=Release\r
-   msbuild ALL_BUILD.vcxproj /p:Platform=x64 /p:Configuration=Release /verbosity:quiet\r
-\r
-   REM Check for existence of one lib, even though we should check for all results\r
-   if not exist %SPIRV_TOOLS_BUILD_DIR%\source\Release\SPIRV-Tools.lib (\r
-      echo.\r
-      echo spirv-tools 64-bit Release build failed!\r
-      set errorCode=1\r
-   )\r
-goto:eof\r
+   git checkout %SPIRV_TOOLS_REVISION%
+   if not exist %SPIRV_TOOLS_DIR%\source (
+      echo spirv-tools source download failed!
+      set errorCode=1
+   )
+goto:eof
+
+:update_spirv-tools
+   echo.
+   echo Updating %SPIRV_TOOLS_DIR%
+   cd %SPIRV_TOOLS_DIR%
+   git fetch --all
+   git checkout %SPIRV_TOOLS_REVISION%
+goto:eof
+
+:build_glslang
+   echo.
+   echo Building %GLSLANG_DIR%
+   cd  %GLSLANG_DIR%
+
+   REM Cleanup any old directories lying around.
+   if exist build32 (
+      rmdir /s /q build32
+   )
+   if exist build (
+      rmdir /s /q build
+   )
+   
+   echo Making 32-bit glslang
+   echo *************************
+   mkdir build32
+   set GLSLANG_BUILD_DIR=%GLSLANG_DIR%\build32
+   cd %GLSLANG_BUILD_DIR%
+
+   echo Generating 32-bit Glslang CMake files for Visual Studio %VS_VERSION% -DCMAKE_INSTALL_PREFIX=install ..
+   cmake -G "Visual Studio %VS_VERSION%" -DCMAKE_INSTALL_PREFIX=install ..
+   
+   echo Building 32-bit Glslang: MSBuild INSTALL.vcxproj /p:Platform=x86 /p:Configuration=Debug
+   msbuild INSTALL.vcxproj /p:Platform=x86 /p:Configuration=Debug /verbosity:quiet
+   
+   REM Check for existence of one lib, even though we should check for all results
+   if not exist %GLSLANG_BUILD_DIR%\glslang\Debug\glslang.lib (
+      echo.
+      echo glslang 32-bit Debug build failed!
+      set errorCode=1
+   )
+   echo Building Glslang: MSBuild INSTALL.vcxproj /p:Platform=x86 /p:Configuration=Release
+   msbuild INSTALL.vcxproj /p:Platform=x86 /p:Configuration=Release /verbosity:quiet
+   
+   REM Check for existence of one lib, even though we should check for all results
+   if not exist %GLSLANG_BUILD_DIR%\glslang\Release\glslang.lib (
+      echo.
+      echo glslang 32-bit Release build failed!
+      set errorCode=1
+   )
+   
+   cd ..
+ 
+   echo Making 64-bit glslang
+   echo *************************
+   mkdir build
+   set GLSLANG_BUILD_DIR=%GLSLANG_DIR%\build
+   cd %GLSLANG_BUILD_DIR%
+
+   echo Generating 64-bit Glslang CMake files for Visual Studio %VS_VERSION% -DCMAKE_INSTALL_PREFIX=install ..
+   cmake -G "Visual Studio %VS_VERSION% Win64" -DCMAKE_INSTALL_PREFIX=install ..
+   
+   echo Building 64-bit Glslang: MSBuild INSTALL.vcxproj /p:Platform=x64 /p:Configuration=Debug
+   msbuild INSTALL.vcxproj /p:Platform=x64 /p:Configuration=Debug /verbosity:quiet
+   
+   REM Check for existence of one lib, even though we should check for all results
+   if not exist %GLSLANG_BUILD_DIR%\glslang\Debug\glslang.lib (
+      echo.
+      echo glslang 64-bit Debug build failed!
+      set errorCode=1
+   )
+   echo Building Glslang: MSBuild INSTALL.vcxproj /p:Platform=x64 /p:Configuration=Release
+   msbuild INSTALL.vcxproj /p:Platform=x64 /p:Configuration=Release /verbosity:quiet
+   
+   REM Check for existence of one lib, even though we should check for all results
+   if not exist %GLSLANG_BUILD_DIR%\glslang\Release\glslang.lib (
+      echo.
+      echo glslang 64-bit Release build failed!
+      set errorCode=1
+   )
+goto:eof
+
+:build_spirv-tools
+   echo.
+   echo Building %SPIRV_TOOLS_DIR%
+   cd  %SPIRV_TOOLS_DIR%
+
+   REM Cleanup any old directories lying around.
+   if exist build32 (
+      rmdir /s /q build32
+   )
+   if exist build (
+      rmdir /s /q build
+   )
+
+   echo Making 32-bit spirv-tools
+   echo *************************
+   mkdir build32
+   set SPIRV_TOOLS_BUILD_DIR=%SPIRV_TOOLS_DIR%\build32
+
+   cd %SPIRV_TOOLS_BUILD_DIR%
+   
+   echo Generating 32-bit spirv-tools CMake files for Visual Studio %VS_VERSION% ..
+   cmake -G "Visual Studio %VS_VERSION%" ..
+   
+   echo Building 32-bit spirv-tools: MSBuild ALL_BUILD.vcxproj /p:Platform=x86 /p:Configuration=Debug
+   msbuild ALL_BUILD.vcxproj /p:Platform=x86 /p:Configuration=Debug /verbosity:quiet
+   
+   REM Check for existence of one lib, even though we should check for all results
+   if not exist %SPIRV_TOOLS_BUILD_DIR%\source\Debug\SPIRV-Tools.lib (
+      echo.
+      echo spirv-tools 32-bit Debug build failed!
+      set errorCode=1
+   )
+   
+   echo Building 32-bit spirv-tools: MSBuild ALL_BUILD.vcxproj /p:Platform=x86 /p:Configuration=Release
+   msbuild ALL_BUILD.vcxproj /p:Platform=x86 /p:Configuration=Release /verbosity:quiet
+
+   REM Check for existence of one lib, even though we should check for all results
+   if not exist %SPIRV_TOOLS_BUILD_DIR%\source\Release\SPIRV-Tools.lib (
+      echo.
+      echo spirv-tools 32-bit Release build failed!
+      set errorCode=1
+   )
+   
+   cd ..
+ 
+   echo Making 64-bit spirv-tools  
+   echo *************************
+   mkdir build
+   set SPIRV_TOOLS_BUILD_DIR=%SPIRV_TOOLS_DIR%\build
+   cd %SPIRV_TOOLS_BUILD_DIR%
+
+   echo Generating 64-bit spirv-tools CMake files for Visual Studio %VS_VERSION% ..
+   cmake -G "Visual Studio %VS_VERSION% Win64" ..
+   
+   echo Building 64-bit spirv-tools: MSBuild ALL_BUILD.vcxproj /p:Platform=x64 /p:Configuration=Debug
+   msbuild ALL_BUILD.vcxproj /p:Platform=x64 /p:Configuration=Debug /verbosity:quiet
+   
+   REM Check for existence of one lib, even though we should check for all results
+   if not exist %SPIRV_TOOLS_BUILD_DIR%\source\Debug\SPIRV-Tools.lib (
+      echo.
+      echo spirv-tools 64-bit Debug build failed!
+      set errorCode=1
+   )
+   
+   echo Building 64-bit spirv-tools: MSBuild ALL_BUILD.vcxproj /p:Platform=x64 /p:Configuration=Release
+   msbuild ALL_BUILD.vcxproj /p:Platform=x64 /p:Configuration=Release /verbosity:quiet
+
+   REM Check for existence of one lib, even though we should check for all results
+   if not exist %SPIRV_TOOLS_BUILD_DIR%\source\Release\SPIRV-Tools.lib (
+      echo.
+      echo spirv-tools 64-bit Release build failed!
+      set errorCode=1
+   )
+goto:eof

diff --git a/vulkan.py b/vulkan.py
index 8e64639..a623f4a 100755 (executable)
--- a/vulkan.py
+++ b/vulkan.py
@@ -1037,19 +1037,19 @@ ext_khr_surface = Extension(
 
         Proto("VkResult", "GetPhysicalDeviceSurfaceCapabilitiesKHR",
             [Param("VkPhysicalDevice", "physicalDevice"),
-            Param("VkSurfaceKHR", "surface"),
+             Param("VkSurfaceKHR", "surface"),
              Param("VkSurfaceCapabilitiesKHR*", "pSurfaceCapabilities")]),
 
         Proto("VkResult", "GetPhysicalDeviceSurfaceFormatsKHR",
             [Param("VkPhysicalDevice", "physicalDevice"),
-            Param("VkSurfaceKHR", "surface"),
-            Param("uint32_t*", "pSurfaceFormatCount"),
+             Param("VkSurfaceKHR", "surface"),
+             Param("uint32_t*", "pSurfaceFormatCount"),
              Param("VkSurfaceFormatKHR*", "pSurfaceFormats")]),
 
         Proto("VkResult", "GetPhysicalDeviceSurfacePresentModesKHR",
             [Param("VkPhysicalDevice", "physicalDevice"),
-            Param("VkSurfaceKHR", "surface"),
-            Param("uint32_t*", "pPresentModeCount"),
+             Param("VkSurfaceKHR", "surface"),
+             Param("uint32_t*", "pPresentModeCount"),
              Param("VkPresentModeKHR*", "pPresentModes")]),
     ],
 )
@@ -1072,8 +1072,8 @@ ext_khr_device_swapchain = Extension(
 
         Proto("VkResult", "GetSwapchainImagesKHR",
             [Param("VkDevice", "device"),
-            Param("VkSwapchainKHR", "swapchain"),
-            Param("uint32_t*", "pSwapchainImageCount"),
+         Param("VkSwapchainKHR", "swapchain"),
+         Param("uint32_t*", "pSwapchainImageCount"),
              Param("VkImage*", "pSwapchainImages")]),
 
         Proto("VkResult", "AcquireNextImageKHR",