From 688b5f42e9bfe498d7af7075d4d8f4429867f3a3 Mon Sep 17 00:00:00 2001 From: Miles Macklin Date: Fri, 9 Jun 2017 13:41:15 +1200 Subject: 1.2.0.beta.1 --- demo/compiler/xpj/flexDemoCUDA.xpj | 82 ++--------------------- demo/compiler/xpj/flexDemoD3D.xpj | 132 ++++++++++++++++++++++++++++--------- 2 files changed, 105 insertions(+), 109 deletions(-) (limited to 'demo/compiler/xpj') diff --git a/demo/compiler/xpj/flexDemoCUDA.xpj b/demo/compiler/xpj/flexDemoCUDA.xpj index 1257e14..c4b7ab5 100644 --- a/demo/compiler/xpj/flexDemoCUDA.xpj +++ b/demo/compiler/xpj/flexDemoCUDA.xpj @@ -74,6 +74,7 @@ ../../../lib/win32/NvFlexDeviceDebug_x86.lib ../../../external/SDL2-2.0.4/lib/x86/SDL2.lib ../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib + ../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib ../../../external/glew/lib/win32/glew32.lib @@ -82,6 +83,7 @@ ../../../lib/win64/NvFlexDeviceDebug_x64.lib ../../../external/SDL2-2.0.4/lib/x64/SDL2.lib ../../../external/SDL2-2.0.4/lib/x64/SDL2main.lib + ../../../external/NvToolsExt/lib/x64/nvToolsExt64_1.lib ../../../external/glew/lib/x64/glew32.lib @@ -111,6 +113,7 @@ ../../../lib/win32/NvFlexDeviceRelease_x86.lib ../../../external/SDL2-2.0.4/lib/x86/SDL2.lib ../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib + ../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib ../../../external/glew/lib/win32/glew32.lib @@ -119,87 +122,12 @@ ../../../lib/win64/NvFlexDeviceRelease_x64.lib ../../../external/SDL2-2.0.4/lib/x64/SDL2.lib ../../../external/SDL2-2.0.4/lib/x64/SDL2main.lib + ../../../external/NvToolsExt/lib/x64/nvToolsExt64_1.lib ../../../external/glew/lib/x64/glew32.lib - - - - - - - - ${user:ProjectRoot}/demo/compiler/android/flex_project/libs/armeabi-v7a - - - android - ANDROID=1 - ANDROID_PLAT=1 - DISABLE_IMPORTGL - - - - "${user:ProjectRoot}" - "${user:ProjectRoot}/external/egl_setup" - "${user:ProjectRoot}/external/regal_static/include" - - - - "${user:ProjectRoot}/external/regal_static/lib/armeabi-v7a" - "${user:ProjectRoot}/lib/android" - - - - android stdc++ c m log dl EGL gomp cudart_static Regal_static - - - - stlport_static - - - True - True - - - -std=c++11 -fno-exceptions -fno-rtti - - - - -fpic -fPIC -ffunction-sections -funwind-tables -fstack-protector -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -O2 -g -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300 - - - - --sysroot=${NDK_ROOT}/${NDK_VERSION}/platforms/android-15/arch-arm -shared -Wl,--no-undefined - - - 15 - - ${user:ProjectRoot}/demo/compiler/android/flex_project - - - ${user:ProjectRoot}/demo/compiler/android/src - - - - - - libflexDemo.so - - - NDEBUG - - - debug - - - NvFlexRelease_armv7l - NvFlexExtRelease_armv7l - - - - @@ -220,7 +148,7 @@ - -g -L${user:External}/glew/lib/linux -L/usr/lib -L"../../../lib/linux64" -L${user:External}/SDL2-2.0.4/lib/x64/ -L${user:CUDA_PATH}/lib64 -lGL -lglut -lGLU -lGLEW -lcudart_static -ldl + -g -L${user:External}/glew/lib/linux -L/usr/lib -L"../../../lib/linux64" -L${user:External}/SDL2-2.0.4/lib/x64/ -L${user:CUDA_PATH}/lib64 -lGL -lglut -lGLU -lGLEW -lcudart_static -ldl -lrt -pthread diff --git a/demo/compiler/xpj/flexDemoD3D.xpj b/demo/compiler/xpj/flexDemoD3D.xpj index 0c95377..e957c5b 100644 --- a/demo/compiler/xpj/flexDemoD3D.xpj +++ b/demo/compiler/xpj/flexDemoD3D.xpj @@ -19,6 +19,9 @@ + + 10.0.10586.0 + @@ -34,6 +37,7 @@ WIN32 _CRT_SECURE_NO_WARNINGS FLEX_DX + FLEX_DX12 3 @@ -42,23 +46,29 @@ MultiByte - ${user:ProjectRoot} - ${user:ProjectRoot}\demo - ${user:ProjectRoot}\demo\d3d11 - ${user:ProjectRoot}\external\SDL2-2.0.4\include + ${user:ProjectRoot} + ${user:ProjectRoot}\demo + ${user:ProjectRoot}\demo\d3d11 + ${user:ProjectRoot}\demo\d3d12 + ${user:ProjectRoot}\external\SDL2-2.0.4\include + ${user:ProjectRoot}\external\D3D12\include - kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib + kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib d3dcompiler.lib ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x86/SDL2.lib ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x86/SDL2main.lib + ${user:ProjectRoot}/external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib + ${user:ProjectRoot}/external/D3D12/libs/x86/d3d12.lib ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x64/SDL2.lib ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x64/SDL2main.lib + ${user:ProjectRoot}/external/NvToolsExt/lib/x64/nvToolsExt64_1.lib + ${user:ProjectRoot}/external/D3D12/libs/x64/d3d12.lib @@ -87,14 +97,14 @@ ${user:ProjectRoot}/lib/win32/NvFlexExtDebugD3D_x86.lib ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x86/SDL2.lib ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x86/SDL2main.lib - ${user:ProjectRoot}/external/glew/lib/win32/glew32.lib + ${user:ProjectRoot}/external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib ${user:ProjectRoot}/lib/win64/NvFlexDebugD3D_x64.lib ${user:ProjectRoot}/lib/win64/NvFlexExtDebugD3D_x64.lib ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x64/SDL2.lib ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x64/SDL2main.lib - ${user:ProjectRoot}/external/glew/lib/x64/glew32.lib + ${user:ProjectRoot}/external/NvToolsExt/lib/x64/nvToolsExt64_1.lib @@ -124,20 +134,67 @@ ${user:ProjectRoot}/lib/win32/NvFlexExtReleaseD3D_x86.lib ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x86/SDL2.lib ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x86/SDL2main.lib - ${user:ProjectRoot}/external/glew/lib/win32/glew32.lib + ${user:ProjectRoot}/external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib ${user:ProjectRoot}/lib/win64/NvFlexReleaseD3D_x64.lib ${user:ProjectRoot}/lib/win64/NvFlexExtReleaseD3D_x64.lib ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x64/SDL2.lib ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x64/SDL2main.lib - ${user:ProjectRoot}/external/glew/lib/x64/glew32.lib + ${user:ProjectRoot}/external/NvToolsExt/lib/x64/nvToolsExt64_1.lib - + + + Nv/Common/*.cpp + Nv/Common/*.h + -Nv/Common/NvCoPathFinder.* + -Nv/Common/NvCoMemoryMappedFile.* + -Nv/Common/NvCoMemoryReadStream.* + -Nv/Common/NvCoMemoryWriteStream.* + -Nv/Common/NvCoCircularHeap.* + -Nv/Common/NvCoFreeListHeap.* + + Nv/Common/Platform/Win/*.cpp + Nv/Common/Platform/Win/*.h + -Nv/Common/Platform/Win/NvCoWinMemoryMappedFile.* + -Nv/Common/Platform/Win/NvCoWinPathUtil.* + -Nv/Common/Platform/Win/NvCoWinMinimalInclude.* + -Nv/Common/Platform/Win/NvCoWinCriticalSection.* + + Nv/Common/Util/*.cpp + Nv/Common/Util/*.h + -Nv/Common/Util/NvCoParseUtil.* + -Nv/Common/Util/NvCoStringEscapeUtil.* + -Nv/Common/Util/NvCoPathUtil.* + -Nv/Common/Util/NvCoArgParseUtil.* + -Nv/Common/Util/NvCoBitUtil.* + + -Nv/Common/Random/*.cpp + -Nv/Common/Random/*.h + + Nv/Common/Container/*.cpp + Nv/Common/Container/*.h + -Nv/Common/Container/NvCoHandleMap.* + + Nv/Common/Render/Dx/*.cpp + Nv/Common/Render/Dx/*.h + Nv/Common/Render/Dx12/*.cpp + Nv/Common/Render/Dx12/*.h + -Nv/Common/Render/Dx/NvCoDxIncludeHandler.* + -Nv/Common/Render/Dx/NvCoDxShaderUtil.* + -Nv/Common/Render/Dx12/NvCoDx12AsyncManager.* + -Nv/Common/Render/Dx12/NvCoDx12DescriptorCache.* + + Nv/Common/Render/Context/*.cpp + Nv/Common/Render/Context/*.h + Nv/Common/Render/Context/Dx12/*.cpp + Nv/Common/Render/Context/Dx12/*.h + + *.cpp *.h scenes/*.h @@ -154,41 +211,52 @@ flexD3D flexExtD3D - + + + + *.h + *.cpp + *.h *.cpp + + *.h + *.cpp + - + - "${user:ProjectRoot}/demo/d3d11/shaders/debugLineVS.hlsl" - "${user:ProjectRoot}/demo/d3d11/shaders/debugLinePS.hlsl" + "${user:ProjectRoot}/demo/d3d/shaders/debugLineVS.hlsl" + "${user:ProjectRoot}/demo/d3d/shaders/debugLinePS.hlsl" - "${user:ProjectRoot}/demo/d3d11/shaders/imguiPS.hlsl" - "${user:ProjectRoot}/demo/d3d11/shaders/imguiVS.hlsl" + "${user:ProjectRoot}/demo/d3d/shaders/imguiPS.hlsl" + "${user:ProjectRoot}/demo/d3d/shaders/imguiVS.hlsl" - "${user:ProjectRoot}/demo/d3d11/shaders/meshPS.hlsl" - "${user:ProjectRoot}/demo/d3d11/shaders/meshShadowPS.hlsl" - "${user:ProjectRoot}/demo/d3d11/shaders/meshVS.hlsl" + "${user:ProjectRoot}/demo/d3d/shaders/meshPS.hlsl" + "${user:ProjectRoot}/demo/d3d/shaders/meshAsyncComputeBenchPS.hlsl" + "${user:ProjectRoot}/demo/d3d/shaders/meshShadowPS.hlsl" + "${user:ProjectRoot}/demo/d3d/shaders/meshVS.hlsl" - "${user:ProjectRoot}/demo/d3d11/shaders/pointVS.hlsl" - "${user:ProjectRoot}/demo/d3d11/shaders/pointGS.hlsl" - "${user:ProjectRoot}/demo/d3d11/shaders/pointPS.hlsl" - - "${user:ProjectRoot}/demo/d3d11/shaders/diffuseVS.hlsl" - "${user:ProjectRoot}/demo/d3d11/shaders/diffuseGS.hlsl" - "${user:ProjectRoot}/demo/d3d11/shaders/diffusePS.hlsl" + "${user:ProjectRoot}/demo/d3d/shaders/pointVS.hlsl" + "${user:ProjectRoot}/demo/d3d/shaders/pointGS.hlsl" + "${user:ProjectRoot}/demo/d3d/shaders/pointPS.hlsl" + "${user:ProjectRoot}/demo/d3d/shaders/pointShadowPS.hlsl" + + "${user:ProjectRoot}/demo/d3d/shaders/diffuseVS.hlsl" + "${user:ProjectRoot}/demo/d3d/shaders/diffuseGS.hlsl" + "${user:ProjectRoot}/demo/d3d/shaders/diffusePS.hlsl" - "${user:ProjectRoot}/demo/d3d11/shaders/ellipsoidDepthVS.hlsl" - "${user:ProjectRoot}/demo/d3d11/shaders/ellipsoidDepthGS.hlsl" - "${user:ProjectRoot}/demo/d3d11/shaders/ellipsoidDepthPS.hlsl" + "${user:ProjectRoot}/demo/d3d/shaders/ellipsoidDepthVS.hlsl" + "${user:ProjectRoot}/demo/d3d/shaders/ellipsoidDepthGS.hlsl" + "${user:ProjectRoot}/demo/d3d/shaders/ellipsoidDepthPS.hlsl" - "${user:ProjectRoot}/demo/d3d11/shaders/passThroughVS.hlsl" - "${user:ProjectRoot}/demo/d3d11/shaders/blurDepthPS.hlsl" - "${user:ProjectRoot}/demo/d3d11/shaders/compositePS.hlsl" + "${user:ProjectRoot}/demo/d3d/shaders/passThroughVS.hlsl" + "${user:ProjectRoot}/demo/d3d/shaders/blurDepthPS.hlsl" + "${user:ProjectRoot}/demo/d3d/shaders/compositePS.hlsl" -- cgit v1.2.3