Flex 1.2.0 release

6 files changed, 1172 insertions, 114 deletions

diff --git a/demo/compiler/vc12win32/flexDemoCUDA.vcxproj b/demo/compiler/vc12win32/flexDemoCUDA.vcxproj
index aa6f0ae..cf2dd1c 100644
--- a/demo/compiler/vc12win32/flexDemoCUDA.vcxproj
+++ b/demo/compiler/vc12win32/flexDemoCUDA.vcxproj
@@ -47,7 +47,7 @@
 			<FloatingPointModel>Precise</FloatingPointModel>
 			<AdditionalOptions> /d2Zi+</AdditionalOptions>
 			<Optimization>Disabled</Optimization>
-			<AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../..;./../..;./../../d3d11;./../../d3d12;./../../../external/SDL2-2.0.4/include;./../../../external/D3D12/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<PreprocessorDefinitions>_CONSOLE;WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<WarningLevel>Level3</WarningLevel>
 			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -55,7 +55,8 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
-			<AdditionalDependencies>cudart.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;./../../../lib/win32/NvFlexDebugCUDA_x86.lib;./../../../lib/win32/NvFlexExtDebugCUDA_x86.lib;./../../../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;%(AdditionalDependencies)</AdditionalDependencies>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
+			<AdditionalDependencies>cudart.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;delayimp.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/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexDebugCUDA_x86.lib;./../../../lib/win32/NvFlexExtDebugCUDA_x86.lib;./../../../lib/win32/NvFlexDeviceDebug_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexDemoDebugCUDA_x86.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoDebugCUDA_x86.exe.pdb</ProgramDatabaseFile>
@@ -87,7 +88,7 @@
 			<FloatingPointModel>Fast</FloatingPointModel>
 			<AdditionalOptions> /d2Zi+</AdditionalOptions>
 			<Optimization>Full</Optimization>
-			<AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+			<AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../..;./../..;./../../d3d11;./../../d3d12;./../../../external/SDL2-2.0.4/include;./../../../external/D3D12/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 			<PreprocessorDefinitions>_CONSOLE;WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<WarningLevel>Level3</WarningLevel>
 			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -95,7 +96,8 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
-			<AdditionalDependencies>cudart.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;./../../../lib/win32/NvFlexReleaseCUDA_x86.lib;./../../../lib/win32/NvFlexExtReleaseCUDA_x86.lib;./../../../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;%(AdditionalDependencies)</AdditionalDependencies>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
+			<AdditionalDependencies>cudart.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;delayimp.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/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexReleaseCUDA_x86.lib;./../../../lib/win32/NvFlexExtReleaseCUDA_x86.lib;./../../../lib/win32/NvFlexDeviceRelease_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexDemoReleaseCUDA_x86.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoReleaseCUDA_x86.exe.pdb</ProgramDatabaseFile>
@@ -182,8 +184,6 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\pasta.h">
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\plasticbody.h">
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\player.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\potpourri.h">
@@ -192,8 +192,6 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\restitution.h">
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\ridigbody.h">
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\rigidfluidcoupling.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\rigidpile.h">
@@ -232,8 +230,12 @@
 		</ClCompile>
 		<ClCompile Include="..\..\main.cpp">
 		</ClCompile>
+		<ClCompile Include="..\..\shadersDemoContext.cpp">
+		</ClCompile>
 		<ClInclude Include="..\..\benchmark.h">
 		</ClInclude>
+		<ClInclude Include="..\..\demoContext.h">
+		</ClInclude>
 		<ClInclude Include="..\..\helpers.h">
 		</ClInclude>
 		<ClInclude Include="..\..\imgui.h">
@@ -242,19 +244,9 @@
 		</ClInclude>
 		<ClInclude Include="..\..\shaders.h">
 		</ClInclude>
-		<ClInclude Include="..\..\stb_truetype.h">
+		<ClInclude Include="..\..\shadersDemoContext.h">
 		</ClInclude>
-	</ItemGroup>
-	<ItemGroup>
-		<ClCompile Include="..\..\opengl\imguiRenderGL.cpp">
-		</ClCompile>
-		<ClCompile Include="..\..\opengl\shader.cpp">
-		</ClCompile>
-		<ClCompile Include="..\..\opengl\shadersGL.cpp">
-		</ClCompile>
-		<ClInclude Include="..\..\opengl\imguiRenderGL.h">
-		</ClInclude>
-		<ClInclude Include="..\..\opengl\shader.h">
+		<ClInclude Include="..\..\stb_truetype.h">
 		</ClInclude>
 	</ItemGroup>
 	<ItemGroup>
@@ -282,6 +274,8 @@
 		</ClCompile>
 		<ClCompile Include="..\..\..\core\platform.cpp">
 		</ClCompile>
+		<ClCompile Include="..\..\..\core\png.cpp">
+		</ClCompile>
 		<ClCompile Include="..\..\..\core\sdf.cpp">
 		</ClCompile>
 		<ClCompile Include="..\..\..\core\tga.cpp">
@@ -316,14 +310,14 @@
 		</ClInclude>
 		<ClInclude Include="..\..\..\core\platform.h">
 		</ClInclude>
+		<ClInclude Include="..\..\..\core\png.h">
+		</ClInclude>
 		<ClInclude Include="..\..\..\core\point3.h">
 		</ClInclude>
 		<ClInclude Include="..\..\..\core\quat.h">
 		</ClInclude>
 		<ClInclude Include="..\..\..\core\sdf.h">
 		</ClInclude>
-		<ClInclude Include="..\..\..\core\skylight.h">
-		</ClInclude>
 		<ClInclude Include="..\..\..\core\tga.h">
 		</ClInclude>
 		<ClInclude Include="..\..\..\core\types.h">
@@ -338,6 +332,640 @@
 		</ClInclude>
 	</ItemGroup>
 	<ItemGroup>
+		<ClCompile Include="..\..\opengl\imguiRenderGL.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\opengl\shader.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\opengl\shadersGL.cpp">
+		</ClCompile>
+		<ClInclude Include="..\..\opengl\demoContextOGL.h">
+		</ClInclude>
+		<ClInclude Include="..\..\opengl\imguiRenderGL.h">
+		</ClInclude>
+		<ClInclude Include="..\..\opengl\shader.h">
+		</ClInclude>
+		<ClInclude Include="..\..\opengl\utilsGL.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\d3d11\appD3D11Ctx.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d11\debugLineRenderD3D11.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d11\demoContextD3D11.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d11\diffuseRenderD3D11.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d11\fluidRenderD3D11.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d11\imguiGraphD3D11.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d11\imguiInteropD3D11.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d11\meshRenderD3D11.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d11\pointRenderD3D11.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d11\renderTargetD3D11.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d11\shadowMapD3D11.cpp">
+		</ClCompile>
+		<ClInclude Include="..\..\d3d11\appD3D11Ctx.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d11\debugLineRenderD3D11.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d11\demoContextD3D11.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d11\diffuseRenderD3D11.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d11\fluidRenderD3D11.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d11\imguiGraphD3D11.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d11\meshRenderD3D11.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d11\pointRenderD3D11.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d11\renderTargetD3D11.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d11\shadowMapD3D11.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\d3d12\appD3D12Ctx.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\bufferD3D12.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\demoContextD3D12.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\diffusePointRenderPipelineD3D12.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\fluidCompositeRenderPipelineD3D12.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\fluidEllipsoidRenderPipelineD3D12.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\imguiGraphD3D12.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\lineRenderPipelineD3D12.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\meshRenderer.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\meshRendererD3D12.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\meshRenderPipelineD3D12.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\meshUtil.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\NvCoDx12CircularResourceHeap.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\NvCoDx12CounterFence.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\NvCoDx12DescriptorHeap.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\NvCoDx12Handle.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\NvCoDx12HelperUtil.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\NvCoDx12RenderTarget.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\NvCoDx12Resource.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\NvCoDx12ResourceScopeManager.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\NvCoDxDebugUtil.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\NvCoDxFormatUtil.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\NvCoFreeList.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\NvResult.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\pipelineUtilD3D12.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\pointRenderPipelineD3D12.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d12\renderStateD3D12.h">
+		</ClInclude>
+		<ClCompile Include="..\..\d3d12\appD3D12Ctx.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\bufferD3D12.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\demoContextD3D12.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\diffusePointRenderPipelineD3D12.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\fluidCompositeRenderPipelineD3D12.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\fluidEllipsoidRenderPipelineD3D12.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\imguiGraphD3D12.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\imguiInteropD3D12.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\lineRenderPipelineD3D12.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\meshRenderer.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\meshRendererD3D12.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\meshRenderPipelineD3D12.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\meshUtil.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\NvCoDx12CircularResourceHeap.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\NvCoDx12CounterFence.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\NvCoDx12DescriptorHeap.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\NvCoDx12HelperUtil.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\NvCoDx12RenderTarget.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\NvCoDx12Resource.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\NvCoDx12ResourceScopeManager.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\NvCoDxDebugUtil.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\NvCoDxFormatUtil.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\NvCoFreeList.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\pipelineUtilD3D12.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\pointRenderPipelineD3D12.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d12\renderStateD3D12.cpp">
+		</ClCompile>
+	</ItemGroup>
+	<ItemGroup>
+		<ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d\imguiGraph.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d\imguiGraphLoader.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d\loader.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d\renderParamsD3D.cpp">
+		</ClCompile>
+		<ClInclude Include="..\..\d3d\appGraphCtx.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d\imguiGraph.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d\loader.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d\loaderMacros.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d\renderParamsD3D.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d\shaderCommonD3D.h">
+		</ClInclude>
+	</ItemGroup>
+	<ItemGroup>
+		<FxCompile Include="./../../d3d/shaders/debugLineVS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">debugLineVS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">debugLineVS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/debugLinePS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">debugLinePS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">debugLinePS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/imguiPS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">imguiPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">imguiPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/imguiVS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">imguiVS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">imguiVS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/meshPS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">meshPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">meshPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/meshAsyncComputeBenchPS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">meshPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">meshPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/meshShadowPS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">meshPS_Shadow</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">meshPS_Shadow</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/meshVS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">meshVS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">meshVS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/pointVS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointVS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointVS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/pointGS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Geometry</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointGS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Geometry</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointGS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/pointPS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/pointShadowPS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointShadowPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointShadowPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/diffuseVS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">diffuseVS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">diffuseVS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/diffuseGS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Geometry</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">diffuseGS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Geometry</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">diffuseGS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/diffusePS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">diffusePS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">diffusePS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthVS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">ellipsoidDepthVS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">ellipsoidDepthVS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthGS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Geometry</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">ellipsoidDepthGS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Geometry</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">ellipsoidDepthGS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthPS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">ellipsoidDepthPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">ellipsoidDepthPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/passThroughVS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">passThroughVS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">passThroughVS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/blurDepthPS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">blurDepthPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">blurDepthPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/compositePS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">compositePS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">compositePS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/pointThicknessVS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointThicknessVS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointThicknessVS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/pointThicknessGS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Geometry</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointThicknessGS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Geometry</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointThicknessGS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/pointThicknessPS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointThicknessPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointThicknessPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+	</ItemGroup>
+	<ItemGroup>
 		<ProjectReference Include="./../../../extensions/compiler/vc12win32/flexExtCUDA.vcxproj">
 			<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 		</ProjectReference>
diff --git a/demo/compiler/vc12win32/flexDemoCUDA.vcxproj.filters b/demo/compiler/vc12win32/flexDemoCUDA.vcxproj.filters
index e5989dc..2ae88c6 100644
--- a/demo/compiler/vc12win32/flexDemoCUDA.vcxproj.filters
+++ b/demo/compiler/vc12win32/flexDemoCUDA.vcxproj.filters
@@ -108,9 +108,6 @@
 		<ClInclude Include="..\..\scenes\pasta.h">


 			<Filter>demo\scenes</Filter>


 		</ClInclude>


-		<ClInclude Include="..\..\scenes\plasticbody.h">


-			<Filter>demo\scenes</Filter>


-		</ClInclude>


 		<ClInclude Include="..\..\scenes\player.h">


 			<Filter>demo\scenes</Filter>


 		</ClInclude>


@@ -123,9 +120,6 @@
 		<ClInclude Include="..\..\scenes\restitution.h">


 			<Filter>demo\scenes</Filter>


 		</ClInclude>


-		<ClInclude Include="..\..\scenes\ridigbody.h">


-			<Filter>demo\scenes</Filter>


-		</ClInclude>


 		<ClInclude Include="..\..\scenes\rigidfluidcoupling.h">


 			<Filter>demo\scenes</Filter>


 		</ClInclude>


@@ -182,9 +176,15 @@
 		<ClCompile Include="..\..\main.cpp">


 			<Filter>demo</Filter>


 		</ClCompile>


+		<ClCompile Include="..\..\shadersDemoContext.cpp">


+			<Filter>demo</Filter>


+		</ClCompile>


 		<ClInclude Include="..\..\benchmark.h">


 			<Filter>demo</Filter>


 		</ClInclude>


+		<ClInclude Include="..\..\demoContext.h">


+			<Filter>demo</Filter>


+		</ClInclude>


 		<ClInclude Include="..\..\helpers.h">


 			<Filter>demo</Filter>


 		</ClInclude>


@@ -197,29 +197,11 @@
 		<ClInclude Include="..\..\shaders.h">


 			<Filter>demo</Filter>


 		</ClInclude>


-		<ClInclude Include="..\..\stb_truetype.h">


+		<ClInclude Include="..\..\shadersDemoContext.h">


 			<Filter>demo</Filter>


 		</ClInclude>


-	</ItemGroup>


-	<ItemGroup>


-		<Filter Include="opengl">


-		</Filter>


-	</ItemGroup>


-	<ItemGroup>


-		<ClCompile Include="..\..\opengl\imguiRenderGL.cpp">


-			<Filter>opengl</Filter>


-		</ClCompile>


-		<ClCompile Include="..\..\opengl\shader.cpp">


-			<Filter>opengl</Filter>


-		</ClCompile>


-		<ClCompile Include="..\..\opengl\shadersGL.cpp">


-			<Filter>opengl</Filter>


-		</ClCompile>


-		<ClInclude Include="..\..\opengl\imguiRenderGL.h">


-			<Filter>opengl</Filter>


-		</ClInclude>


-		<ClInclude Include="..\..\opengl\shader.h">


-			<Filter>opengl</Filter>


+		<ClInclude Include="..\..\stb_truetype.h">


+			<Filter>demo</Filter>


 		</ClInclude>


 	</ItemGroup>


 	<ItemGroup>


@@ -266,6 +248,9 @@
 		<ClCompile Include="..\..\..\core\platform.cpp">


 			<Filter>core</Filter>


 		</ClCompile>


+		<ClCompile Include="..\..\..\core\png.cpp">


+			<Filter>core</Filter>


+		</ClCompile>


 		<ClCompile Include="..\..\..\core\sdf.cpp">


 			<Filter>core</Filter>


 		</ClCompile>


@@ -317,6 +302,9 @@
 		<ClInclude Include="..\..\..\core\platform.h">


 			<Filter>core</Filter>


 		</ClInclude>


+		<ClInclude Include="..\..\..\core\png.h">


+			<Filter>core</Filter>


+		</ClInclude>


 		<ClInclude Include="..\..\..\core\point3.h">


 			<Filter>core</Filter>


 		</ClInclude>


@@ -326,9 +314,6 @@
 		<ClInclude Include="..\..\..\core\sdf.h">


 			<Filter>core</Filter>


 		</ClInclude>


-		<ClInclude Include="..\..\..\core\skylight.h">


-			<Filter>core</Filter>


-		</ClInclude>


 		<ClInclude Include="..\..\..\core\tga.h">


 			<Filter>core</Filter>


 		</ClInclude>


@@ -348,4 +333,391 @@
 			<Filter>core</Filter>


 		</ClInclude>


 	</ItemGroup>


+	<ItemGroup>


+		<Filter Include="opengl">


+		</Filter>


+	</ItemGroup>


+	<ItemGroup>


+		<ClCompile Include="..\..\opengl\imguiRenderGL.cpp">


+			<Filter>opengl</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\opengl\shader.cpp">


+			<Filter>opengl</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\opengl\shadersGL.cpp">


+			<Filter>opengl</Filter>


+		</ClCompile>


+		<ClInclude Include="..\..\opengl\demoContextOGL.h">


+			<Filter>opengl</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\opengl\imguiRenderGL.h">


+			<Filter>opengl</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\opengl\shader.h">


+			<Filter>opengl</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\opengl\utilsGL.h">


+			<Filter>opengl</Filter>


+		</ClInclude>


+	</ItemGroup>


+	<ItemGroup>


+		<Filter Include="d3d11">


+		</Filter>


+	</ItemGroup>


+	<ItemGroup>


+		<ClCompile Include="..\..\d3d11\appD3D11Ctx.cpp">


+			<Filter>d3d11</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d11\debugLineRenderD3D11.cpp">


+			<Filter>d3d11</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d11\demoContextD3D11.cpp">


+			<Filter>d3d11</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d11\diffuseRenderD3D11.cpp">


+			<Filter>d3d11</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d11\fluidRenderD3D11.cpp">


+			<Filter>d3d11</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d11\imguiGraphD3D11.cpp">


+			<Filter>d3d11</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d11\imguiInteropD3D11.cpp">


+			<Filter>d3d11</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d11\meshRenderD3D11.cpp">


+			<Filter>d3d11</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d11\pointRenderD3D11.cpp">


+			<Filter>d3d11</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d11\renderTargetD3D11.cpp">


+			<Filter>d3d11</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d11\shadowMapD3D11.cpp">


+			<Filter>d3d11</Filter>


+		</ClCompile>


+		<ClInclude Include="..\..\d3d11\appD3D11Ctx.h">


+			<Filter>d3d11</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d11\debugLineRenderD3D11.h">


+			<Filter>d3d11</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d11\demoContextD3D11.h">


+			<Filter>d3d11</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d11\diffuseRenderD3D11.h">


+			<Filter>d3d11</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d11\fluidRenderD3D11.h">


+			<Filter>d3d11</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d11\imguiGraphD3D11.h">


+			<Filter>d3d11</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d11\meshRenderD3D11.h">


+			<Filter>d3d11</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d11\pointRenderD3D11.h">


+			<Filter>d3d11</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d11\renderTargetD3D11.h">


+			<Filter>d3d11</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d11\shadowMapD3D11.h">


+			<Filter>d3d11</Filter>


+		</ClInclude>


+	</ItemGroup>


+	<ItemGroup>


+		<Filter Include="d3d12">


+		</Filter>


+	</ItemGroup>


+	<ItemGroup>


+		<ClInclude Include="..\..\d3d12\appD3D12Ctx.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\bufferD3D12.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\demoContextD3D12.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\diffusePointRenderPipelineD3D12.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\fluidCompositeRenderPipelineD3D12.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\fluidEllipsoidRenderPipelineD3D12.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\imguiGraphD3D12.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\lineRenderPipelineD3D12.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\meshRenderer.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\meshRendererD3D12.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\meshRenderPipelineD3D12.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\meshUtil.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\NvCoDx12CircularResourceHeap.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\NvCoDx12CounterFence.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\NvCoDx12DescriptorHeap.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\NvCoDx12Handle.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\NvCoDx12HelperUtil.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\NvCoDx12RenderTarget.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\NvCoDx12Resource.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\NvCoDx12ResourceScopeManager.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\NvCoDxDebugUtil.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\NvCoDxFormatUtil.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\NvCoFreeList.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\NvResult.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\pipelineUtilD3D12.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\pointRenderPipelineD3D12.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d12\renderStateD3D12.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


+		<ClCompile Include="..\..\d3d12\appD3D12Ctx.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\bufferD3D12.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\demoContextD3D12.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\diffusePointRenderPipelineD3D12.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\fluidCompositeRenderPipelineD3D12.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\fluidEllipsoidRenderPipelineD3D12.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\imguiGraphD3D12.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\imguiInteropD3D12.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\lineRenderPipelineD3D12.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\meshRenderer.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\meshRendererD3D12.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\meshRenderPipelineD3D12.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\meshUtil.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\NvCoDx12CircularResourceHeap.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\NvCoDx12CounterFence.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\NvCoDx12DescriptorHeap.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\NvCoDx12HelperUtil.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\NvCoDx12RenderTarget.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\NvCoDx12Resource.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\NvCoDx12ResourceScopeManager.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\NvCoDxDebugUtil.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\NvCoDxFormatUtil.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\NvCoFreeList.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\pipelineUtilD3D12.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\pointRenderPipelineD3D12.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d12\renderStateD3D12.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


+	</ItemGroup>


+	<ItemGroup>


+		<Filter Include="d3d">


+		</Filter>


+	</ItemGroup>


+	<ItemGroup>


+		<ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp">


+			<Filter>d3d</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d\imguiGraph.cpp">


+			<Filter>d3d</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d\imguiGraphLoader.cpp">


+			<Filter>d3d</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d\loader.cpp">


+			<Filter>d3d</Filter>


+		</ClCompile>


+		<ClCompile Include="..\..\d3d\renderParamsD3D.cpp">


+			<Filter>d3d</Filter>


+		</ClCompile>


+		<ClInclude Include="..\..\d3d\appGraphCtx.h">


+			<Filter>d3d</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d\imguiGraph.h">


+			<Filter>d3d</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d\loader.h">


+			<Filter>d3d</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d\loaderMacros.h">


+			<Filter>d3d</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d\renderParamsD3D.h">


+			<Filter>d3d</Filter>


+		</ClInclude>


+		<ClInclude Include="..\..\d3d\shaderCommonD3D.h">


+			<Filter>d3d</Filter>


+		</ClInclude>


+	</ItemGroup>


+	<ItemGroup><Filter Include="Shader Files"></Filter></ItemGroup>

+	<ItemGroup>

+		<FxCompile Include="./../../d3d/shaders/debugLineVS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/debugLinePS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/imguiPS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/imguiVS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/meshPS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/meshAsyncComputeBenchPS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/meshShadowPS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/meshVS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/pointVS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/pointGS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/pointPS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/pointShadowPS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/diffuseVS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/diffuseGS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/diffusePS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthVS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthGS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthPS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/passThroughVS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/blurDepthPS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/compositePS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/pointThicknessVS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/pointThicknessGS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/pointThicknessPS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+	</ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/demo/compiler/vc12win32/flexDemoCUDA.vcxproj.user b/demo/compiler/vc12win32/flexDemoCUDA.vcxproj.user
index 2fc5615..1860514 100644
--- a/demo/compiler/vc12win32/flexDemoCUDA.vcxproj.user
+++ b/demo/compiler/vc12win32/flexDemoCUDA.vcxproj.user
@@ -1,15 +1,9 @@
-<?xml version="1.0" encoding="utf-8" ?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-    <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug|Win32&apos;">

-        <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>

-    </PropertyGroup>

-    <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release|Win32&apos;">

-        <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>

-    </PropertyGroup>

-    <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug|Win32&apos;">

-        <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>

-    </PropertyGroup>

-    <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release|Win32&apos;">

-        <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>

-    </PropertyGroup>

-</Project>

+<?xml version="1.0" encoding="utf-8"?>


+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">


+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">


+  <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>


+</PropertyGroup>


+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">


+  <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>


+</PropertyGroup>


+</Project>
\ No newline at end of file
diff --git a/demo/compiler/vc12win32/flexDemoD3D.vcxproj b/demo/compiler/vc12win32/flexDemoD3D.vcxproj
index 264f9d9..bb24f2d 100644
--- a/demo/compiler/vc12win32/flexDemoD3D.vcxproj
+++ b/demo/compiler/vc12win32/flexDemoD3D.vcxproj
@@ -55,7 +55,8 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
-			<AdditionalDependencies>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;./../../../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/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexDebugD3D_x86.lib;./../../../lib/win32/NvFlexExtDebugD3D_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
+			<AdditionalDependencies>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;delayimp.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/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexDebugD3D_x86.lib;./../../../lib/win32/NvFlexExtDebugD3D_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexDemoDebugD3D_x86.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoDebugD3D_x86.exe.pdb</ProgramDatabaseFile>
@@ -94,7 +95,8 @@
 			<PrecompiledHeaderFile></PrecompiledHeaderFile>
 		</ClCompile>
 		<Link>
-			<AdditionalDependencies>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;./../../../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/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexReleaseD3D_x86.lib;./../../../lib/win32/NvFlexExtReleaseD3D_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions>
+			<AdditionalDependencies>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;delayimp.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/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexReleaseD3D_x86.lib;./../../../lib/win32/NvFlexExtReleaseD3D_x86.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexDemoReleaseD3D_x86.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoReleaseD3D_x86.exe.pdb</ProgramDatabaseFile>
@@ -181,8 +183,6 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\pasta.h">
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\plasticbody.h">
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\player.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\potpourri.h">
@@ -191,8 +191,6 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\restitution.h">
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\ridigbody.h">
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\rigidfluidcoupling.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\rigidpile.h">
@@ -231,8 +229,12 @@
 		</ClCompile>
 		<ClCompile Include="..\..\main.cpp">
 		</ClCompile>
+		<ClCompile Include="..\..\shadersDemoContext.cpp">
+		</ClCompile>
 		<ClInclude Include="..\..\benchmark.h">
 		</ClInclude>
+		<ClInclude Include="..\..\demoContext.h">
+		</ClInclude>
 		<ClInclude Include="..\..\helpers.h">
 		</ClInclude>
 		<ClInclude Include="..\..\imgui.h">
@@ -241,6 +243,8 @@
 		</ClInclude>
 		<ClInclude Include="..\..\shaders.h">
 		</ClInclude>
+		<ClInclude Include="..\..\shadersDemoContext.h">
+		</ClInclude>
 		<ClInclude Include="..\..\stb_truetype.h">
 		</ClInclude>
 	</ItemGroup>
@@ -269,6 +273,8 @@
 		</ClCompile>
 		<ClCompile Include="..\..\..\core\platform.cpp">
 		</ClCompile>
+		<ClCompile Include="..\..\..\core\png.cpp">
+		</ClCompile>
 		<ClCompile Include="..\..\..\core\sdf.cpp">
 		</ClCompile>
 		<ClCompile Include="..\..\..\core\tga.cpp">
@@ -303,14 +309,14 @@
 		</ClInclude>
 		<ClInclude Include="..\..\..\core\platform.h">
 		</ClInclude>
+		<ClInclude Include="..\..\..\core\png.h">
+		</ClInclude>
 		<ClInclude Include="..\..\..\core\point3.h">
 		</ClInclude>
 		<ClInclude Include="..\..\..\core\quat.h">
 		</ClInclude>
 		<ClInclude Include="..\..\..\core\sdf.h">
 		</ClInclude>
-		<ClInclude Include="..\..\..\core\skylight.h">
-		</ClInclude>
 		<ClInclude Include="..\..\..\core\tga.h">
 		</ClInclude>
 		<ClInclude Include="..\..\..\core\types.h">
@@ -339,6 +345,8 @@
 		</ClInclude>
 		<ClInclude Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.h">
 		</ClInclude>
+		<ClInclude Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.h">
+		</ClInclude>
 		<ClInclude Include="..\..\d3d12\imguiGraphD3D12.h">
 		</ClInclude>
 		<ClInclude Include="..\..\d3d12\lineRenderPipelineD3D12.h">
@@ -395,6 +403,8 @@
 		</ClCompile>
 		<ClCompile Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.cpp">
 		</ClCompile>
+		<ClCompile Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.cpp">
+		</ClCompile>
 		<ClCompile Include="..\..\d3d12\imguiGraphD3D12.cpp">
 		</ClCompile>
 		<ClCompile Include="..\..\d3d12\imguiInteropD3D12.cpp">
@@ -483,8 +493,6 @@
 	<ItemGroup>
 		<ClInclude Include="..\..\d3d\appGraphCtx.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d\demoContext.h">
-		</ClInclude>
 		<ClInclude Include="..\..\d3d\imguiGraph.h">
 		</ClInclude>
 		<ClInclude Include="..\..\d3d\loader.h">
@@ -495,8 +503,6 @@
 		</ClInclude>
 		<ClInclude Include="..\..\d3d\shaderCommonD3D.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d\shadersDemoContext.h">
-		</ClInclude>
 		<ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp">
 		</ClCompile>
 		<ClCompile Include="..\..\d3d\imguiGraph.cpp">
@@ -507,8 +513,6 @@
 		</ClCompile>
 		<ClCompile Include="..\..\d3d\renderParamsD3D.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d\shadersDemoContext.cpp">
-		</ClCompile>
 	</ItemGroup>
 	<ItemGroup>
 		<FxCompile Include="./../../d3d/shaders/debugLineVS.hlsl">
@@ -889,6 +893,60 @@
 			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/pointThicknessVS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointThicknessVS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointThicknessVS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/pointThicknessGS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Geometry</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointThicknessGS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Geometry</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointThicknessGS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/pointThicknessPS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointThicknessPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointThicknessPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
+		</FxCompile>
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="./../../../extensions/compiler/vc12win32/flexExtD3D.vcxproj">
diff --git a/demo/compiler/vc12win32/flexDemoD3D.vcxproj.filters b/demo/compiler/vc12win32/flexDemoD3D.vcxproj.filters
index b7f0548..1f816b3 100644
--- a/demo/compiler/vc12win32/flexDemoD3D.vcxproj.filters
+++ b/demo/compiler/vc12win32/flexDemoD3D.vcxproj.filters
@@ -108,9 +108,6 @@
 		<ClInclude Include="..\..\scenes\pasta.h">


 			<Filter>demo\scenes</Filter>


 		</ClInclude>


-		<ClInclude Include="..\..\scenes\plasticbody.h">


-			<Filter>demo\scenes</Filter>


-		</ClInclude>


 		<ClInclude Include="..\..\scenes\player.h">


 			<Filter>demo\scenes</Filter>


 		</ClInclude>


@@ -123,9 +120,6 @@
 		<ClInclude Include="..\..\scenes\restitution.h">


 			<Filter>demo\scenes</Filter>


 		</ClInclude>


-		<ClInclude Include="..\..\scenes\ridigbody.h">


-			<Filter>demo\scenes</Filter>


-		</ClInclude>


 		<ClInclude Include="..\..\scenes\rigidfluidcoupling.h">


 			<Filter>demo\scenes</Filter>


 		</ClInclude>


@@ -182,9 +176,15 @@
 		<ClCompile Include="..\..\main.cpp">


 			<Filter>demo</Filter>


 		</ClCompile>


+		<ClCompile Include="..\..\shadersDemoContext.cpp">


+			<Filter>demo</Filter>


+		</ClCompile>


 		<ClInclude Include="..\..\benchmark.h">


 			<Filter>demo</Filter>


 		</ClInclude>


+		<ClInclude Include="..\..\demoContext.h">


+			<Filter>demo</Filter>


+		</ClInclude>


 		<ClInclude Include="..\..\helpers.h">


 			<Filter>demo</Filter>


 		</ClInclude>


@@ -197,6 +197,9 @@
 		<ClInclude Include="..\..\shaders.h">


 			<Filter>demo</Filter>


 		</ClInclude>


+		<ClInclude Include="..\..\shadersDemoContext.h">


+			<Filter>demo</Filter>


+		</ClInclude>


 		<ClInclude Include="..\..\stb_truetype.h">


 			<Filter>demo</Filter>


 		</ClInclude>


@@ -245,6 +248,9 @@
 		<ClCompile Include="..\..\..\core\platform.cpp">


 			<Filter>core</Filter>


 		</ClCompile>


+		<ClCompile Include="..\..\..\core\png.cpp">


+			<Filter>core</Filter>


+		</ClCompile>


 		<ClCompile Include="..\..\..\core\sdf.cpp">


 			<Filter>core</Filter>


 		</ClCompile>


@@ -296,6 +302,9 @@
 		<ClInclude Include="..\..\..\core\platform.h">


 			<Filter>core</Filter>


 		</ClInclude>


+		<ClInclude Include="..\..\..\core\png.h">


+			<Filter>core</Filter>


+		</ClInclude>


 		<ClInclude Include="..\..\..\core\point3.h">


 			<Filter>core</Filter>


 		</ClInclude>


@@ -305,9 +314,6 @@
 		<ClInclude Include="..\..\..\core\sdf.h">


 			<Filter>core</Filter>


 		</ClInclude>


-		<ClInclude Include="..\..\..\core\skylight.h">


-			<Filter>core</Filter>


-		</ClInclude>


 		<ClInclude Include="..\..\..\core\tga.h">


 			<Filter>core</Filter>


 		</ClInclude>


@@ -353,6 +359,9 @@
 		<ClInclude Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.h">


 			<Filter>d3d12</Filter>


 		</ClInclude>


+		<ClInclude Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.h">


+			<Filter>d3d12</Filter>


+		</ClInclude>


 		<ClInclude Include="..\..\d3d12\imguiGraphD3D12.h">


 			<Filter>d3d12</Filter>


 		</ClInclude>


@@ -437,6 +446,9 @@
 		<ClCompile Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.cpp">


 			<Filter>d3d12</Filter>


 		</ClCompile>


+		<ClCompile Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.cpp">


+			<Filter>d3d12</Filter>


+		</ClCompile>


 		<ClCompile Include="..\..\d3d12\imguiGraphD3D12.cpp">


 			<Filter>d3d12</Filter>


 		</ClCompile>


@@ -575,9 +587,6 @@
 		<ClInclude Include="..\..\d3d\appGraphCtx.h">


 			<Filter>d3d</Filter>


 		</ClInclude>


-		<ClInclude Include="..\..\d3d\demoContext.h">


-			<Filter>d3d</Filter>


-		</ClInclude>


 		<ClInclude Include="..\..\d3d\imguiGraph.h">


 			<Filter>d3d</Filter>


 		</ClInclude>


@@ -593,9 +602,6 @@
 		<ClInclude Include="..\..\d3d\shaderCommonD3D.h">


 			<Filter>d3d</Filter>


 		</ClInclude>


-		<ClInclude Include="..\..\d3d\shadersDemoContext.h">


-			<Filter>d3d</Filter>


-		</ClInclude>


 		<ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp">


 			<Filter>d3d</Filter>


 		</ClCompile>


@@ -611,9 +617,6 @@
 		<ClCompile Include="..\..\d3d\renderParamsD3D.cpp">


 			<Filter>d3d</Filter>


 		</ClCompile>


-		<ClCompile Include="..\..\d3d\shadersDemoContext.cpp">


-			<Filter>d3d</Filter>


-		</ClCompile>


 	</ItemGroup>


 	<ItemGroup><Filter Include="Shader Files"></Filter></ItemGroup>

 	<ItemGroup>

@@ -680,5 +683,14 @@
 		<FxCompile Include="./../../d3d/shaders/compositePS.hlsl">

 			<Filter>Shader Files</Filter>

 		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/pointThicknessVS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/pointThicknessGS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

+		<FxCompile Include="./../../d3d/shaders/pointThicknessPS.hlsl">

+			<Filter>Shader Files</Filter>

+		</FxCompile>

 	</ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/demo/compiler/vc12win32/flexDemoD3D.vcxproj.user b/demo/compiler/vc12win32/flexDemoD3D.vcxproj.user
index 2fc5615..1860514 100644
--- a/demo/compiler/vc12win32/flexDemoD3D.vcxproj.user
+++ b/demo/compiler/vc12win32/flexDemoD3D.vcxproj.user
@@ -1,15 +1,9 @@
-<?xml version="1.0" encoding="utf-8" ?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-    <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug|Win32&apos;">

-        <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>

-    </PropertyGroup>

-    <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release|Win32&apos;">

-        <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>

-    </PropertyGroup>

-    <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;debug|Win32&apos;">

-        <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>

-    </PropertyGroup>

-    <PropertyGroup Condition="&apos;$(Configuration)|$(Platform)&apos;==&apos;release|Win32&apos;">

-        <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>

-    </PropertyGroup>

-</Project>

+<?xml version="1.0" encoding="utf-8"?>


+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">


+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">


+  <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>


+</PropertyGroup>


+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">


+  <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>


+</PropertyGroup>


+</Project>
\ No newline at end of file