1.2.0.beta.11.2.0.beta.1

author: Miles Macklin <[email protected]> 2017-06-09 13:41:15 +1200
committer: Miles Macklin <[email protected]> 2017-06-09 13:41:15 +1200
commit: 688b5f42e9bfe498d7af7075d4d8f4429867f3a3 (patch)
tree: 7e0d0e7c95298f0418723abd92f61ac6e16b055e /demo/compiler
parent: Update README.md (diff)
download: flex-1.2.0.beta.1.tar.xz
flex-1.2.0.beta.1.zip
22 files changed, 2299 insertions, 656 deletions
diff --git a/demo/compiler/makeandroid/Makefile b/demo/compiler/makeandroid/Makefile
index 0b462ff..02650e4 100644
--- a/demo/compiler/makeandroid/Makefile
+++ b/demo/compiler/makeandroid/Makefile
@@ -2,11 +2,11 @@
 # Makefile generated by XPJ for android
 
 DEPSDIR = .deps
-NDKROOT = "$(NDK_ROOT)"/"$(NDK_VERSION)"
-NDK_BIN_DIR = "$(NDK_ROOT)"/"$(NDK_VERSION)"/toolchains/"$(NDK_TOOLCHAIN)"/prebuilt/"linux-x86_64"/bin
+NDKROOT = ./../../../../../../external/android-ndk/android-ndk-r10e-linux
+NDK_BIN_DIR = ./../../../../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin
 NDK_PREFIX = arm-linux-androideabi-
-JAVA_HOME  = ./../xpj/"$(JAVA_HOME)"
-ANT_TOOL = ./../xpj/"$(ANT_HOME}"/bin/ant
+JAVA_HOME  = ./../../../../../../external/java/jdk1.8.0_20
+ANT_TOOL = ./../../../../../../external/ant/apache-ant-1.8.2/bin/ant
 #default defines
 OBJS_DIR  = build
 RMDIR     = rm -fr
@@ -23,22 +23,20 @@ OBJCOPY   = $(NDK_BIN_DIR)/$(NDK_PREFIX)objcopy
 
 all: debug release 
 
-debug: build_flexExtCUDA_debug 
+debug: build_flexCUDA_debug build_flexExtCUDA_debug 
 
-release: build_flexExtCUDA_release build_flexDemoCUDA_release 
+release: build_flexDevice_release build_flexCUDA_release build_flexExtCUDA_release build_flexDemoCUDA_release 
 
-clean: clean_flexExtCUDA_release clean_flexExtCUDA_debug clean_flexDemoCUDA_release 
+clean: clean_flexDevice_release clean_flexCUDA_release clean_flexCUDA_debug clean_flexExtCUDA_release clean_flexExtCUDA_debug clean_flexDemoCUDA_release 
 	rm -rf $(DEPSDIR)
 
 
-clean_release: clean_flexExtCUDA_release clean_flexDemoCUDA_release 
-	rm -rf $(DEPSDIR)
-
-
-clean_debug: clean_flexExtCUDA_debug clean_flexDemoCUDA_debug 
+clean_release: clean_flexDevice_release clean_flexCUDA_release clean_flexExtCUDA_release clean_flexDemoCUDA_release 
 	rm -rf $(DEPSDIR)
 
 
+include Makefile.flexDevice.mk
+include Makefile.flexCUDA.mk
 include Makefile.flexExtCUDA.mk
 include Makefile.flexDemoCUDA.mk
 
diff --git a/demo/compiler/makeandroid/Makefile.flexDemoCUDA.mk b/demo/compiler/makeandroid/Makefile.flexDemoCUDA.mk
index dbfbaab..74e8454 100644
--- a/demo/compiler/makeandroid/Makefile.flexDemoCUDA.mk
+++ b/demo/compiler/makeandroid/Makefile.flexDemoCUDA.mk
@@ -18,6 +18,9 @@ flexDemoCUDA_cppfiles   += ./../../../core/sdf.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/tga.cpp
 flexDemoCUDA_cppfiles   += ./../../../core/voxelize.cpp
 flexDemoCUDA_cppfiles   += ./../../../external/egl_setup/egl_setup.cpp
+flexDemoCUDA_cppfiles   += ./../../android/android_main.cpp
+flexDemoCUDA_cppfiles   += ./../../android/android_mainRender.cpp
+flexDemoCUDA_cfiles   += ./../../android/android_native_app_glue.c
 
 flexDemoCUDA_cpp_release_dep    = $(addprefix $(DEPSDIR)/flexDemoCUDA/release/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.P, $(flexDemoCUDA_cppfiles)))))
 flexDemoCUDA_cc_release_dep    = $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.release.P, $(flexDemoCUDA_ccfiles)))))
@@ -26,15 +29,15 @@ flexDemoCUDA_release_dep      = $(flexDemoCUDA_cpp_release_dep) $(flexDemoCUDA_c
 -include $(flexDemoCUDA_release_dep)
 flexDemoCUDA_release_hpaths    := 
 flexDemoCUDA_release_hpaths    += ./../../..
-flexDemoCUDA_release_hpaths    += $(NDK_ROOT)/$(NDK_VERSION)/platforms/android-15/arch-arm/usr/include
-flexDemoCUDA_release_hpaths    += $(NDK_ROOT)/$(NDK_VERSION)/sources/cxx-stl/stlport/stlport
-flexDemoCUDA_release_hpaths    += $(CUDA_PATH)/targets/armv7-linux-androideabi/include
+flexDemoCUDA_release_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include
+flexDemoCUDA_release_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport
+flexDemoCUDA_release_hpaths    += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include
 flexDemoCUDA_release_hpaths    += ./../../../external/egl_setup
 flexDemoCUDA_release_hpaths    += ./../../../external/regal_static/include
 flexDemoCUDA_release_lpaths    := 
-flexDemoCUDA_release_lpaths    += $(CUDA_PATH)/targets/armv7-linux-androideabi/lib
+flexDemoCUDA_release_lpaths    += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/lib
 flexDemoCUDA_release_lpaths    += ./../../../lib/android
-flexDemoCUDA_release_lpaths    += $(NDK_ROOT)/$(NDK_VERSION)/sources/cxx-stl/stlport/libs/armeabi-v7a
+flexDemoCUDA_release_lpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/libs/armeabi-v7a
 flexDemoCUDA_release_lpaths    += ./../../../external/regal_static/lib/armeabi-v7a
 flexDemoCUDA_release_lpaths    += ./../../../lib/android
 flexDemoCUDA_release_defines   := $(flexDemoCUDA_custom_defines)
@@ -44,6 +47,8 @@ flexDemoCUDA_release_defines   += ANDROID_PLAT=1
 flexDemoCUDA_release_defines   += DISABLE_IMPORTGL
 flexDemoCUDA_release_defines   += NDEBUG
 flexDemoCUDA_release_libraries := 
+flexDemoCUDA_release_libraries += NvFlexReleaseCUDA_armv7l
+flexDemoCUDA_release_libraries += flexDevice_x64
 flexDemoCUDA_release_libraries += flexExt_cuda_release_armv7l
 flexDemoCUDA_release_libraries += android
 flexDemoCUDA_release_libraries += stdc++
@@ -62,14 +67,16 @@ flexDemoCUDA_release_common_cflags	:= $(flexDemoCUDA_custom_cflags)
 flexDemoCUDA_release_common_cflags    += -MMD
 flexDemoCUDA_release_common_cflags    += $(addprefix -D, $(flexDemoCUDA_release_defines))
 flexDemoCUDA_release_common_cflags    += $(addprefix -I, $(flexDemoCUDA_release_hpaths))
-flexDemoCUDA_release_common_cflags  += -std=c++11 -fno-exceptions -fno-rtti
-flexDemoCUDA_release_common_cflags  += -fpic -fPIC -ffunction-sections -funwind-tables -fstack-protector -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -O2 -g -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300
 flexDemoCUDA_release_cflags	:= $(flexDemoCUDA_release_common_cflags)
+flexDemoCUDA_release_cflags  += -std=c++11 -fno-exceptions -fno-rtti
+flexDemoCUDA_release_cflags  += -fpic -fPIC -ffunction-sections -funwind-tables -fstack-protector -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -O2 -g -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300
 flexDemoCUDA_release_cppflags	:= $(flexDemoCUDA_release_common_cflags)
+flexDemoCUDA_release_cppflags  += -std=c++11 -fno-exceptions -fno-rtti
+flexDemoCUDA_release_cppflags  += -fpic -fPIC -ffunction-sections -funwind-tables -fstack-protector -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -O2 -g -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300
 flexDemoCUDA_release_lflags    := $(flexDemoCUDA_custom_lflags)
 flexDemoCUDA_release_lflags    += $(addprefix -L, $(flexDemoCUDA_release_lpaths))
 flexDemoCUDA_release_lflags    += -Wl,--start-group $(addprefix -l, $(flexDemoCUDA_release_libraries)) -Wl,--end-group
-flexDemoCUDA_release_lflags  += --sysroot="$(NDK_ROOT)"/"$(NDK_VERSION)"/platforms/android-15/arch-arm -shared -Wl,--no-undefined
+flexDemoCUDA_release_lflags  += --sysroot=/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm -shared -Wl,--no-undefined
 flexDemoCUDA_release_objsdir  = $(OBJS_DIR)/flexDemoCUDA_release
 flexDemoCUDA_release_cpp_o    = $(addprefix $(flexDemoCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexDemoCUDA_cppfiles)))))
 flexDemoCUDA_release_cc_o    = $(addprefix $(flexDemoCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(flexDemoCUDA_ccfiles)))))
@@ -91,7 +98,7 @@ antbuild_flexDemoCUDA_release: preantbuild_flexDemoCUDA_release
 mainbuild_flexDemoCUDA_release: prebuild_flexDemoCUDA_release $(flexDemoCUDA_release_bin)
 prebuild_flexDemoCUDA_release:
 
-$(flexDemoCUDA_release_bin): $(flexDemoCUDA_release_obj) build_flexExtCUDA_release 
+$(flexDemoCUDA_release_bin): $(flexDemoCUDA_release_obj) build_flexCUDA_release build_flexDevice_release build_flexExtCUDA_release 
 	mkdir -p `dirname ./../android/flex_project/libs/armeabi-v7a/libflexDemo.so`
 	$(CXX) -shared $(flexDemoCUDA_release_obj) $(flexDemoCUDA_release_lflags) -lc -o $@ 
 	$(ECHO) building $@ complete!
diff --git a/demo/compiler/makeandroid/Makefile.flexExtCUDA.mk b/demo/compiler/makeandroid/Makefile.flexExtCUDA.mk
index 8a33251..9e4826c 100644
--- a/demo/compiler/makeandroid/Makefile.flexExtCUDA.mk
+++ b/demo/compiler/makeandroid/Makefile.flexExtCUDA.mk
@@ -24,28 +24,32 @@ flexExtCUDA_debug_dep      = $(flexExtCUDA_cpp_debug_dep) $(flexExtCUDA_cc_debug
 -include $(flexExtCUDA_debug_dep)
 flexExtCUDA_release_hpaths    := 
 flexExtCUDA_release_hpaths    += ./../../..
-flexExtCUDA_release_hpaths    += $(NDK_ROOT)/$(NDK_VERSION)/platforms/android-15/arch-arm/usr/include
-flexExtCUDA_release_hpaths    += $(NDK_ROOT)/$(NDK_VERSION)/sources/cxx-stl/stlport/stlport
-flexExtCUDA_release_hpaths    += $(CUDA_PATH)/targets/armv7-linux-androideabi/include
+flexExtCUDA_release_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include
+flexExtCUDA_release_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport
+flexExtCUDA_release_hpaths    += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include
 flexExtCUDA_release_lpaths    := 
-flexExtCUDA_release_lpaths    += $(CUDA_PATH)/targets/armv7-linux-androideabi/lib
+flexExtCUDA_release_lpaths    += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/lib
+flexExtCUDA_release_lpaths    += ./../../../lib/android
+flexExtCUDA_release_lpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/libs/armeabi-v7a
 flexExtCUDA_release_lpaths    += ./../../../lib/android
-flexExtCUDA_release_lpaths    += $(NDK_ROOT)/$(NDK_VERSION)/sources/cxx-stl/stlport/libs/armeabi-v7a
 flexExtCUDA_release_defines   := $(flexExtCUDA_custom_defines)
 flexExtCUDA_release_defines   += android
 flexExtCUDA_release_defines   += ANDROID=1
 flexExtCUDA_release_defines   += ANDROID_PLAT=1
 flexExtCUDA_release_defines   += DISABLE_IMPORTGL
 flexExtCUDA_release_libraries := 
+flexExtCUDA_release_libraries += NvFlexReleaseCUDA_armv7l
 flexExtCUDA_release_libraries += ./../../../lib/android/libNvFlexRelease_armv7l.a
 flexExtCUDA_release_common_cflags	:= $(flexExtCUDA_custom_cflags)
 flexExtCUDA_release_common_cflags    += -MMD
 flexExtCUDA_release_common_cflags    += $(addprefix -D, $(flexExtCUDA_release_defines))
 flexExtCUDA_release_common_cflags    += $(addprefix -I, $(flexExtCUDA_release_hpaths))
-flexExtCUDA_release_common_cflags  += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions
-flexExtCUDA_release_common_cflags  += -O3 -ffast-math
 flexExtCUDA_release_cflags	:= $(flexExtCUDA_release_common_cflags)
+flexExtCUDA_release_cflags  += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions
+flexExtCUDA_release_cflags  += -O3 -ffast-math
 flexExtCUDA_release_cppflags	:= $(flexExtCUDA_release_common_cflags)
+flexExtCUDA_release_cppflags  += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions
+flexExtCUDA_release_cppflags  += -O3 -ffast-math
 flexExtCUDA_release_lflags    := $(flexExtCUDA_custom_lflags)
 flexExtCUDA_release_lflags    += $(addprefix -L, $(flexExtCUDA_release_lpaths))
 flexExtCUDA_release_lflags    += -Wl,--start-group $(addprefix -l, $(flexExtCUDA_release_libraries)) -Wl,--end-group
@@ -68,15 +72,15 @@ postbuild_flexExtCUDA_release: mainbuild_flexExtCUDA_release
 mainbuild_flexExtCUDA_release: prebuild_flexExtCUDA_release $(flexExtCUDA_release_bin)
 prebuild_flexExtCUDA_release:
 
-$(flexExtCUDA_release_bin): $(flexExtCUDA_release_obj) 
+$(flexExtCUDA_release_bin): $(flexExtCUDA_release_obj) build_flexCUDA_release 
 	mkdir -p `dirname ./../../../lib/android/libflexExt_cuda_release_armv7l.a`
 	@$(AR) rcs $(flexExtCUDA_release_bin) $(flexExtCUDA_release_obj)
 	$(ECHO) building $@ complete!
 
 $(flexExtCUDA_release_cuda_extensions_cuda_flexExt_cu_o): $(flexExtCUDA_cuda_extensions_cuda_flexExt_cu) 
 	@mkdir -p `dirname $(OBJS_DIR)/flexExtCUDA_release/cuda/extensions/cudaflexExt.o`
-	$(ECHO) "$(CUDA_PATH)/bin/nvcc" -ccbin $(NDK_ROOT)/$(NDK_VERSION)/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"$(CUDA_PATH)/targets/armv7-linux-androideabi/include" -I"../../.." -I"$(NDK_ROOT)/$(NDK_VERSION)/sources/cxx-stl/stlport/stlport" -I"$(NDK_ROOT)/$(NDK_VERSION)/platforms/android-15/arch-arm/usr/include"  --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_release/cuda/extensions/cudaflexExt.o"
-	"$(CUDA_PATH)/bin/nvcc" -ccbin $(NDK_ROOT)/$(NDK_VERSION)/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"$(CUDA_PATH)/targets/armv7-linux-androideabi/include" -I"../../.." -I"$(NDK_ROOT)/$(NDK_VERSION)/sources/cxx-stl/stlport/stlport" -I"$(NDK_ROOT)/$(NDK_VERSION)/platforms/android-15/arch-arm/usr/include"  --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_release/cuda/extensions/cudaflexExt.o"
+	$(ECHO) "../../../../../../external/CUDA/cuda-6.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include"  --compile "../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_release/cuda/extensions/cudaflexExt.o"
+	"../../../../../../external/CUDA/cuda-6.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include"  --compile "../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_release/cuda/extensions/cudaflexExt.o"
 
 flexExtCUDA_release_DEPDIR = $(dir $(@))/$(*F)
 $(flexExtCUDA_release_cpp_o): $(flexExtCUDA_release_objsdir)/%.o:
@@ -111,28 +115,32 @@ $(flexExtCUDA_release_c_o): $(flexExtCUDA_release_objsdir)/%.o:
 
 flexExtCUDA_debug_hpaths    := 
 flexExtCUDA_debug_hpaths    += ./../../..
-flexExtCUDA_debug_hpaths    += $(NDK_ROOT)/$(NDK_VERSION)/platforms/android-15/arch-arm/usr/include
-flexExtCUDA_debug_hpaths    += $(NDK_ROOT)/$(NDK_VERSION)/sources/cxx-stl/stlport/stlport
-flexExtCUDA_debug_hpaths    += $(CUDA_PATH)/targets/armv7-linux-androideabi/include
+flexExtCUDA_debug_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include
+flexExtCUDA_debug_hpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport
+flexExtCUDA_debug_hpaths    += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include
 flexExtCUDA_debug_lpaths    := 
-flexExtCUDA_debug_lpaths    += $(CUDA_PATH)/targets/armv7-linux-androideabi/lib
+flexExtCUDA_debug_lpaths    += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/lib
+flexExtCUDA_debug_lpaths    += ./../../../lib/android
+flexExtCUDA_debug_lpaths    += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/libs/armeabi-v7a
 flexExtCUDA_debug_lpaths    += ./../../../lib/android
-flexExtCUDA_debug_lpaths    += $(NDK_ROOT)/$(NDK_VERSION)/sources/cxx-stl/stlport/libs/armeabi-v7a
 flexExtCUDA_debug_defines   := $(flexExtCUDA_custom_defines)
 flexExtCUDA_debug_defines   += android
 flexExtCUDA_debug_defines   += ANDROID=1
 flexExtCUDA_debug_defines   += ANDROID_PLAT=1
 flexExtCUDA_debug_defines   += DISABLE_IMPORTGL
 flexExtCUDA_debug_libraries := 
+flexExtCUDA_debug_libraries += NvFlexDebugCUDA_armv7l
 flexExtCUDA_debug_libraries += ./../../../lib/android/libNvFlexDebug_armv7l.a
 flexExtCUDA_debug_common_cflags	:= $(flexExtCUDA_custom_cflags)
 flexExtCUDA_debug_common_cflags    += -MMD
 flexExtCUDA_debug_common_cflags    += $(addprefix -D, $(flexExtCUDA_debug_defines))
 flexExtCUDA_debug_common_cflags    += $(addprefix -I, $(flexExtCUDA_debug_hpaths))
-flexExtCUDA_debug_common_cflags  += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions
-flexExtCUDA_debug_common_cflags  += -g -O0
 flexExtCUDA_debug_cflags	:= $(flexExtCUDA_debug_common_cflags)
+flexExtCUDA_debug_cflags  += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions
+flexExtCUDA_debug_cflags  += -g -O0
 flexExtCUDA_debug_cppflags	:= $(flexExtCUDA_debug_common_cflags)
+flexExtCUDA_debug_cppflags  += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions
+flexExtCUDA_debug_cppflags  += -g -O0
 flexExtCUDA_debug_lflags    := $(flexExtCUDA_custom_lflags)
 flexExtCUDA_debug_lflags    += $(addprefix -L, $(flexExtCUDA_debug_lpaths))
 flexExtCUDA_debug_lflags    += -Wl,--start-group $(addprefix -l, $(flexExtCUDA_debug_libraries)) -Wl,--end-group
@@ -155,15 +163,15 @@ postbuild_flexExtCUDA_debug: mainbuild_flexExtCUDA_debug
 mainbuild_flexExtCUDA_debug: prebuild_flexExtCUDA_debug $(flexExtCUDA_debug_bin)
 prebuild_flexExtCUDA_debug:
 
-$(flexExtCUDA_debug_bin): $(flexExtCUDA_debug_obj) 
+$(flexExtCUDA_debug_bin): $(flexExtCUDA_debug_obj) build_flexCUDA_debug 
 	mkdir -p `dirname ./../../../lib/android/libflexExt_cuda_debug_armv7l.a`
 	@$(AR) rcs $(flexExtCUDA_debug_bin) $(flexExtCUDA_debug_obj)
 	$(ECHO) building $@ complete!
 
 $(flexExtCUDA_debug_cuda_extensions_cuda_flexExt_cu_o): $(flexExtCUDA_cuda_extensions_cuda_flexExt_cu) 
 	@mkdir -p `dirname $(OBJS_DIR)/flexExtCUDA_debug/cuda/extensions/cudaflexExt.o`
-	$(ECHO) "$(CUDA_PATH)/bin/nvcc" -ccbin $(NDK_ROOT)/$(NDK_VERSION)/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"$(CUDA_PATH)/targets/armv7-linux-androideabi/include" -I"../../.." -I"$(NDK_ROOT)/$(NDK_VERSION)/sources/cxx-stl/stlport/stlport" -I"$(NDK_ROOT)/$(NDK_VERSION)/platforms/android-15/arch-arm/usr/include"  --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_debug/cuda/extensions/cudaflexExt.o"
-	"$(CUDA_PATH)/bin/nvcc" -ccbin $(NDK_ROOT)/$(NDK_VERSION)/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"$(CUDA_PATH)/targets/armv7-linux-androideabi/include" -I"../../.." -I"$(NDK_ROOT)/$(NDK_VERSION)/sources/cxx-stl/stlport/stlport" -I"$(NDK_ROOT)/$(NDK_VERSION)/platforms/android-15/arch-arm/usr/include"  --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_debug/cuda/extensions/cudaflexExt.o"
+	$(ECHO) "../../../../../../external/CUDA/cuda-6.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include"  --compile "../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_debug/cuda/extensions/cudaflexExt.o"
+	"../../../../../../external/CUDA/cuda-6.0-linux/bin/nvcc" -ccbin /home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++ -target-cpu-arch=ARM -m32 -arch=sm_32 -O3 -Xptxas -dlcm=ca -target-os-variant=Android -I"../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include" -I"../../.." -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport" -I"/home/mmacklin/swhost/devrel/libdev/flex/dev/main/../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include"  --compile "../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_debug/cuda/extensions/cudaflexExt.o"
 
 flexExtCUDA_debug_DEPDIR = $(dir $(@))/$(*F)
 $(flexExtCUDA_debug_cpp_o): $(flexExtCUDA_debug_objsdir)/%.o:
diff --git a/demo/compiler/makelinux64/Makefile.flexDemoCUDA.mk b/demo/compiler/makelinux64/Makefile.flexDemoCUDA.mk
index 152205d..f37fc83 100644
--- a/demo/compiler/makelinux64/Makefile.flexDemoCUDA.mk
+++ b/demo/compiler/makelinux64/Makefile.flexDemoCUDA.mk
@@ -54,7 +54,7 @@ flexDemoCUDA_release_cppflags	:= $(flexDemoCUDA_release_common_cflags)
 flexDemoCUDA_release_lflags    := $(flexDemoCUDA_custom_lflags)
 flexDemoCUDA_release_lflags    += $(addprefix -L, $(flexDemoCUDA_release_lpaths))
 flexDemoCUDA_release_lflags    += -Wl,--start-group $(addprefix -l, $(flexDemoCUDA_release_libraries)) -Wl,--end-group
-flexDemoCUDA_release_lflags  += -g -L../../../external/glew/lib/linux -L/usr/lib -L"../../../lib/linux64" -L../../../external/SDL2-2.0.4/lib/x64/ -L$(CUDA_PATH)/lib64 -lGL -lglut -lGLU -lGLEW -lcudart_static -ldl
+flexDemoCUDA_release_lflags  += -g -L../../../external/glew/lib/linux -L/usr/lib -L"../../../lib/linux64" -L../../../external/SDL2-2.0.4/lib/x64/ -L$(CUDA_PATH)/lib64 -lGL -lglut -lGLU -lGLEW -lcudart_static -ldl -lrt -pthread
 flexDemoCUDA_release_lflags  += -m64
 flexDemoCUDA_release_objsdir  = $(OBJS_DIR)/flexDemoCUDA_release
 flexDemoCUDA_release_cpp_o    = $(addprefix $(flexDemoCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexDemoCUDA_cppfiles)))))
@@ -136,7 +136,7 @@ flexDemoCUDA_debug_cppflags	:= $(flexDemoCUDA_debug_common_cflags)
 flexDemoCUDA_debug_lflags    := $(flexDemoCUDA_custom_lflags)
 flexDemoCUDA_debug_lflags    += $(addprefix -L, $(flexDemoCUDA_debug_lpaths))
 flexDemoCUDA_debug_lflags    += -Wl,--start-group $(addprefix -l, $(flexDemoCUDA_debug_libraries)) -Wl,--end-group
-flexDemoCUDA_debug_lflags  += -g -L../../../external/glew/lib/linux -L/usr/lib -L"../../../lib/linux64" -L../../../external/SDL2-2.0.4/lib/x64/ -L$(CUDA_PATH)/lib64 -lGL -lglut -lGLU -lGLEW -lcudart_static -ldl
+flexDemoCUDA_debug_lflags  += -g -L../../../external/glew/lib/linux -L/usr/lib -L"../../../lib/linux64" -L../../../external/SDL2-2.0.4/lib/x64/ -L$(CUDA_PATH)/lib64 -lGL -lglut -lGLU -lGLEW -lcudart_static -ldl -lrt -pthread
 flexDemoCUDA_debug_lflags  += -m64
 flexDemoCUDA_debug_objsdir  = $(OBJS_DIR)/flexDemoCUDA_debug
 flexDemoCUDA_debug_cpp_o    = $(addprefix $(flexDemoCUDA_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexDemoCUDA_cppfiles)))))
diff --git a/demo/compiler/vc12win32/flexDemoCUDA.vcxproj b/demo/compiler/vc12win32/flexDemoCUDA.vcxproj
index 5073547..aa6f0ae 100644
--- a/demo/compiler/vc12win32/flexDemoCUDA.vcxproj
+++ b/demo/compiler/vc12win32/flexDemoCUDA.vcxproj
@@ -55,7 +55,7 @@
 			<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/glew/lib/win32/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<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>
 			<OutputFile>$(OutDir)NvFlexDemoDebugCUDA_x86.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoDebugCUDA_x86.exe.pdb</ProgramDatabaseFile>
@@ -95,7 +95,7 @@
 			<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/glew/lib/win32/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<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>
 			<OutputFile>$(OutDir)NvFlexDemoReleaseCUDA_x86.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoReleaseCUDA_x86.exe.pdb</ProgramDatabaseFile>
@@ -184,8 +184,6 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\plasticbody.h">
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\plasticstack.h">
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\player.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\potpourri.h">
@@ -206,6 +204,8 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\sdfcollision.h">
 		</ClInclude>
+		<ClInclude Include="..\..\scenes\shapechannels.h">
+		</ClInclude>
 		<ClInclude Include="..\..\scenes\shapecollision.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\softbody.h">
diff --git a/demo/compiler/vc12win32/flexDemoCUDA.vcxproj.filters b/demo/compiler/vc12win32/flexDemoCUDA.vcxproj.filters
index 45f6d6c..e5989dc 100644
--- a/demo/compiler/vc12win32/flexDemoCUDA.vcxproj.filters
+++ b/demo/compiler/vc12win32/flexDemoCUDA.vcxproj.filters
@@ -111,9 +111,6 @@
 		<ClInclude Include="..\..\scenes\plasticbody.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\plasticstack.h">
-			<Filter>demo\scenes</Filter>
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\player.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
@@ -144,6 +141,9 @@
 		<ClInclude Include="..\..\scenes\sdfcollision.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
+		<ClInclude Include="..\..\scenes\shapechannels.h">
+			<Filter>demo\scenes</Filter>
+		</ClInclude>
 		<ClInclude Include="..\..\scenes\shapecollision.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
diff --git a/demo/compiler/vc12win32/flexDemoD3D.vcxproj b/demo/compiler/vc12win32/flexDemoD3D.vcxproj
index 4708dba..264f9d9 100644
--- a/demo/compiler/vc12win32/flexDemoD3D.vcxproj
+++ b/demo/compiler/vc12win32/flexDemoD3D.vcxproj
@@ -47,15 +47,15 @@
 			<FloatingPointModel>Precise</FloatingPointModel>
 			<AdditionalOptions> /d2Zi+</AdditionalOptions>
 			<Optimization>Disabled</Optimization>
-			<AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../..;./../..;./../../d3d11;./../../../external/SDL2-2.0.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-			<PreprocessorDefinitions>_CONSOLE;WIN32;_CRT_SECURE_NO_WARNINGS;FLEX_DX;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;FLEX_DIRECT_COMPUTE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<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;FLEX_DX;FLEX_DX12;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;FLEX_DIRECT_COMPUTE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<WarningLevel>Level3</WarningLevel>
 			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 			<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;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../lib/win32/NvFlexDebugD3D_x86.lib;./../../../lib/win32/NvFlexExtDebugD3D_x86.lib;./../../../external/glew/lib/win32/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<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>
 			<OutputFile>$(OutDir)NvFlexDemoDebugD3D_x86.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoDebugD3D_x86.exe.pdb</ProgramDatabaseFile>
@@ -86,15 +86,15 @@
 			<FloatingPointModel>Fast</FloatingPointModel>
 			<AdditionalOptions> /d2Zi+</AdditionalOptions>
 			<Optimization>Full</Optimization>
-			<AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../..;./../..;./../../d3d11;./../../../external/SDL2-2.0.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-			<PreprocessorDefinitions>_CONSOLE;WIN32;_CRT_SECURE_NO_WARNINGS;FLEX_DX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<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;FLEX_DX;FLEX_DX12;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<WarningLevel>Level3</WarningLevel>
 			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 			<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;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../lib/win32/NvFlexReleaseD3D_x86.lib;./../../../lib/win32/NvFlexExtReleaseD3D_x86.lib;./../../../external/glew/lib/win32/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<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>
 			<OutputFile>$(OutDir)NvFlexDemoReleaseD3D_x86.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoReleaseD3D_x86.exe.pdb</ProgramDatabaseFile>
@@ -183,8 +183,6 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\plasticbody.h">
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\plasticstack.h">
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\player.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\potpourri.h">
@@ -205,6 +203,8 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\sdfcollision.h">
 		</ClInclude>
+		<ClInclude Include="..\..\scenes\shapechannels.h">
+		</ClInclude>
 		<ClInclude Include="..\..\scenes\shapecollision.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\softbody.h">
@@ -325,56 +325,200 @@
 		</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\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\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>
 		<ClInclude Include="..\..\d3d11\appD3D11Ctx.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\debugLineRender.h">
+		<ClInclude Include="..\..\d3d11\debugLineRenderD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\diffuseRender.h">
+		<ClInclude Include="..\..\d3d11\demoContextD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\fluidRender.h">
+		<ClInclude Include="..\..\d3d11\diffuseRenderD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\imguiGraph.h">
+		<ClInclude Include="..\..\d3d11\fluidRenderD3D11.h">
 		</ClInclude>
 		<ClInclude Include="..\..\d3d11\imguiGraphD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\meshRender.h">
+		<ClInclude Include="..\..\d3d11\meshRenderD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\pointRender.h">
+		<ClInclude Include="..\..\d3d11\pointRenderD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\renderTarget.h">
+		<ClInclude Include="..\..\d3d11\renderTargetD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\shadowMap.h">
+		<ClInclude Include="..\..\d3d11\shadowMapD3D11.h">
 		</ClInclude>
 		<ClCompile Include="..\..\d3d11\appD3D11Ctx.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\diffuseRender.cpp">
+		<ClCompile Include="..\..\d3d11\debugLineRenderD3D11.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\fluidRender.cpp">
+		<ClCompile Include="..\..\d3d11\demoContextD3D11.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\imguiGraph.cpp">
+		<ClCompile Include="..\..\d3d11\diffuseRenderD3D11.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d11\fluidRenderD3D11.cpp">
 		</ClCompile>
 		<ClCompile Include="..\..\d3d11\imguiGraphD3D11.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\meshRender.cpp">
+		<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>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\d3d\appGraphCtx.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d\demoContext.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>
+		<ClInclude Include="..\..\d3d\shadersDemoContext.h">
+		</ClInclude>
+		<ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\pointRender.cpp">
+		<ClCompile Include="..\..\d3d\imguiGraph.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\renderTarget.cpp">
+		<ClCompile Include="..\..\d3d\imguiGraphLoader.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\shadersD3D11.cpp">
+		<ClCompile Include="..\..\d3d\loader.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\shadowMap.cpp">
+		<ClCompile Include="..\..\d3d\renderParamsD3D.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d\shadersDemoContext.cpp">
 		</ClCompile>
 	</ItemGroup>
 	<ItemGroup>
-		<FxCompile Include="./../../d3d11/shaders/debugLineVS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -382,17 +526,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/debugLinePS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -400,17 +544,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/imguiPS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -418,17 +562,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/imguiVS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -436,17 +580,35 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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="./../../d3d11/shaders/meshPS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -454,17 +616,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshShadowPS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -472,17 +634,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshVS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -490,17 +652,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointVS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -508,17 +670,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointGS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -526,17 +688,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointPS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -544,17 +706,35 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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="./../../d3d11/shaders/diffuseVS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -562,17 +742,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffuseGS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -580,17 +760,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffusePS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -598,17 +778,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthVS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -616,17 +796,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthGS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -634,17 +814,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthPS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -652,17 +832,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/passThroughVS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -670,17 +850,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/blurDepthPS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -688,17 +868,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/compositePS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -706,7 +886,7 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
 	</ItemGroup>
diff --git a/demo/compiler/vc12win32/flexDemoD3D.vcxproj.filters b/demo/compiler/vc12win32/flexDemoD3D.vcxproj.filters
index 15615f5..b7f0548 100644
--- a/demo/compiler/vc12win32/flexDemoD3D.vcxproj.filters
+++ b/demo/compiler/vc12win32/flexDemoD3D.vcxproj.filters
@@ -111,9 +111,6 @@
 		<ClInclude Include="..\..\scenes\plasticbody.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\plasticstack.h">
-			<Filter>demo\scenes</Filter>
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\player.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
@@ -144,6 +141,9 @@
 		<ClInclude Include="..\..\scenes\sdfcollision.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
+		<ClInclude Include="..\..\scenes\shapechannels.h">
+			<Filter>demo\scenes</Filter>
+		</ClInclude>
 		<ClInclude Include="..\..\scenes\shapecollision.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
@@ -328,6 +328,177 @@
 		</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\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\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="d3d11">
 		</Filter>
 	</ItemGroup>
@@ -335,121 +506,178 @@
 		<ClInclude Include="..\..\d3d11\appD3D11Ctx.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\debugLineRender.h">
+		<ClInclude Include="..\..\d3d11\debugLineRenderD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\diffuseRender.h">
+		<ClInclude Include="..\..\d3d11\demoContextD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\fluidRender.h">
+		<ClInclude Include="..\..\d3d11\diffuseRenderD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\imguiGraph.h">
+		<ClInclude Include="..\..\d3d11\fluidRenderD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
 		<ClInclude Include="..\..\d3d11\imguiGraphD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\meshRender.h">
+		<ClInclude Include="..\..\d3d11\meshRenderD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\pointRender.h">
+		<ClInclude Include="..\..\d3d11\pointRenderD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\renderTarget.h">
+		<ClInclude Include="..\..\d3d11\renderTargetD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\shadowMap.h">
+		<ClInclude Include="..\..\d3d11\shadowMapD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
 		<ClCompile Include="..\..\d3d11\appD3D11Ctx.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\diffuseRender.cpp">
+		<ClCompile Include="..\..\d3d11\debugLineRenderD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\fluidRender.cpp">
+		<ClCompile Include="..\..\d3d11\demoContextD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\imguiGraph.cpp">
+		<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\meshRender.cpp">
+		<ClCompile Include="..\..\d3d11\imguiInteropD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\pointRender.cpp">
+		<ClCompile Include="..\..\d3d11\meshRenderD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\renderTarget.cpp">
+		<ClCompile Include="..\..\d3d11\pointRenderD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\shadersD3D11.cpp">
+		<ClCompile Include="..\..\d3d11\renderTargetD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\shadowMap.cpp">
+		<ClCompile Include="..\..\d3d11\shadowMapD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
 	</ItemGroup>
+	<ItemGroup>
+		<Filter Include="d3d">
+		</Filter>
+	</ItemGroup>
+	<ItemGroup>
+		<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>
+		<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>
+		<ClInclude Include="..\..\d3d\shadersDemoContext.h">
+			<Filter>d3d</Filter>
+		</ClInclude>
+		<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>
+		<ClCompile Include="..\..\d3d\shadersDemoContext.cpp">
+			<Filter>d3d</Filter>
+		</ClCompile>
+	</ItemGroup>
 	<ItemGroup><Filter Include="Shader Files"></Filter></ItemGroup>
 	<ItemGroup>
-		<FxCompile Include="./../../d3d11/shaders/debugLineVS.hlsl">
+		<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="./../../d3d11/shaders/debugLinePS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/imguiVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/imguiPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/imguiVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshAsyncComputeBenchPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshShadowPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshShadowPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointGS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointGS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointShadowPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffuseVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/diffuseVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffuseGS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/diffuseGS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffusePS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/diffusePS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthGS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthGS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/passThroughVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/passThroughVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/blurDepthPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/blurDepthPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/compositePS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/compositePS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
 	</ItemGroup>
diff --git a/demo/compiler/vc12win64/flexDemoCUDA.vcxproj b/demo/compiler/vc12win64/flexDemoCUDA.vcxproj
index d00d61c..e37c7e7 100644
--- a/demo/compiler/vc12win64/flexDemoCUDA.vcxproj
+++ b/demo/compiler/vc12win64/flexDemoCUDA.vcxproj
@@ -55,7 +55,7 @@
 			<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/win64/NvFlexDebugCUDA_x64.lib;./../../../lib/win64/NvFlexExtDebugCUDA_x64.lib;./../../../lib/win64/NvFlexDeviceDebug_x64.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2main.lib;./../../../external/glew/lib/x64/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<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/win64/NvFlexDebugCUDA_x64.lib;./../../../lib/win64/NvFlexExtDebugCUDA_x64.lib;./../../../lib/win64/NvFlexDeviceDebug_x64.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2main.lib;./../../../external/NvToolsExt/lib/x64/nvToolsExt64_1.lib;./../../../external/glew/lib/x64/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexDemoDebugCUDA_x64.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoDebugCUDA_x64.exe.pdb</ProgramDatabaseFile>
@@ -95,7 +95,7 @@
 			<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/win64/NvFlexReleaseCUDA_x64.lib;./../../../lib/win64/NvFlexExtReleaseCUDA_x64.lib;./../../../lib/win64/NvFlexDeviceRelease_x64.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2main.lib;./../../../external/glew/lib/x64/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<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/win64/NvFlexReleaseCUDA_x64.lib;./../../../lib/win64/NvFlexExtReleaseCUDA_x64.lib;./../../../lib/win64/NvFlexDeviceRelease_x64.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2main.lib;./../../../external/NvToolsExt/lib/x64/nvToolsExt64_1.lib;./../../../external/glew/lib/x64/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexDemoReleaseCUDA_x64.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoReleaseCUDA_x64.exe.pdb</ProgramDatabaseFile>
@@ -184,8 +184,6 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\plasticbody.h">
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\plasticstack.h">
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\player.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\potpourri.h">
@@ -206,6 +204,8 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\sdfcollision.h">
 		</ClInclude>
+		<ClInclude Include="..\..\scenes\shapechannels.h">
+		</ClInclude>
 		<ClInclude Include="..\..\scenes\shapecollision.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\softbody.h">
diff --git a/demo/compiler/vc12win64/flexDemoCUDA.vcxproj.filters b/demo/compiler/vc12win64/flexDemoCUDA.vcxproj.filters
index 45f6d6c..e5989dc 100644
--- a/demo/compiler/vc12win64/flexDemoCUDA.vcxproj.filters
+++ b/demo/compiler/vc12win64/flexDemoCUDA.vcxproj.filters
@@ -111,9 +111,6 @@
 		<ClInclude Include="..\..\scenes\plasticbody.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\plasticstack.h">
-			<Filter>demo\scenes</Filter>
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\player.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
@@ -144,6 +141,9 @@
 		<ClInclude Include="..\..\scenes\sdfcollision.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
+		<ClInclude Include="..\..\scenes\shapechannels.h">
+			<Filter>demo\scenes</Filter>
+		</ClInclude>
 		<ClInclude Include="..\..\scenes\shapecollision.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
diff --git a/demo/compiler/vc12win64/flexDemoD3D.vcxproj b/demo/compiler/vc12win64/flexDemoD3D.vcxproj
index 50513db..d30d642 100644
--- a/demo/compiler/vc12win64/flexDemoD3D.vcxproj
+++ b/demo/compiler/vc12win64/flexDemoD3D.vcxproj
@@ -47,15 +47,15 @@
 			<FloatingPointModel>Precise</FloatingPointModel>
 			<AdditionalOptions> /d2Zi+</AdditionalOptions>
 			<Optimization>Disabled</Optimization>
-			<AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../..;./../..;./../../d3d11;./../../../external/SDL2-2.0.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-			<PreprocessorDefinitions>_CONSOLE;WIN32;_CRT_SECURE_NO_WARNINGS;FLEX_DX;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<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;FLEX_DX;FLEX_DX12;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<WarningLevel>Level3</WarningLevel>
 			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 			<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;./../../../external/SDL2-2.0.4/lib/x64/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2main.lib;./../../../lib/win64/NvFlexDebugD3D_x64.lib;./../../../lib/win64/NvFlexExtDebugD3D_x64.lib;./../../../external/glew/lib/x64/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<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/x64/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2main.lib;./../../../external/NvToolsExt/lib/x64/nvToolsExt64_1.lib;./../../../external/D3D12/libs/x64/d3d12.lib;./../../../lib/win64/NvFlexDebugD3D_x64.lib;./../../../lib/win64/NvFlexExtDebugD3D_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexDemoDebugD3D_x64.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoDebugD3D_x64.exe.pdb</ProgramDatabaseFile>
@@ -86,15 +86,15 @@
 			<FloatingPointModel>Fast</FloatingPointModel>
 			<AdditionalOptions> /d2Zi+</AdditionalOptions>
 			<Optimization>Full</Optimization>
-			<AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../..;./../..;./../../d3d11;./../../../external/SDL2-2.0.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-			<PreprocessorDefinitions>_CONSOLE;WIN32;_CRT_SECURE_NO_WARNINGS;FLEX_DX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<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;FLEX_DX;FLEX_DX12;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<WarningLevel>Level3</WarningLevel>
 			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 			<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;./../../../external/SDL2-2.0.4/lib/x64/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2main.lib;./../../../lib/win64/NvFlexReleaseD3D_x64.lib;./../../../lib/win64/NvFlexExtReleaseD3D_x64.lib;./../../../external/glew/lib/x64/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<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/x64/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2main.lib;./../../../external/NvToolsExt/lib/x64/nvToolsExt64_1.lib;./../../../external/D3D12/libs/x64/d3d12.lib;./../../../lib/win64/NvFlexReleaseD3D_x64.lib;./../../../lib/win64/NvFlexExtReleaseD3D_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexDemoReleaseD3D_x64.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoReleaseD3D_x64.exe.pdb</ProgramDatabaseFile>
@@ -183,8 +183,6 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\plasticbody.h">
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\plasticstack.h">
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\player.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\potpourri.h">
@@ -205,6 +203,8 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\sdfcollision.h">
 		</ClInclude>
+		<ClInclude Include="..\..\scenes\shapechannels.h">
+		</ClInclude>
 		<ClInclude Include="..\..\scenes\shapecollision.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\softbody.h">
@@ -325,56 +325,200 @@
 		</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\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\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>
 		<ClInclude Include="..\..\d3d11\appD3D11Ctx.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\debugLineRender.h">
+		<ClInclude Include="..\..\d3d11\debugLineRenderD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\diffuseRender.h">
+		<ClInclude Include="..\..\d3d11\demoContextD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\fluidRender.h">
+		<ClInclude Include="..\..\d3d11\diffuseRenderD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\imguiGraph.h">
+		<ClInclude Include="..\..\d3d11\fluidRenderD3D11.h">
 		</ClInclude>
 		<ClInclude Include="..\..\d3d11\imguiGraphD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\meshRender.h">
+		<ClInclude Include="..\..\d3d11\meshRenderD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\pointRender.h">
+		<ClInclude Include="..\..\d3d11\pointRenderD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\renderTarget.h">
+		<ClInclude Include="..\..\d3d11\renderTargetD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\shadowMap.h">
+		<ClInclude Include="..\..\d3d11\shadowMapD3D11.h">
 		</ClInclude>
 		<ClCompile Include="..\..\d3d11\appD3D11Ctx.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\diffuseRender.cpp">
+		<ClCompile Include="..\..\d3d11\debugLineRenderD3D11.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\fluidRender.cpp">
+		<ClCompile Include="..\..\d3d11\demoContextD3D11.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\imguiGraph.cpp">
+		<ClCompile Include="..\..\d3d11\diffuseRenderD3D11.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d11\fluidRenderD3D11.cpp">
 		</ClCompile>
 		<ClCompile Include="..\..\d3d11\imguiGraphD3D11.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\meshRender.cpp">
+		<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>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\d3d\appGraphCtx.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d\demoContext.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>
+		<ClInclude Include="..\..\d3d\shadersDemoContext.h">
+		</ClInclude>
+		<ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\pointRender.cpp">
+		<ClCompile Include="..\..\d3d\imguiGraph.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\renderTarget.cpp">
+		<ClCompile Include="..\..\d3d\imguiGraphLoader.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\shadersD3D11.cpp">
+		<ClCompile Include="..\..\d3d\loader.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\shadowMap.cpp">
+		<ClCompile Include="..\..\d3d\renderParamsD3D.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d\shadersDemoContext.cpp">
 		</ClCompile>
 	</ItemGroup>
 	<ItemGroup>
-		<FxCompile Include="./../../d3d11/shaders/debugLineVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/debugLineVS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">debugLineVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -382,17 +526,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">debugLineVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/debugLinePS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/debugLinePS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">debugLinePS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -400,17 +544,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">debugLinePS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/imguiPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/imguiPS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">imguiPS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -418,17 +562,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">imguiPS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/imguiVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/imguiVS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">imguiVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -436,17 +580,35 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">imguiVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/meshPS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">meshPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">meshPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshAsyncComputeBenchPS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">meshPS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -454,17 +616,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">meshPS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshShadowPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshShadowPS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">meshPS_Shadow</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -472,17 +634,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">meshPS_Shadow</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshVS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">meshVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -490,17 +652,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">meshVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointVS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">pointVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -508,17 +670,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">pointVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointGS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointGS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Geometry</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">pointGS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Geometry</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -526,17 +688,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">pointGS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointPS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">pointPS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -544,17 +706,35 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">pointPS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/pointShadowPS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">pointShadowPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">pointShadowPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffuseVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/diffuseVS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">diffuseVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -562,17 +742,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">diffuseVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffuseGS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/diffuseGS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Geometry</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">diffuseGS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Geometry</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -580,17 +760,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">diffuseGS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffusePS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/diffusePS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">diffusePS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -598,17 +778,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">diffusePS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthVS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">ellipsoidDepthVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -616,17 +796,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">ellipsoidDepthVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthGS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthGS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Geometry</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">ellipsoidDepthGS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Geometry</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -634,17 +814,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">ellipsoidDepthGS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthPS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">ellipsoidDepthPS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -652,17 +832,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">ellipsoidDepthPS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/passThroughVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/passThroughVS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">passThroughVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -670,17 +850,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">passThroughVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/blurDepthPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/blurDepthPS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">blurDepthPS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -688,17 +868,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">blurDepthPS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/compositePS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/compositePS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">compositePS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -706,7 +886,7 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">compositePS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
 	</ItemGroup>
diff --git a/demo/compiler/vc12win64/flexDemoD3D.vcxproj.filters b/demo/compiler/vc12win64/flexDemoD3D.vcxproj.filters
index 15615f5..b7f0548 100644
--- a/demo/compiler/vc12win64/flexDemoD3D.vcxproj.filters
+++ b/demo/compiler/vc12win64/flexDemoD3D.vcxproj.filters
@@ -111,9 +111,6 @@
 		<ClInclude Include="..\..\scenes\plasticbody.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\plasticstack.h">
-			<Filter>demo\scenes</Filter>
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\player.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
@@ -144,6 +141,9 @@
 		<ClInclude Include="..\..\scenes\sdfcollision.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
+		<ClInclude Include="..\..\scenes\shapechannels.h">
+			<Filter>demo\scenes</Filter>
+		</ClInclude>
 		<ClInclude Include="..\..\scenes\shapecollision.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
@@ -328,6 +328,177 @@
 		</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\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\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="d3d11">
 		</Filter>
 	</ItemGroup>
@@ -335,121 +506,178 @@
 		<ClInclude Include="..\..\d3d11\appD3D11Ctx.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\debugLineRender.h">
+		<ClInclude Include="..\..\d3d11\debugLineRenderD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\diffuseRender.h">
+		<ClInclude Include="..\..\d3d11\demoContextD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\fluidRender.h">
+		<ClInclude Include="..\..\d3d11\diffuseRenderD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\imguiGraph.h">
+		<ClInclude Include="..\..\d3d11\fluidRenderD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
 		<ClInclude Include="..\..\d3d11\imguiGraphD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\meshRender.h">
+		<ClInclude Include="..\..\d3d11\meshRenderD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\pointRender.h">
+		<ClInclude Include="..\..\d3d11\pointRenderD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\renderTarget.h">
+		<ClInclude Include="..\..\d3d11\renderTargetD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\shadowMap.h">
+		<ClInclude Include="..\..\d3d11\shadowMapD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
 		<ClCompile Include="..\..\d3d11\appD3D11Ctx.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\diffuseRender.cpp">
+		<ClCompile Include="..\..\d3d11\debugLineRenderD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\fluidRender.cpp">
+		<ClCompile Include="..\..\d3d11\demoContextD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\imguiGraph.cpp">
+		<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\meshRender.cpp">
+		<ClCompile Include="..\..\d3d11\imguiInteropD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\pointRender.cpp">
+		<ClCompile Include="..\..\d3d11\meshRenderD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\renderTarget.cpp">
+		<ClCompile Include="..\..\d3d11\pointRenderD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\shadersD3D11.cpp">
+		<ClCompile Include="..\..\d3d11\renderTargetD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\shadowMap.cpp">
+		<ClCompile Include="..\..\d3d11\shadowMapD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
 	</ItemGroup>
+	<ItemGroup>
+		<Filter Include="d3d">
+		</Filter>
+	</ItemGroup>
+	<ItemGroup>
+		<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>
+		<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>
+		<ClInclude Include="..\..\d3d\shadersDemoContext.h">
+			<Filter>d3d</Filter>
+		</ClInclude>
+		<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>
+		<ClCompile Include="..\..\d3d\shadersDemoContext.cpp">
+			<Filter>d3d</Filter>
+		</ClCompile>
+	</ItemGroup>
 	<ItemGroup><Filter Include="Shader Files"></Filter></ItemGroup>
 	<ItemGroup>
-		<FxCompile Include="./../../d3d11/shaders/debugLineVS.hlsl">
+		<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="./../../d3d11/shaders/debugLinePS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/imguiVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/imguiPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/imguiVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshAsyncComputeBenchPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshShadowPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshShadowPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointGS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointGS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointShadowPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffuseVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/diffuseVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffuseGS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/diffuseGS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffusePS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/diffusePS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthGS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthGS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/passThroughVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/passThroughVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/blurDepthPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/blurDepthPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/compositePS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/compositePS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
 	</ItemGroup>
diff --git a/demo/compiler/vc14win32/flexDemoCUDA.vcxproj b/demo/compiler/vc14win32/flexDemoCUDA.vcxproj
index d9aca99..984c2e4 100644
--- a/demo/compiler/vc14win32/flexDemoCUDA.vcxproj
+++ b/demo/compiler/vc14win32/flexDemoCUDA.vcxproj
@@ -55,7 +55,7 @@
 			<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/glew/lib/win32/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<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>
 			<OutputFile>$(OutDir)NvFlexDemoDebugCUDA_x86.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoDebugCUDA_x86.exe.pdb</ProgramDatabaseFile>
@@ -95,7 +95,7 @@
 			<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/glew/lib/win32/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<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>
 			<OutputFile>$(OutDir)NvFlexDemoReleaseCUDA_x86.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoReleaseCUDA_x86.exe.pdb</ProgramDatabaseFile>
@@ -184,8 +184,6 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\plasticbody.h">
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\plasticstack.h">
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\player.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\potpourri.h">
@@ -206,6 +204,8 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\sdfcollision.h">
 		</ClInclude>
+		<ClInclude Include="..\..\scenes\shapechannels.h">
+		</ClInclude>
 		<ClInclude Include="..\..\scenes\shapecollision.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\softbody.h">
diff --git a/demo/compiler/vc14win32/flexDemoCUDA.vcxproj.filters b/demo/compiler/vc14win32/flexDemoCUDA.vcxproj.filters
index 45f6d6c..e5989dc 100644
--- a/demo/compiler/vc14win32/flexDemoCUDA.vcxproj.filters
+++ b/demo/compiler/vc14win32/flexDemoCUDA.vcxproj.filters
@@ -111,9 +111,6 @@
 		<ClInclude Include="..\..\scenes\plasticbody.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\plasticstack.h">
-			<Filter>demo\scenes</Filter>
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\player.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
@@ -144,6 +141,9 @@
 		<ClInclude Include="..\..\scenes\sdfcollision.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
+		<ClInclude Include="..\..\scenes\shapechannels.h">
+			<Filter>demo\scenes</Filter>
+		</ClInclude>
 		<ClInclude Include="..\..\scenes\shapecollision.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
diff --git a/demo/compiler/vc14win32/flexDemoD3D.vcxproj b/demo/compiler/vc14win32/flexDemoD3D.vcxproj
index 6744073..a926666 100644
--- a/demo/compiler/vc14win32/flexDemoD3D.vcxproj
+++ b/demo/compiler/vc14win32/flexDemoD3D.vcxproj
@@ -13,6 +13,7 @@
 	<PropertyGroup Label="Globals">
 		<ProjectGuid>{EF4EDDD8-2620-47AA-E75D-4C682C276C02}</ProjectGuid>
 		<RootNamespace>flexDemoD3D</RootNamespace>
+		<WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration">
@@ -47,15 +48,15 @@
 			<FloatingPointModel>Precise</FloatingPointModel>
 			<AdditionalOptions> /d2Zi+</AdditionalOptions>
 			<Optimization>Disabled</Optimization>
-			<AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../..;./../..;./../../d3d11;./../../../external/SDL2-2.0.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-			<PreprocessorDefinitions>_CONSOLE;WIN32;_CRT_SECURE_NO_WARNINGS;FLEX_DX;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;FLEX_DIRECT_COMPUTE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<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;FLEX_DX;FLEX_DX12;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;FLEX_DIRECT_COMPUTE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<WarningLevel>Level3</WarningLevel>
 			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 			<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;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../lib/win32/NvFlexDebugD3D_x86.lib;./../../../lib/win32/NvFlexExtDebugD3D_x86.lib;./../../../external/glew/lib/win32/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<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>
 			<OutputFile>$(OutDir)NvFlexDemoDebugD3D_x86.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoDebugD3D_x86.exe.pdb</ProgramDatabaseFile>
@@ -86,15 +87,15 @@
 			<FloatingPointModel>Fast</FloatingPointModel>
 			<AdditionalOptions> /d2Zi+</AdditionalOptions>
 			<Optimization>Full</Optimization>
-			<AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../..;./../..;./../../d3d11;./../../../external/SDL2-2.0.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-			<PreprocessorDefinitions>_CONSOLE;WIN32;_CRT_SECURE_NO_WARNINGS;FLEX_DX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<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;FLEX_DX;FLEX_DX12;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<WarningLevel>Level3</WarningLevel>
 			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 			<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;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../lib/win32/NvFlexReleaseD3D_x86.lib;./../../../lib/win32/NvFlexExtReleaseD3D_x86.lib;./../../../external/glew/lib/win32/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<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>
 			<OutputFile>$(OutDir)NvFlexDemoReleaseD3D_x86.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoReleaseD3D_x86.exe.pdb</ProgramDatabaseFile>
@@ -183,8 +184,6 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\plasticbody.h">
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\plasticstack.h">
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\player.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\potpourri.h">
@@ -205,6 +204,8 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\sdfcollision.h">
 		</ClInclude>
+		<ClInclude Include="..\..\scenes\shapechannels.h">
+		</ClInclude>
 		<ClInclude Include="..\..\scenes\shapecollision.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\softbody.h">
@@ -325,56 +326,200 @@
 		</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\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\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>
 		<ClInclude Include="..\..\d3d11\appD3D11Ctx.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\debugLineRender.h">
+		<ClInclude Include="..\..\d3d11\debugLineRenderD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\diffuseRender.h">
+		<ClInclude Include="..\..\d3d11\demoContextD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\fluidRender.h">
+		<ClInclude Include="..\..\d3d11\diffuseRenderD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\imguiGraph.h">
+		<ClInclude Include="..\..\d3d11\fluidRenderD3D11.h">
 		</ClInclude>
 		<ClInclude Include="..\..\d3d11\imguiGraphD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\meshRender.h">
+		<ClInclude Include="..\..\d3d11\meshRenderD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\pointRender.h">
+		<ClInclude Include="..\..\d3d11\pointRenderD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\renderTarget.h">
+		<ClInclude Include="..\..\d3d11\renderTargetD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\shadowMap.h">
+		<ClInclude Include="..\..\d3d11\shadowMapD3D11.h">
 		</ClInclude>
 		<ClCompile Include="..\..\d3d11\appD3D11Ctx.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\diffuseRender.cpp">
+		<ClCompile Include="..\..\d3d11\debugLineRenderD3D11.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\fluidRender.cpp">
+		<ClCompile Include="..\..\d3d11\demoContextD3D11.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\imguiGraph.cpp">
+		<ClCompile Include="..\..\d3d11\diffuseRenderD3D11.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d11\fluidRenderD3D11.cpp">
 		</ClCompile>
 		<ClCompile Include="..\..\d3d11\imguiGraphD3D11.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\meshRender.cpp">
+		<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>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\d3d\appGraphCtx.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d\demoContext.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>
+		<ClInclude Include="..\..\d3d\shadersDemoContext.h">
+		</ClInclude>
+		<ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\pointRender.cpp">
+		<ClCompile Include="..\..\d3d\imguiGraph.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\renderTarget.cpp">
+		<ClCompile Include="..\..\d3d\imguiGraphLoader.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\shadersD3D11.cpp">
+		<ClCompile Include="..\..\d3d\loader.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\shadowMap.cpp">
+		<ClCompile Include="..\..\d3d\renderParamsD3D.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d\shadersDemoContext.cpp">
 		</ClCompile>
 	</ItemGroup>
 	<ItemGroup>
-		<FxCompile Include="./../../d3d11/shaders/debugLineVS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -382,17 +527,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/debugLinePS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -400,17 +545,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/imguiPS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -418,17 +563,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/imguiVS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -436,17 +581,35 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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="./../../d3d11/shaders/meshPS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -454,17 +617,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshShadowPS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -472,17 +635,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshVS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -490,17 +653,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointVS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -508,17 +671,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointGS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -526,17 +689,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointPS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -544,17 +707,35 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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="./../../d3d11/shaders/diffuseVS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -562,17 +743,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffuseGS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -580,17 +761,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffusePS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -598,17 +779,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthVS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -616,17 +797,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthGS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -634,17 +815,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthPS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -652,17 +833,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/passThroughVS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -670,17 +851,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/blurDepthPS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -688,17 +869,17 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/compositePS.hlsl">
+		<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<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>
@@ -706,7 +887,7 @@
 			<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/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput>
 		</FxCompile>
 	</ItemGroup>
diff --git a/demo/compiler/vc14win32/flexDemoD3D.vcxproj.filters b/demo/compiler/vc14win32/flexDemoD3D.vcxproj.filters
index 15615f5..b7f0548 100644
--- a/demo/compiler/vc14win32/flexDemoD3D.vcxproj.filters
+++ b/demo/compiler/vc14win32/flexDemoD3D.vcxproj.filters
@@ -111,9 +111,6 @@
 		<ClInclude Include="..\..\scenes\plasticbody.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\plasticstack.h">
-			<Filter>demo\scenes</Filter>
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\player.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
@@ -144,6 +141,9 @@
 		<ClInclude Include="..\..\scenes\sdfcollision.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
+		<ClInclude Include="..\..\scenes\shapechannels.h">
+			<Filter>demo\scenes</Filter>
+		</ClInclude>
 		<ClInclude Include="..\..\scenes\shapecollision.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
@@ -328,6 +328,177 @@
 		</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\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\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="d3d11">
 		</Filter>
 	</ItemGroup>
@@ -335,121 +506,178 @@
 		<ClInclude Include="..\..\d3d11\appD3D11Ctx.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\debugLineRender.h">
+		<ClInclude Include="..\..\d3d11\debugLineRenderD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\diffuseRender.h">
+		<ClInclude Include="..\..\d3d11\demoContextD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\fluidRender.h">
+		<ClInclude Include="..\..\d3d11\diffuseRenderD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\imguiGraph.h">
+		<ClInclude Include="..\..\d3d11\fluidRenderD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
 		<ClInclude Include="..\..\d3d11\imguiGraphD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\meshRender.h">
+		<ClInclude Include="..\..\d3d11\meshRenderD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\pointRender.h">
+		<ClInclude Include="..\..\d3d11\pointRenderD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\renderTarget.h">
+		<ClInclude Include="..\..\d3d11\renderTargetD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\shadowMap.h">
+		<ClInclude Include="..\..\d3d11\shadowMapD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
 		<ClCompile Include="..\..\d3d11\appD3D11Ctx.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\diffuseRender.cpp">
+		<ClCompile Include="..\..\d3d11\debugLineRenderD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\fluidRender.cpp">
+		<ClCompile Include="..\..\d3d11\demoContextD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\imguiGraph.cpp">
+		<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\meshRender.cpp">
+		<ClCompile Include="..\..\d3d11\imguiInteropD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\pointRender.cpp">
+		<ClCompile Include="..\..\d3d11\meshRenderD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\renderTarget.cpp">
+		<ClCompile Include="..\..\d3d11\pointRenderD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\shadersD3D11.cpp">
+		<ClCompile Include="..\..\d3d11\renderTargetD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\shadowMap.cpp">
+		<ClCompile Include="..\..\d3d11\shadowMapD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
 	</ItemGroup>
+	<ItemGroup>
+		<Filter Include="d3d">
+		</Filter>
+	</ItemGroup>
+	<ItemGroup>
+		<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>
+		<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>
+		<ClInclude Include="..\..\d3d\shadersDemoContext.h">
+			<Filter>d3d</Filter>
+		</ClInclude>
+		<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>
+		<ClCompile Include="..\..\d3d\shadersDemoContext.cpp">
+			<Filter>d3d</Filter>
+		</ClCompile>
+	</ItemGroup>
 	<ItemGroup><Filter Include="Shader Files"></Filter></ItemGroup>
 	<ItemGroup>
-		<FxCompile Include="./../../d3d11/shaders/debugLineVS.hlsl">
+		<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="./../../d3d11/shaders/debugLinePS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/imguiVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/imguiPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/imguiVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshAsyncComputeBenchPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshShadowPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshShadowPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointGS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointGS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointShadowPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffuseVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/diffuseVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffuseGS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/diffuseGS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffusePS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/diffusePS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthGS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthGS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/passThroughVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/passThroughVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/blurDepthPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/blurDepthPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/compositePS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/compositePS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
 	</ItemGroup>
diff --git a/demo/compiler/vc14win64/flexDemoCUDA.vcxproj b/demo/compiler/vc14win64/flexDemoCUDA.vcxproj
index 056fb6d..8b4c665 100644
--- a/demo/compiler/vc14win64/flexDemoCUDA.vcxproj
+++ b/demo/compiler/vc14win64/flexDemoCUDA.vcxproj
@@ -55,7 +55,7 @@
 			<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/win64/NvFlexDebugCUDA_x64.lib;./../../../lib/win64/NvFlexExtDebugCUDA_x64.lib;./../../../lib/win64/NvFlexDeviceDebug_x64.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2main.lib;./../../../external/glew/lib/x64/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<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/win64/NvFlexDebugCUDA_x64.lib;./../../../lib/win64/NvFlexExtDebugCUDA_x64.lib;./../../../lib/win64/NvFlexDeviceDebug_x64.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2main.lib;./../../../external/NvToolsExt/lib/x64/nvToolsExt64_1.lib;./../../../external/glew/lib/x64/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexDemoDebugCUDA_x64.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoDebugCUDA_x64.exe.pdb</ProgramDatabaseFile>
@@ -95,7 +95,7 @@
 			<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/win64/NvFlexReleaseCUDA_x64.lib;./../../../lib/win64/NvFlexExtReleaseCUDA_x64.lib;./../../../lib/win64/NvFlexDeviceRelease_x64.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2main.lib;./../../../external/glew/lib/x64/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<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/win64/NvFlexReleaseCUDA_x64.lib;./../../../lib/win64/NvFlexExtReleaseCUDA_x64.lib;./../../../lib/win64/NvFlexDeviceRelease_x64.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2main.lib;./../../../external/NvToolsExt/lib/x64/nvToolsExt64_1.lib;./../../../external/glew/lib/x64/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexDemoReleaseCUDA_x64.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoReleaseCUDA_x64.exe.pdb</ProgramDatabaseFile>
@@ -184,8 +184,6 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\plasticbody.h">
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\plasticstack.h">
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\player.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\potpourri.h">
@@ -206,6 +204,8 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\sdfcollision.h">
 		</ClInclude>
+		<ClInclude Include="..\..\scenes\shapechannels.h">
+		</ClInclude>
 		<ClInclude Include="..\..\scenes\shapecollision.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\softbody.h">
diff --git a/demo/compiler/vc14win64/flexDemoCUDA.vcxproj.filters b/demo/compiler/vc14win64/flexDemoCUDA.vcxproj.filters
index 45f6d6c..e5989dc 100644
--- a/demo/compiler/vc14win64/flexDemoCUDA.vcxproj.filters
+++ b/demo/compiler/vc14win64/flexDemoCUDA.vcxproj.filters
@@ -111,9 +111,6 @@
 		<ClInclude Include="..\..\scenes\plasticbody.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\plasticstack.h">
-			<Filter>demo\scenes</Filter>
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\player.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
@@ -144,6 +141,9 @@
 		<ClInclude Include="..\..\scenes\sdfcollision.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
+		<ClInclude Include="..\..\scenes\shapechannels.h">
+			<Filter>demo\scenes</Filter>
+		</ClInclude>
 		<ClInclude Include="..\..\scenes\shapecollision.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
diff --git a/demo/compiler/vc14win64/flexDemoD3D.vcxproj b/demo/compiler/vc14win64/flexDemoD3D.vcxproj
index 9b3dfae..3fbd922 100644
--- a/demo/compiler/vc14win64/flexDemoD3D.vcxproj
+++ b/demo/compiler/vc14win64/flexDemoD3D.vcxproj
@@ -13,6 +13,7 @@
 	<PropertyGroup Label="Globals">
 		<ProjectGuid>{EF4EDDD8-2620-47AA-E75D-4C682C276C02}</ProjectGuid>
 		<RootNamespace>flexDemoD3D</RootNamespace>
+		<WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
 	</PropertyGroup>
 	<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'" Label="Configuration">
@@ -47,15 +48,15 @@
 			<FloatingPointModel>Precise</FloatingPointModel>
 			<AdditionalOptions> /d2Zi+</AdditionalOptions>
 			<Optimization>Disabled</Optimization>
-			<AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../..;./../..;./../../d3d11;./../../../external/SDL2-2.0.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-			<PreprocessorDefinitions>_CONSOLE;WIN32;_CRT_SECURE_NO_WARNINGS;FLEX_DX;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<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;FLEX_DX;FLEX_DX12;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<WarningLevel>Level3</WarningLevel>
 			<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 			<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;./../../../external/SDL2-2.0.4/lib/x64/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2main.lib;./../../../lib/win64/NvFlexDebugD3D_x64.lib;./../../../lib/win64/NvFlexExtDebugD3D_x64.lib;./../../../external/glew/lib/x64/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<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/x64/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2main.lib;./../../../external/NvToolsExt/lib/x64/nvToolsExt64_1.lib;./../../../external/D3D12/libs/x64/d3d12.lib;./../../../lib/win64/NvFlexDebugD3D_x64.lib;./../../../lib/win64/NvFlexExtDebugD3D_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexDemoDebugD3D_x64.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoDebugD3D_x64.exe.pdb</ProgramDatabaseFile>
@@ -86,15 +87,15 @@
 			<FloatingPointModel>Fast</FloatingPointModel>
 			<AdditionalOptions> /d2Zi+</AdditionalOptions>
 			<Optimization>Full</Optimization>
-			<AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../..;./../..;./../../d3d11;./../../../external/SDL2-2.0.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-			<PreprocessorDefinitions>_CONSOLE;WIN32;_CRT_SECURE_NO_WARNINGS;FLEX_DX;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+			<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;FLEX_DX;FLEX_DX12;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 			<WarningLevel>Level3</WarningLevel>
 			<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 			<PrecompiledHeader>NotUsing</PrecompiledHeader>
 			<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;./../../../external/SDL2-2.0.4/lib/x64/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2main.lib;./../../../lib/win64/NvFlexReleaseD3D_x64.lib;./../../../lib/win64/NvFlexExtReleaseD3D_x64.lib;./../../../external/glew/lib/x64/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+			<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/x64/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x64/SDL2main.lib;./../../../external/NvToolsExt/lib/x64/nvToolsExt64_1.lib;./../../../external/D3D12/libs/x64/d3d12.lib;./../../../lib/win64/NvFlexReleaseD3D_x64.lib;./../../../lib/win64/NvFlexExtReleaseD3D_x64.lib;%(AdditionalDependencies)</AdditionalDependencies>
 			<OutputFile>$(OutDir)NvFlexDemoReleaseD3D_x64.exe</OutputFile>
 			<AdditionalLibraryDirectories>$(CUDA_PATH)/lib/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 			<ProgramDatabaseFile>$(OutDir)/NvFlexDemoReleaseD3D_x64.exe.pdb</ProgramDatabaseFile>
@@ -183,8 +184,6 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\plasticbody.h">
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\plasticstack.h">
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\player.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\potpourri.h">
@@ -205,6 +204,8 @@
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\sdfcollision.h">
 		</ClInclude>
+		<ClInclude Include="..\..\scenes\shapechannels.h">
+		</ClInclude>
 		<ClInclude Include="..\..\scenes\shapecollision.h">
 		</ClInclude>
 		<ClInclude Include="..\..\scenes\softbody.h">
@@ -325,56 +326,200 @@
 		</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\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\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>
 		<ClInclude Include="..\..\d3d11\appD3D11Ctx.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\debugLineRender.h">
+		<ClInclude Include="..\..\d3d11\debugLineRenderD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\diffuseRender.h">
+		<ClInclude Include="..\..\d3d11\demoContextD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\fluidRender.h">
+		<ClInclude Include="..\..\d3d11\diffuseRenderD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\imguiGraph.h">
+		<ClInclude Include="..\..\d3d11\fluidRenderD3D11.h">
 		</ClInclude>
 		<ClInclude Include="..\..\d3d11\imguiGraphD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\meshRender.h">
+		<ClInclude Include="..\..\d3d11\meshRenderD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\pointRender.h">
+		<ClInclude Include="..\..\d3d11\pointRenderD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\renderTarget.h">
+		<ClInclude Include="..\..\d3d11\renderTargetD3D11.h">
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\shadowMap.h">
+		<ClInclude Include="..\..\d3d11\shadowMapD3D11.h">
 		</ClInclude>
 		<ClCompile Include="..\..\d3d11\appD3D11Ctx.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\diffuseRender.cpp">
+		<ClCompile Include="..\..\d3d11\debugLineRenderD3D11.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\fluidRender.cpp">
+		<ClCompile Include="..\..\d3d11\demoContextD3D11.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\imguiGraph.cpp">
+		<ClCompile Include="..\..\d3d11\diffuseRenderD3D11.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d11\fluidRenderD3D11.cpp">
 		</ClCompile>
 		<ClCompile Include="..\..\d3d11\imguiGraphD3D11.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\meshRender.cpp">
+		<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>
+	</ItemGroup>
+	<ItemGroup>
+		<ClInclude Include="..\..\d3d\appGraphCtx.h">
+		</ClInclude>
+		<ClInclude Include="..\..\d3d\demoContext.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>
+		<ClInclude Include="..\..\d3d\shadersDemoContext.h">
+		</ClInclude>
+		<ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\pointRender.cpp">
+		<ClCompile Include="..\..\d3d\imguiGraph.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\renderTarget.cpp">
+		<ClCompile Include="..\..\d3d\imguiGraphLoader.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\shadersD3D11.cpp">
+		<ClCompile Include="..\..\d3d\loader.cpp">
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\shadowMap.cpp">
+		<ClCompile Include="..\..\d3d\renderParamsD3D.cpp">
+		</ClCompile>
+		<ClCompile Include="..\..\d3d\shadersDemoContext.cpp">
 		</ClCompile>
 	</ItemGroup>
 	<ItemGroup>
-		<FxCompile Include="./../../d3d11/shaders/debugLineVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/debugLineVS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">debugLineVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -382,17 +527,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">debugLineVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/debugLinePS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/debugLinePS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">debugLinePS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -400,17 +545,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">debugLinePS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/imguiPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/imguiPS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">imguiPS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -418,17 +563,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">imguiPS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/imguiVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/imguiVS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">imguiVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -436,17 +581,35 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">imguiVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/meshPS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">meshPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">meshPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshAsyncComputeBenchPS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">meshPS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -454,17 +617,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">meshPS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshShadowPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshShadowPS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">meshPS_Shadow</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -472,17 +635,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">meshPS_Shadow</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshVS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">meshVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -490,17 +653,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">meshVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointVS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">pointVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -508,17 +671,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">pointVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointGS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointGS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Geometry</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">pointGS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Geometry</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -526,17 +689,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">pointGS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointPS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">pointPS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -544,17 +707,35 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">pointPS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
+		</FxCompile>
+		<FxCompile Include="./../../d3d/shaders/pointShadowPS.hlsl">
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">pointShadowPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
+			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
+			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
+			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation>
+			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
+			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">pointShadowPS</EntryPointName>
+			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffuseVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/diffuseVS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">diffuseVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -562,17 +743,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">diffuseVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffuseGS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/diffuseGS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Geometry</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">diffuseGS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Geometry</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -580,17 +761,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">diffuseGS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffusePS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/diffusePS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">diffusePS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -598,17 +779,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">diffusePS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthVS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">ellipsoidDepthVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -616,17 +797,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">ellipsoidDepthVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthGS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthGS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Geometry</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">ellipsoidDepthGS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Geometry</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -634,17 +815,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">ellipsoidDepthGS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthPS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">ellipsoidDepthPS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -652,17 +833,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">ellipsoidDepthPS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/passThroughVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/passThroughVS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">passThroughVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Vertex</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -670,17 +851,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">passThroughVS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/blurDepthPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/blurDepthPS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">blurDepthPS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -688,17 +869,17 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">blurDepthPS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/compositePS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/compositePS.hlsl">
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|x64'">5.0</ShaderModel>
 			<EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</EnableDebuggingInformation>
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|x64'">compositePS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|x64'"> </ObjectFileOutput>
 			<ShaderType Condition="'$(Configuration)|$(Platform)'=='release|x64'">Pixel</ShaderType>
 			<ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|x64'">5.0</ShaderModel>
@@ -706,7 +887,7 @@
 			<DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</DisableOptimizations>
 			<EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|x64'">compositePS</EntryPointName>
 			<TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</TreatWarningAsError>
-			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d11/shaders/%(Filename).hlsl.h</HeaderFileOutput>
+			<HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput>
 			<ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput>
 		</FxCompile>
 	</ItemGroup>
diff --git a/demo/compiler/vc14win64/flexDemoD3D.vcxproj.filters b/demo/compiler/vc14win64/flexDemoD3D.vcxproj.filters
index 15615f5..b7f0548 100644
--- a/demo/compiler/vc14win64/flexDemoD3D.vcxproj.filters
+++ b/demo/compiler/vc14win64/flexDemoD3D.vcxproj.filters
@@ -111,9 +111,6 @@
 		<ClInclude Include="..\..\scenes\plasticbody.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\scenes\plasticstack.h">
-			<Filter>demo\scenes</Filter>
-		</ClInclude>
 		<ClInclude Include="..\..\scenes\player.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
@@ -144,6 +141,9 @@
 		<ClInclude Include="..\..\scenes\sdfcollision.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
+		<ClInclude Include="..\..\scenes\shapechannels.h">
+			<Filter>demo\scenes</Filter>
+		</ClInclude>
 		<ClInclude Include="..\..\scenes\shapecollision.h">
 			<Filter>demo\scenes</Filter>
 		</ClInclude>
@@ -328,6 +328,177 @@
 		</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\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\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="d3d11">
 		</Filter>
 	</ItemGroup>
@@ -335,121 +506,178 @@
 		<ClInclude Include="..\..\d3d11\appD3D11Ctx.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\debugLineRender.h">
+		<ClInclude Include="..\..\d3d11\debugLineRenderD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\diffuseRender.h">
+		<ClInclude Include="..\..\d3d11\demoContextD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\fluidRender.h">
+		<ClInclude Include="..\..\d3d11\diffuseRenderD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\imguiGraph.h">
+		<ClInclude Include="..\..\d3d11\fluidRenderD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
 		<ClInclude Include="..\..\d3d11\imguiGraphD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\meshRender.h">
+		<ClInclude Include="..\..\d3d11\meshRenderD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\pointRender.h">
+		<ClInclude Include="..\..\d3d11\pointRenderD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\renderTarget.h">
+		<ClInclude Include="..\..\d3d11\renderTargetD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
-		<ClInclude Include="..\..\d3d11\shadowMap.h">
+		<ClInclude Include="..\..\d3d11\shadowMapD3D11.h">
 			<Filter>d3d11</Filter>
 		</ClInclude>
 		<ClCompile Include="..\..\d3d11\appD3D11Ctx.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\diffuseRender.cpp">
+		<ClCompile Include="..\..\d3d11\debugLineRenderD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\fluidRender.cpp">
+		<ClCompile Include="..\..\d3d11\demoContextD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\imguiGraph.cpp">
+		<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\meshRender.cpp">
+		<ClCompile Include="..\..\d3d11\imguiInteropD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\pointRender.cpp">
+		<ClCompile Include="..\..\d3d11\meshRenderD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\renderTarget.cpp">
+		<ClCompile Include="..\..\d3d11\pointRenderD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\shadersD3D11.cpp">
+		<ClCompile Include="..\..\d3d11\renderTargetD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
-		<ClCompile Include="..\..\d3d11\shadowMap.cpp">
+		<ClCompile Include="..\..\d3d11\shadowMapD3D11.cpp">
 			<Filter>d3d11</Filter>
 		</ClCompile>
 	</ItemGroup>
+	<ItemGroup>
+		<Filter Include="d3d">
+		</Filter>
+	</ItemGroup>
+	<ItemGroup>
+		<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>
+		<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>
+		<ClInclude Include="..\..\d3d\shadersDemoContext.h">
+			<Filter>d3d</Filter>
+		</ClInclude>
+		<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>
+		<ClCompile Include="..\..\d3d\shadersDemoContext.cpp">
+			<Filter>d3d</Filter>
+		</ClCompile>
+	</ItemGroup>
 	<ItemGroup><Filter Include="Shader Files"></Filter></ItemGroup>
 	<ItemGroup>
-		<FxCompile Include="./../../d3d11/shaders/debugLineVS.hlsl">
+		<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="./../../d3d11/shaders/debugLinePS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/imguiVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/imguiPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/imguiVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshAsyncComputeBenchPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshShadowPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshShadowPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/meshVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/meshVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointGS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointGS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/pointPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/pointShadowPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffuseVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/diffuseVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffuseGS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/diffuseGS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/diffusePS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/diffusePS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthGS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthGS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/ellipsoidDepthPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/ellipsoidDepthPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/passThroughVS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/passThroughVS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/blurDepthPS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/blurDepthPS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
-		<FxCompile Include="./../../d3d11/shaders/compositePS.hlsl">
+		<FxCompile Include="./../../d3d/shaders/compositePS.hlsl">
 			<Filter>Shader Files</Filter>
 		</FxCompile>
 	</ItemGroup>
diff --git a/demo/compiler/xpj/flexDemoCUDA.xpj b/demo/compiler/xpj/flexDemoCUDA.xpj
index 1257e14..c4b7ab5 100644
--- a/demo/compiler/xpj/flexDemoCUDA.xpj
+++ b/demo/compiler/xpj/flexDemoCUDA.xpj
@@ -74,6 +74,7 @@
 					../../../lib/win32/NvFlexDeviceDebug_x86.lib
 					../../../external/SDL2-2.0.4/lib/x86/SDL2.lib
 					../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib
+					../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib
 					../../../external/glew/lib/win32/glew32.lib
 				</Libraries>
 				<Libraries platforms="Win64">
@@ -82,6 +83,7 @@
 					../../../lib/win64/NvFlexDeviceDebug_x64.lib
 					../../../external/SDL2-2.0.4/lib/x64/SDL2.lib
 					../../../external/SDL2-2.0.4/lib/x64/SDL2main.lib
+					../../../external/NvToolsExt/lib/x64/nvToolsExt64_1.lib
 					../../../external/glew/lib/x64/glew32.lib
 				</Libraries>
 			
@@ -111,6 +113,7 @@
 					../../../lib/win32/NvFlexDeviceRelease_x86.lib
 					../../../external/SDL2-2.0.4/lib/x86/SDL2.lib
 					../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib
+					../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib
 					../../../external/glew/lib/win32/glew32.lib
 				</Libraries>
 				<Libraries platforms="Win64">
@@ -119,87 +122,12 @@
 					../../../lib/win64/NvFlexDeviceRelease_x64.lib
 					../../../external/SDL2-2.0.4/lib/x64/SDL2.lib
 					../../../external/SDL2-2.0.4/lib/x64/SDL2main.lib
+					../../../external/NvToolsExt/lib/x64/nvToolsExt64_1.lib
 					../../../external/glew/lib/x64/glew32.lib					
 				</Libraries>
 
 			</Config>
 
-
-			<!-- Android -->
-
-			<Config name="default" type="app" platforms="android{x}">
-
-				<apply-template name="android-common"/>				
-
-				<OutDir tool="make">${user:ProjectRoot}/demo/compiler/android/flex_project/libs/armeabi-v7a</OutDir>
-
-				<Preprocessor type="define">
-					android
-					ANDROID=1
-					ANDROID_PLAT=1
-					DISABLE_IMPORTGL
-				</Preprocessor>
-
-				<SearchPaths type="header" tool="make">
-					"${user:ProjectRoot}"
-					"${user:ProjectRoot}/external/egl_setup"
-					"${user:ProjectRoot}/external/regal_static/include"
-				</SearchPaths>
-
-				<SearchPaths type="library" tool="make">
-					"${user:ProjectRoot}/external/regal_static/lib/armeabi-v7a"
-					"${user:ProjectRoot}/lib/android"
-				</SearchPaths>
-
-				<Libraries>
-					android stdc++ c m log dl EGL gomp cudart_static Regal_static
-				</Libraries>
-
-				<Libraries tool="make">
-					stlport_static
-				</Libraries>
-
-				<ExceptionHandling>True</ExceptionHandling>
-				<RuntimeTypeInfo>True</RuntimeTypeInfo>
-
-				<CFlags>
-					-std=c++11 -fno-exceptions -fno-rtti
-				</CFlags>
-
-				<CFlags tool="make">
-					-fpic -fPIC -ffunction-sections -funwind-tables -fstack-protector -no-canonical-prefixes -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -O2 -g -fomit-frame-pointer -fstrict-aliasing -funswitch-loops -finline-limit=300
-				</CFlags>
-
-				<LFlags tool="make">
-					--sysroot=${NDK_ROOT}/${NDK_VERSION}/platforms/android-15/arch-arm -shared -Wl,--no-undefined
-				</LFlags>
-
-				<AndroidAPILevel>15</AndroidAPILevel>
-				<AntBuildDirectory>
-					${user:ProjectRoot}/demo/compiler/android/flex_project
-				</AntBuildDirectory>
-				<AntJavaSourceDir>
-					${user:ProjectRoot}/demo/compiler/android/src
-				</AntJavaSourceDir>
-
-			</Config>
-
-			<Configuration name="release" platforms="android{x}">
-				<OutFile>libflexDemo.so</OutFile>
-
-				<Preprocessor type="define">
-					NDEBUG
-				</Preprocessor>
-
-				<AntBuildType>debug</AntBuildType>
-
-				<Libraries>
-					NvFlexRelease_armv7l
-					NvFlexExtRelease_armv7l
-				</Libraries>
-
-			</Configuration>
-
 			<!-- Linux -->
 
 			<Config name="default" type="console" platforms="linux64">
@@ -220,7 +148,7 @@
 				</CFlags>
 
 				<LFlags>
-					-g -L${user:External}/glew/lib/linux -L/usr/lib -L"../../../lib/linux64" -L${user:External}/SDL2-2.0.4/lib/x64/ -L${user:CUDA_PATH}/lib64 -lGL -lglut -lGLU -lGLEW -lcudart_static -ldl
+					-g -L${user:External}/glew/lib/linux -L/usr/lib -L"../../../lib/linux64" -L${user:External}/SDL2-2.0.4/lib/x64/ -L${user:CUDA_PATH}/lib64 -lGL -lglut -lGLU -lGLEW -lcudart_static -ldl -lrt -pthread
 				</LFlags>
 				
 			</Config>      
diff --git a/demo/compiler/xpj/flexDemoD3D.xpj b/demo/compiler/xpj/flexDemoD3D.xpj
index 0c95377..e957c5b 100644
--- a/demo/compiler/xpj/flexDemoD3D.xpj
+++ b/demo/compiler/xpj/flexDemoD3D.xpj
@@ -19,6 +19,9 @@
 
     <Target name="flexDemoD3D">
 
+	  <!-- Dx12 needs a post 8.1 version of windows SDK -->
+	  <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+	
       <!-- Windows -->
 
       <Config name="default" type="console" platforms="Win32 Win64">
@@ -34,6 +37,7 @@
           WIN32
           _CRT_SECURE_NO_WARNINGS
           FLEX_DX
+		  FLEX_DX12
         </Preprocessor>
 
         <WarningLevel>3</WarningLevel>
@@ -42,23 +46,29 @@
         <CharacterSet>MultiByte</CharacterSet>
 
         <SearchPaths type="header">
-      		${user:ProjectRoot}
-      		${user:ProjectRoot}\demo
-      		${user:ProjectRoot}\demo\d3d11
-      		${user:ProjectRoot}\external\SDL2-2.0.4\include
+          ${user:ProjectRoot}
+          ${user:ProjectRoot}\demo
+          ${user:ProjectRoot}\demo\d3d11
+          ${user:ProjectRoot}\demo\d3d12
+          ${user:ProjectRoot}\external\SDL2-2.0.4\include
+          ${user:ProjectRoot}\external\D3D12\include
         </SearchPaths>
 
         <Libraries>
-          kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
+          kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib d3dcompiler.lib
         </Libraries>
 		
 		<Libraries platforms="Win32">
           ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x86/SDL2.lib
           ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x86/SDL2main.lib
+		  ${user:ProjectRoot}/external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib
+		  ${user:ProjectRoot}/external/D3D12/libs/x86/d3d12.lib
         </Libraries>
         <Libraries platforms="Win64">
           ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x64/SDL2.lib
           ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x64/SDL2main.lib
+		  ${user:ProjectRoot}/external/NvToolsExt/lib/x64/nvToolsExt64_1.lib
+		  ${user:ProjectRoot}/external/D3D12/libs/x64/d3d12.lib
         </Libraries>
 
       </Config>
@@ -87,14 +97,14 @@
           ${user:ProjectRoot}/lib/win32/NvFlexExtDebugD3D_x86.lib
           ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x86/SDL2.lib
           ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x86/SDL2main.lib
-          ${user:ProjectRoot}/external/glew/lib/win32/glew32.lib
+          ${user:ProjectRoot}/external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib
         </Libraries>
         <Libraries platforms="Win64">
           ${user:ProjectRoot}/lib/win64/NvFlexDebugD3D_x64.lib
           ${user:ProjectRoot}/lib/win64/NvFlexExtDebugD3D_x64.lib
           ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x64/SDL2.lib
           ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x64/SDL2main.lib
-          ${user:ProjectRoot}/external/glew/lib/x64/glew32.lib
+          ${user:ProjectRoot}/external/NvToolsExt/lib/x64/nvToolsExt64_1.lib
         </Libraries>
 
       </Config>
@@ -124,20 +134,67 @@
           ${user:ProjectRoot}/lib/win32/NvFlexExtReleaseD3D_x86.lib
           ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x86/SDL2.lib
           ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x86/SDL2main.lib
-          ${user:ProjectRoot}/external/glew/lib/win32/glew32.lib
+          ${user:ProjectRoot}/external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib
         </Libraries>
         <Libraries platforms="Win64">
           ${user:ProjectRoot}/lib/win64/NvFlexReleaseD3D_x64.lib
           ${user:ProjectRoot}/lib/win64/NvFlexExtReleaseD3D_x64.lib
           ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x64/SDL2.lib
           ${user:ProjectRoot}/external/SDL2-2.0.4/lib/x64/SDL2main.lib
-          ${user:ProjectRoot}/external/glew/lib/x64/glew32.lib
+          ${user:ProjectRoot}/external/NvToolsExt/lib/x64/nvToolsExt64_1.lib
         </Libraries>
 
       </Config>
 
       <!-- Common Source -->
-
+	  
+	  <Files name="NvCommon" type="source" root="${user:ProjectRoot}/external/NvCommon/src">
+		Nv/Common/*.cpp
+		Nv/Common/*.h
+		-Nv/Common/NvCoPathFinder.*
+		-Nv/Common/NvCoMemoryMappedFile.*
+		-Nv/Common/NvCoMemoryReadStream.*
+		-Nv/Common/NvCoMemoryWriteStream.*
+		-Nv/Common/NvCoCircularHeap.*
+		-Nv/Common/NvCoFreeListHeap.*
+		
+		Nv/Common/Platform/Win/*.cpp
+		Nv/Common/Platform/Win/*.h
+		-Nv/Common/Platform/Win/NvCoWinMemoryMappedFile.*
+		-Nv/Common/Platform/Win/NvCoWinPathUtil.*
+		-Nv/Common/Platform/Win/NvCoWinMinimalInclude.*
+		-Nv/Common/Platform/Win/NvCoWinCriticalSection.*
+		
+		Nv/Common/Util/*.cpp
+		Nv/Common/Util/*.h
+		-Nv/Common/Util/NvCoParseUtil.*
+		-Nv/Common/Util/NvCoStringEscapeUtil.*
+		-Nv/Common/Util/NvCoPathUtil.*
+		-Nv/Common/Util/NvCoArgParseUtil.*
+		-Nv/Common/Util/NvCoBitUtil.*
+		
+		-Nv/Common/Random/*.cpp
+		-Nv/Common/Random/*.h
+		
+		Nv/Common/Container/*.cpp
+		Nv/Common/Container/*.h
+		-Nv/Common/Container/NvCoHandleMap.*
+		
+		Nv/Common/Render/Dx/*.cpp
+		Nv/Common/Render/Dx/*.h
+		Nv/Common/Render/Dx12/*.cpp
+		Nv/Common/Render/Dx12/*.h
+		-Nv/Common/Render/Dx/NvCoDxIncludeHandler.*
+		-Nv/Common/Render/Dx/NvCoDxShaderUtil.*
+		-Nv/Common/Render/Dx12/NvCoDx12AsyncManager.*
+		-Nv/Common/Render/Dx12/NvCoDx12DescriptorCache.*
+		
+		Nv/Common/Render/Context/*.cpp
+		Nv/Common/Render/Context/*.h
+		Nv/Common/Render/Context/Dx12/*.cpp
+		Nv/Common/Render/Context/Dx12/*.h
+	  </Files>
+	  
       <Files name="demo" type="source" root="${user:ProjectRoot}/demo">
         *.cpp *.h
         scenes/*.h
@@ -154,41 +211,52 @@
       <Dependencies>
          flexD3D
          flexExtD3D
-       </Dependencies>
+      </Dependencies>
+	  
+  	  <Files name="d3d12" type="source" root="${user:ProjectRoot}/demo/d3d12">
+        *.h
+        *.cpp
+      </Files>
 	  
 	  <Files name="d3d11" type="source" root="${user:ProjectRoot}/demo/d3d11">
         *.h
         *.cpp
       </Files>
 	  
+	  <Files name="d3d" type="source" root="${user:ProjectRoot}/demo/d3d">
+        *.h
+        *.cpp
+      </Files>
 	  
-	  <HLSL Configurations="release" DisableOptim="No" Debug="No" ShaderModel="5.0" Platforms="Win32 Win64" ObjectFileOutput=" " WarningAsErrors="false" OutputHeaderFileName="${user:ProjectRoot}/demo/d3d11/shaders/%(Filename).hlsl.h">
+	  <HLSL Configurations="release" DisableOptim="No" Debug="No" ShaderModel="5.0" Platforms="Win32 Win64" ObjectFileOutput=" " WarningAsErrors="false" OutputHeaderFileName="${user:ProjectRoot}/demo/d3d/shaders/%(Filename).hlsl.h">
 
-        <File  ShaderType="Vertex" EntryPoint="debugLineVS"> "${user:ProjectRoot}/demo/d3d11/shaders/debugLineVS.hlsl" </File>
-        <File  ShaderType="Pixel" EntryPoint="debugLinePS"> "${user:ProjectRoot}/demo/d3d11/shaders/debugLinePS.hlsl" </File>      
+        <File  ShaderType="Vertex" EntryPoint="debugLineVS"> "${user:ProjectRoot}/demo/d3d/shaders/debugLineVS.hlsl" </File>
+        <File  ShaderType="Pixel" EntryPoint="debugLinePS"> "${user:ProjectRoot}/demo/d3d/shaders/debugLinePS.hlsl" </File>      
 
-        <File  ShaderType="Pixel" EntryPoint="imguiPS"> "${user:ProjectRoot}/demo/d3d11/shaders/imguiPS.hlsl" </File>
-        <File  ShaderType="Vertex" EntryPoint="imguiVS"> "${user:ProjectRoot}/demo/d3d11/shaders/imguiVS.hlsl" </File>
+        <File  ShaderType="Pixel" EntryPoint="imguiPS"> "${user:ProjectRoot}/demo/d3d/shaders/imguiPS.hlsl" </File>
+        <File  ShaderType="Vertex" EntryPoint="imguiVS"> "${user:ProjectRoot}/demo/d3d/shaders/imguiVS.hlsl" </File>
 
-        <File  ShaderType="Pixel" EntryPoint="meshPS"> "${user:ProjectRoot}/demo/d3d11/shaders/meshPS.hlsl" </File>
-        <File  ShaderType="Pixel" EntryPoint="meshPS_Shadow"> "${user:ProjectRoot}/demo/d3d11/shaders/meshShadowPS.hlsl" </File>        
-        <File  ShaderType="Vertex" EntryPoint="meshVS"> "${user:ProjectRoot}/demo/d3d11/shaders/meshVS.hlsl" </File>
+        <File  ShaderType="Pixel" EntryPoint="meshPS"> "${user:ProjectRoot}/demo/d3d/shaders/meshPS.hlsl" </File>
+		<File  ShaderType="Pixel" EntryPoint="meshPS"> "${user:ProjectRoot}/demo/d3d/shaders/meshAsyncComputeBenchPS.hlsl" </File>
+        <File  ShaderType="Pixel" EntryPoint="meshPS_Shadow"> "${user:ProjectRoot}/demo/d3d/shaders/meshShadowPS.hlsl" </File>        
+        <File  ShaderType="Vertex" EntryPoint="meshVS"> "${user:ProjectRoot}/demo/d3d/shaders/meshVS.hlsl" </File>
 
-        <File  ShaderType="Vertex" EntryPoint="pointVS"> "${user:ProjectRoot}/demo/d3d11/shaders/pointVS.hlsl" </File>
-        <File  ShaderType="Geometry" EntryPoint="pointGS"> "${user:ProjectRoot}/demo/d3d11/shaders/pointGS.hlsl" </File>
-        <File  ShaderType="Pixel" EntryPoint="pointPS"> "${user:ProjectRoot}/demo/d3d11/shaders/pointPS.hlsl" </File>
-
-        <File  ShaderType="Vertex" EntryPoint="diffuseVS"> "${user:ProjectRoot}/demo/d3d11/shaders/diffuseVS.hlsl" </File>
-        <File  ShaderType="Geometry" EntryPoint="diffuseGS"> "${user:ProjectRoot}/demo/d3d11/shaders/diffuseGS.hlsl" </File>
-        <File  ShaderType="Pixel" EntryPoint="diffusePS"> "${user:ProjectRoot}/demo/d3d11/shaders/diffusePS.hlsl" </File>
+        <File  ShaderType="Vertex" EntryPoint="pointVS"> "${user:ProjectRoot}/demo/d3d/shaders/pointVS.hlsl" </File>
+        <File  ShaderType="Geometry" EntryPoint="pointGS"> "${user:ProjectRoot}/demo/d3d/shaders/pointGS.hlsl" </File>
+        <File  ShaderType="Pixel" EntryPoint="pointPS"> "${user:ProjectRoot}/demo/d3d/shaders/pointPS.hlsl" </File>
+		<File  ShaderType="Pixel" EntryPoint="pointShadowPS"> "${user:ProjectRoot}/demo/d3d/shaders/pointShadowPS.hlsl" </File>
+		
+        <File  ShaderType="Vertex" EntryPoint="diffuseVS"> "${user:ProjectRoot}/demo/d3d/shaders/diffuseVS.hlsl" </File>
+        <File  ShaderType="Geometry" EntryPoint="diffuseGS"> "${user:ProjectRoot}/demo/d3d/shaders/diffuseGS.hlsl" </File>
+        <File  ShaderType="Pixel" EntryPoint="diffusePS"> "${user:ProjectRoot}/demo/d3d/shaders/diffusePS.hlsl" </File>
 
-        <File  ShaderType="Vertex" EntryPoint="ellipsoidDepthVS"> "${user:ProjectRoot}/demo/d3d11/shaders/ellipsoidDepthVS.hlsl" </File>
-        <File  ShaderType="Geometry" EntryPoint="ellipsoidDepthGS"> "${user:ProjectRoot}/demo/d3d11/shaders/ellipsoidDepthGS.hlsl" </File>
-        <File  ShaderType="Pixel" EntryPoint="ellipsoidDepthPS"> "${user:ProjectRoot}/demo/d3d11/shaders/ellipsoidDepthPS.hlsl" </File>
+        <File  ShaderType="Vertex" EntryPoint="ellipsoidDepthVS"> "${user:ProjectRoot}/demo/d3d/shaders/ellipsoidDepthVS.hlsl" </File>
+        <File  ShaderType="Geometry" EntryPoint="ellipsoidDepthGS"> "${user:ProjectRoot}/demo/d3d/shaders/ellipsoidDepthGS.hlsl" </File>
+        <File  ShaderType="Pixel" EntryPoint="ellipsoidDepthPS"> "${user:ProjectRoot}/demo/d3d/shaders/ellipsoidDepthPS.hlsl" </File>
 
-        <File  ShaderType="Vertex" EntryPoint="passThroughVS"> "${user:ProjectRoot}/demo/d3d11/shaders/passThroughVS.hlsl" </File>
-        <File  ShaderType="Pixel" EntryPoint="blurDepthPS"> "${user:ProjectRoot}/demo/d3d11/shaders/blurDepthPS.hlsl" </File>
-        <File  ShaderType="Pixel" EntryPoint="compositePS"> "${user:ProjectRoot}/demo/d3d11/shaders/compositePS.hlsl" </File>
+        <File  ShaderType="Vertex" EntryPoint="passThroughVS"> "${user:ProjectRoot}/demo/d3d/shaders/passThroughVS.hlsl" </File>
+        <File  ShaderType="Pixel" EntryPoint="blurDepthPS"> "${user:ProjectRoot}/demo/d3d/shaders/blurDepthPS.hlsl" </File>
+        <File  ShaderType="Pixel" EntryPoint="compositePS"> "${user:ProjectRoot}/demo/d3d/shaders/compositePS.hlsl" </File>
 
       </HLSL>
author	Miles Macklin <[email protected]>	2017-06-09 13:41:15 +1200
committer	Miles Macklin <[email protected]>	2017-06-09 13:41:15 +1200
commit	688b5f42e9bfe498d7af7075d4d8f4429867f3a3 (patch)
tree	7e0d0e7c95298f0418723abd92f61ac6e16b055e /demo/compiler
parent	Update README.md (diff)
download	flex-1.2.0.beta.1.tar.xz flex-1.2.0.beta.1.zip