Falcor 5.0-preview (#288)

.editorconfig

@@ -1,5 +1,5 @@
-# Topmost EditorConfig file; do not look at files higher up in the directory tree
-root = true
+# Allow looking at files higher up in the directory tree
+root = false
 
 # Set default editor config for all files:
 # - 4 spaces, no trailing whitespaces

.gitignore

@@ -18,3 +18,4 @@ Media
 Tools/.packman
 Tests/data
 *.tlog
+/Source/Falcor/dependencies.user.xml

Build/deploycommon.bat

@@ -1,6 +1,7 @@
 @echo off
 setlocal
 
+
 rem %1 -> Falcor Core Directory Path
 rem %2 -> Platform Short Name
 rem %3 -> Output Directory
@@ -15,6 +16,7 @@ if not exist "%OutDir%" mkdir "%OutDir%"
 
 set IsDebug=0
 if "%OutDir:~-6%" == "Debug\" set IsDebug=1
+if "%OutDir:~-5%" == "Debug" set IsDebug=1
 
 rem Copy Falcor's files
 if not exist %OutDir%\Data\ mkdir %OutDir%\Data >nul
@@ -29,12 +31,14 @@ if %IsDebug% EQU 0 (
     rem Needed for OpenVDB (debug version links to release version of Half_2.5)
     robocopy %ExtDir%\deps\bin\ %OutDir% Half-2_5.* /r:0 >nul
 )
-robocopy %ExtDir%\python\ %OutDir% Python36*.dll /r:0 >nul
+robocopy %ExtDir%\python\ %OutDir% Python37*.dll /r:0 >nul
 robocopy %ExtDir%\python %OutDir%\Python /E /r:0 >nul
 robocopy %ExtDir%\slang\bin\windows-x64\release %OutDir% *.dll /r:0 >nul
 robocopy %ExtDir%\WinPixEventRuntime\bin\x64 %OutDir% WinPixEventRuntime.dll /r:0 >nul
 robocopy %ExtDir%\dxcompiler\bin\x64 %OutDir% dxil.dll /r:0 >nul
 robocopy %ExtDir%\dxcompiler\bin\x64 %OutDir% dxcompiler.dll /r:0 >nul
+robocopy %ExtDir%\nvtt\ %OutDir% cudart64_110.dll /r:0 >nul
+robocopy %ExtDir%\nvtt\ %OutDir% nvtt30106.dll /r:0 >nul
 robocopy %ExtDir%\Cuda\bin\ %OutDir% cudart*.dll /r:0 >nul
 robocopy %ExtDir%\Cuda\bin\ %OutDir% nvrtc*.dll /r:0 >nul
 robocopy %ExtDir%\Cuda\bin\ %OutDir% cublas*.dll /r:0 >nul
@@ -49,6 +53,15 @@ if exist %NvApiDir% (
     copy /y %NvApiDir%\nvShaderExtnEnums.h %NvApiTargetDir%
 )
 
+rem Copy Agility SDK Runtime
+set AgilitySDKDir=%ExtDir%\agility-sdk
+set AgilitySDKTargetDir=%OutDir%\D3D12
+if exist %AgilitySDKDir% (
+    if not exist %AgilitySDKTargetDir% mkdir %AgilitySDKTargetDir% >nul
+    copy /y %AgilitySDKDir%\build\native\bin\x64\D3D12Core.dll %AgilitySDKTargetDir%
+    copy /y %AgilitySDKDir%\build\native\bin\x64\d3d12SDKLayers.dll %AgilitySDKTargetDir%
+)
+
 rem Copy NanoVDB
 set NanoVDBApiDir=%ExtDir%\nanovdb
 set NanoVDBTargetDir=%OutDir%\Shaders\NanoVDB
@@ -57,5 +70,29 @@ if exist %NanoVDBApiDir% (
     copy /y %NanoVDBApiDir%\include\nanovdb\PNanoVDB.h %NanoVDBTargetDir%
 )
 
+rem Copy USD files, making sure not to overwrite dlls provided by other components, or dlls that we don't need.
+if %IsDebug% EQU 0 (
+    robocopy %ExtDir%\nv-usd-release\lib %OutDir% *.dll /r:0 /XF Alembic.dll dds.dll nv_freeimage.dll python*.dll hdf5*.dll tbb*.dll >nul
+    robocopy %ExtDir%\nv-usd-release\lib\usd %OutDir%\usd /E /r:0 >nul
+    robocopy %ExtDir%\nv-usd-release\lib\python\pxr %OutDir%\Python\Lib\pxr /E /r:0 >nul
+) else (
+    robocopy %ExtDir%\nv-usd-debug\lib %OutDir% *.dll /r:0 /XF Alembic.dll dds.dll nv_freeimage.dll python*.dll hdf5*.dll tbb*.dll >nul
+    robocopy %ExtDir%\nv-usd-debug\lib\usd %OutDir%\usd /E /r:0 >nul
+    robocopy %ExtDir%\nv-usd-debug\lib\python\pxr %OutDir%\Python\Lib\pxr /E /r:0 >nul
+)
+
+rem Copy MDL libs after USD to overwrite older versions included in USD distribution
+set MDLDir=%ExtDir%\mdl_sdk
+if exist %MDLDir% (
+    robocopy %MDLDir%\nt-x86-64\lib %OutDir% *.dll /r:0 >nul
+)
+
+rem Copy NVTT
+if %IsDebug% EQU 0 (
+    robocopy %ExtDir%\nvtt\lib\x64-v141\Release %OutDir% nvtt.dll /r:0 >nul
+) else (
+    robocopy %ExtDir%\nvtt\lib\x64-v141\Debug %OutDir% nvtt.dll /r:0 >nul
+)
+
 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
 exit /b 0

Build/patchpropssheet.py

@@ -17,7 +17,7 @@ def patchGroup(propSheet, group, val):
 	return propSheet
 
 if(len(sys.argv) != 4):
-	sys.exit("Usage:\npatchpropssheet.py <Falcor Core Directory> <Current Solution Directory> <Backend [FALCOR_D3D12, FALCOR_VK]>")    
+	sys.exit("Usage:\npatchpropssheet.py <Falcor Core Directory> <Current Solution Directory> <Backend [FALCOR_D3D12, FALCOR_GFX]>")
 
 coreDir = sys.argv[1]
 solutionDir = sys.argv[2]
@@ -38,4 +38,4 @@ def patchGroup(propSheet, group, val):
 # Save the file
 f = open(propsFileName, "w")
 f.write(propSheet)
-f.close()
+f.close()

Build/prebuild.bat

@@ -38,8 +38,8 @@ rem Set the Falcor Backend according to the Build Configuration.
 if /I "%6"=="DebugD3D12" set falcor_backend=FALCOR_D3D12
 if /I "%6"=="ReleaseD3D12" set falcor_backend=FALCOR_D3D12
 
-if /I "%6"=="DebugVK" set falcor_backend=FALCOR_VK
-if /I "%6"=="ReleaseVK" set falcor_backend=FALCOR_VK
+if /I "%6"=="DebugGFX" set falcor_backend=FALCOR_GFX
+if /I "%6"=="ReleaseGFX" set falcor_backend=FALCOR_GFX
 
 rem Call Update Dependencies - Runs packman.
 call %~dp0\update_dependencies.bat %1\Falcor\dependencies.xml