Falcor 4.0 (#228)

* Falcor 4.0

Author: kyaoNV

.gitignore

@@ -1,7 +1,3 @@
-Tests/Bin/*
-Tests/TestsResults/*
-Tests/TestConfigsDev/*
-Tests/.vs/*
 Bin/*
 *.user
 *.sdf
@@ -10,7 +6,6 @@ Bin/*
 *.ptx
 *.pyc
 *.VC.db
-FalcorTest/TestResults/*
 *.VC.opendb
 .vs/*
 .vscode/
@@ -19,6 +14,5 @@ FalcorTest/TestResults/*
 *slang-dump-*
 Source/Externals/.packman/*
 Media
-/Tests/TestResults/*
-/Tests/Solution_BuildLog.txt
-/Tests/robocopy.txt
+Tools/.packman
+Tests/data

Build/deploycommon.bat

@@ -15,8 +15,6 @@ if not exist "%OutDir%" mkdir "%OutDir%"
 
 rem Copy Falcor's files
 IF not exist %OutDir%\Data\ mkdir %OutDir%\Data >nul
-IF exist %FalcorDir%\ShadingUtils\ (xcopy %FalcorDir%\ShadingUtils\*.* %OutDir%\Data /s /y /d)
-IF exist %FalcorDir%\Raytracing\Data\ (xcopy %FalcorDir%\Raytracing\Data\*.* %OutDir%\Data /s /y /d /q >nul)
 call %~dp0\deployproject.bat %FalcorDir% %OutDir%
 
 rem Copy externals
@@ -26,22 +24,22 @@ robocopy %ExtDir%\AntTweakBar\lib %OutDir% AntTweakBar64.dll /r:0 >nul
 robocopy %ExtDir%\FreeImage %OutDir%  freeimage.dll /r:0 >nul
 robocopy %ExtDir%\assimp\bin\%2 %OutDir%  *.dll /r:0 >nul
 robocopy %ExtDir%\FFMpeg\bin\%2 %OutDir%  *.dll /r:0 >nul
-robocopy %ExtDir%\dxcompiler\%2 %OutDir%  dxcompiler.dll /r:0 >nul
-rem robocopy %ExtDir%\dxcompiler\windows-x86_64\release\%2 %OutDir%  *.dll /r:0 >nul
+rem robocopy %ExtDir%\dxcompiler\%2 %OutDir%  dxcompiler.dll /r:0 >nul
 robocopy %ExtDir%\OptiX\bin64 %OutDir%  *.dll /r:0 >nul
 robocopy %ExtDir%\openvr\bin\win64 %OutDir%  openvr_api.dll /r:0 >nul
 robocopy %ExtDir%\Slang\bin\windows-x64\release %OutDir%  *.dll /r:0 >nul
 robocopy %ExtDir%\GLFW\lib %OutDir%  *.dll /r:0 >nul
 robocopy %ExtDir%\WinPixEventRuntime\bin\x64 %OutDir% WinPixEventRuntime.dll /r:0 >nul
 robocopy "%~4\Redist\D3D\%2" %OutDir% dxil.dll /r:0 >nul
+robocopy "%~4\Redist\D3D\%2" %OutDir% dxcompiler.dll /r:0 >nul
 
 rem Copy NVAPI
 set NvApiDir=%ExtDir%\NVAPI
 IF exist %NvApiDir% (
-    IF not exist %OutDir%\Data\NVAPI mkdir %OutDir%\Data\NVAPI >nul
-    copy /y %NvApiDir%\nvHLSLExtns.h %OutDir%\Data\NVAPI
-    copy /y %NvApiDir%\nvHLSLExtnsInternal.h %OutDir%\Data\NVAPI
-    copy /y %NvApiDir%\nvShaderExtnEnums.h %OutDir%\Data\NVAPI
+    IF not exist %OutDir%\Shaders\NVAPI mkdir %OutDir%\Shaders\NVAPI >nul
+    copy /y %NvApiDir%\nvHLSLExtns.h %OutDir%\Shaders\NVAPI
+    copy /y %NvApiDir%\nvHLSLExtnsInternal.h %OutDir%\Shaders\NVAPI
+    copy /y %NvApiDir%\nvShaderExtnEnums.h %OutDir%\Shaders\NVAPI
 )
 
 rem robocopy sets the error level to something that is not zero even if the copy operation was successful. Set the error level to zero

Build/packman/win-bootstrap/configure.bat Build/packman/bootstrap/configure.batBuild/packman/win-bootstrap/configure.bat renamed to Build/packman/bootstrap/configure.bat

@@ -1,4 +1,4 @@
-@set PM_PACKMAN_VERSION=5.7.1
+@set PM_PACKMAN_VERSION=5.14
 
 :: Specify where packman command is rooted
 @set PM_INSTALL_PATH=%~dp0..
@@ -61,7 +61,7 @@
 
 @for /f "delims=" %%a in ('powershell -ExecutionPolicy ByPass -NoLogo -NoProfile -File "%~dp0\generate_temp_folder.ps1" -parentPath "%PM_PYTHON_BASE_DIR%"') do @set TEMP_FOLDER_NAME=%%a
 @echo Unpacking Python interpreter ...
-@expand -F:* "%TARGET%" "%TEMP_FOLDER_NAME%" 1> nul
+@"%SystemRoot%\system32\expand.exe" -F:* "%TARGET%" "%TEMP_FOLDER_NAME%" 1> nul
 @del "%TARGET%"
 :: Failure during extraction to temp folder name, need to clean up and abort
 @if errorlevel 1 (
@@ -104,7 +104,7 @@
 @if errorlevel 1 goto ERROR
 
 @echo Unpacking ...
-@"%PM_PYTHON%" -s -u -E "%~dp0\install_package.py" "%TARGET%" "%PM_MODULE_DIR%"
+@"%PM_PYTHON%" -S -s -u -E "%~dp0\install_package.py" "%TARGET%" "%PM_MODULE_DIR%"
 @if errorlevel 1 goto ERROR
 
 @del "%TARGET%"
@@ -116,7 +116,7 @@
 @set PM_7Za_PATH=%PM_PACKAGES_ROOT%\chk\7za\%PM_7ZA_VERSION%
 @if exist "%PM_7Za_PATH%" goto END
 
-@"%PM_PYTHON%" -s -u -E "%PM_MODULE%" pull "%PM_MODULE_DIR%\deps.packman.xml"
+@"%PM_PYTHON%" -S -s -u -E "%PM_MODULE%" pull "%PM_MODULE_DIR%\deps.packman.xml"
 @if errorlevel 1 goto ERROR
 
 @goto END

…man/win-bootstrap/fetch_file_from_s3.cmd …packman/bootstrap/fetch_file_from_s3.cmdBuild/packman/win-bootstrap/fetch_file_from_s3.cmd renamed to Build/packman/bootstrap/fetch_file_from_s3.cmd Build/packman/win-bootstrap/fetch_file_from_s3.cmd renamed to Build/packman/bootstrap/fetch_file_from_s3.cmd

@@ -17,7 +17,7 @@ def __enter__(self):
         self.path = tempfile.mkdtemp()
         return self.path
 
-    def __exit__(self, type, value, traceback ):
+    def __exit__(self, type, value, traceback):
         # Remove temporary data created
         shutil.rmtree(self.path)
 
@@ -36,4 +36,4 @@ def install_package(package_src_path, package_dst_path):
             logger.info("Package successfully installed to %s" % package_dst_path)
 
 
-install_package(sys.argv[1], sys.argv[2])
+install_package(sys.argv[1], sys.argv[2])

…man/win-bootstrap/fetch_file_from_s3.ps1 …packman/bootstrap/fetch_file_from_s3.ps1Build/packman/win-bootstrap/fetch_file_from_s3.ps1 renamed to Build/packman/bootstrap/fetch_file_from_s3.ps1 Build/packman/win-bootstrap/fetch_file_from_s3.ps1 renamed to Build/packman/bootstrap/fetch_file_from_s3.ps1

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-PM_PACKMAN_VERSION=5.7.1
+PM_PACKMAN_VERSION=5.14
 
 # Specify where packman command exists
 export PM_INSTALL_PATH=$(dirname ${BASH_SOURCE})
@@ -52,6 +52,15 @@ fetch_file_from_s3()
 	fi		
 }
 
+# For now assume python is installed on the box and we just need to find it
+if command -v python2.7 >/dev/null 2>&1; then
+	export PM_PYTHON=python2.7
+elif command -v python2 >/dev/null 2>&1; then
+    export PM_PYTHON=python2
+else
+	export PM_PYTHON=python
+fi
+
 # Ensure the packman package exists:
 if [ ! -f "$PM_MODULE" ]; then
 	PM_MODULE_PACKAGE="packman-common@$PM_PACKMAN_VERSION.zip"
@@ -60,31 +69,21 @@ if [ ! -f "$PM_MODULE" ]; then
 	fetch_file_from_s3 $PM_MODULE_PACKAGE $TARGET
 	if [ "$?" -eq "0" ]; then
 		echo "Unpacking ..."
-		mkdir -p "$PM_MODULE_DIR"
-		unzip -q $TARGET -d "$PM_MODULE_DIR"
+		$PM_PYTHON -S -s -u -E "$PM_INSTALL_PATH/bootstrap/install_package.py" "$TARGET" "$PM_MODULE_DIR"
 		rm $TARGET
 	else
 		echo "Failure while fetching packman module from S3!"
 		exit 1
 	fi
 fi
 
-# For now assume python is installed on the box and we just need to find it
-if command -v python2.7 >/dev/null 2>&1; then
-	export PM_PYTHON=python2.7
-elif command -v python2 >/dev/null 2>&1; then
-    export PM_PYTHON=python2
-else
-	export PM_PYTHON=python
-fi
-
 # Ensure 7za package exists:
 PM_7za_VERSION=16.02.4
 export PM_7za_PATH="$PM_PACKAGES_ROOT/7za/$PM_7za_VERSION"
 if [ ! -d "$PM_7za_PATH" ]; then
     export PM_7za_PATH="$PM_PACKAGES_ROOT/chk/7za/$PM_7za_VERSION"
     if [ ! -d "$PM_7za_PATH" ]; then
-        $PM_PYTHON -s -u -E "$PM_MODULE" pull "$PM_MODULE_DIR/deps.packman.xml"
+        $PM_PYTHON -S -s -u -E "$PM_MODULE" pull "$PM_MODULE_DIR/deps.packman.xml"
         if [ "$?" -ne 0 ]; then
            echo "Failure while installing required 7za package"
            exit 1
@@ -95,7 +94,7 @@ fi
 # Generate temporary file name for environment variables:
 PM_VAR_PATH=`mktemp -u -t tmp.$$.pmvars.XXXXXX`
 
-$PM_PYTHON -s -u -E "$PM_MODULE" $* --var-path="$PM_VAR_PATH"
+$PM_PYTHON -S -s -u -E "$PM_MODULE" "$@" --var-path="$PM_VAR_PATH"
 exit_code=$?
 # Export the variables if the file was used and remove the file:
 if [ -f "$PM_VAR_PATH" ]; then