diff options
Diffstat (limited to 'demo/compiler')
35 files changed, 4713 insertions, 2255 deletions
diff --git a/demo/compiler/makeandroid/Makefile b/demo/compiler/makeandroid/Makefile deleted file mode 100644 index 02650e4..0000000 --- a/demo/compiler/makeandroid/Makefile +++ /dev/null @@ -1,201 +0,0 @@ -#!/usr/bin/make -# Makefile generated by XPJ for android - -DEPSDIR = .deps -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 = ./../../../../../../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 -ECHO = echo -CCLD = $(NDK_BIN_DIR)/$(NDK_PREFIX)g++ -CXX = $(NDK_BIN_DIR)/$(NDK_PREFIX)g++ -CC = $(NDK_BIN_DIR)/$(NDK_PREFIX)gcc -RANLIB = $(NDK_BIN_DIR)/$(NDK_PREFIX)ranlib -AR = $(NDK_BIN_DIR)/$(NDK_PREFIX)ar -STRIP = $(NDK_BIN_DIR)/$(NDK_PREFIX)strip -OBJDUMP = $(NDK_BIN_DIR)/$(NDK_PREFIX)objdump -OBJCOPY = $(NDK_BIN_DIR)/$(NDK_PREFIX)objcopy --include Makedefs.ANDROID.mk - -all: debug release - -debug: build_flexCUDA_debug build_flexExtCUDA_debug - -release: build_flexDevice_release build_flexCUDA_release build_flexExtCUDA_release build_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_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 - - -# Disable implicit rules to speedup build -.SUFFIXES: -SUFFIXES := -%.out: -%.a: -%.ln: -%.o: -%: %.o -%.c: -%: %.c -%.ln: %.c -%.o: %.c -%.cc: -%: %.cc -%.o: %.cc -%.C: -%: %.C -%.o: %.C -%.cpp: -%: %.cpp -%.o: %.cpp -%.p: -%: %.p -%.o: %.p -%.f: -%: - %.f%.o: %.f -%.F: -%: %.F -%.o: %.F -%.f: %.F -%.r: -%: %.r -%.o: %.r -%.f: %.r -%.y: -%.ln: %.y -%.c: %.y -%.l: -%.ln: %.l -%.c: %.l -%.r: %.l -%.s: -%: %.s -%.o: %.s -%.S: -%: %.S -%.o: %.S -%.s: %.S -%.mod: -%: %.mod -%.o: %.mod -%.sym: -%.def: -%.sym: %.def -%.h: -%.info: -%.dvi: -%.tex: -%.dvi: %.tex -%.texinfo: -%.info: %.texinfo -%.dvi: %.texinfo -%.texi: -%.info: %.texi -%.dvi: %.texi -%.txinfo: -%.info: %.txinfo -%.dvi: %.txinfo -%.w: -%.c: %.w -%.tex: %.w -%.ch: -%.web: -%.p: %.web -%.tex: %.web -%.sh: -%: %.sh -%.elc: -%.el: -(%): % -%.out: % -%.c: %.w %.ch -%.tex: %.w %.ch -%: %,v -%: RCS/%,v -%: RCS/% -%: s.% -%: SCCS/s.% -.web.p: -.l.r: -.dvi: -.F.o: -.l: -.y.ln: -.o: -.y: -.def.sym: -.p.o: -.p: -.txinfo.dvi: -.a: -.l.ln: -.w.c: -.texi.dvi: -.sh: -.cc: -.cc.o: -.def: -.c.o: -.r.o: -.r: -.info: -.elc: -.l.c: -.out: -.C: -.r.f: -.S: -.texinfo.info: -.c: -.w.tex: -.c.ln: -.s.o: -.s: -.texinfo.dvi: -.el: -.texinfo: -.y.c: -.web.tex: -.texi.info: -.DEFAULT: -.h: -.tex.dvi: -.cpp.o: -.cpp: -.C.o: -.ln: -.texi: -.txinfo: -.tex: -.txinfo.info: -.ch: -.S.s: -.mod: -.mod.o: -.F.f: -.w: -.S.o: -.F: -.web: -.sym: -.f: -.f.o: -export VERBOSE -ifndef VERBOSE -.SILENT: -endif diff --git a/demo/compiler/makeandroid/Makefile.flexCUDA.mk b/demo/compiler/makeandroid/Makefile.flexCUDA.mk deleted file mode 100644 index 2f9e44a..0000000 --- a/demo/compiler/makeandroid/Makefile.flexCUDA.mk +++ /dev/null @@ -1,225 +0,0 @@ -# Makefile generated by XPJ for android --include Makefile.custom -ProjectName = flexCUDA -flexCUDA_cppfiles += ./../../../src/cuda/util.cpp -flexCUDA_cuda_src_cuda_bvh_cu += ./../../../src/cuda/bvh.cu -flexCUDA_cuda_src_cuda_flex_cu += ./../../../src/cuda/flex.cu -flexCUDA_cuda_src_cuda_sort_cu += ./../../../src/cuda/sort.cu - -flexCUDA_cpp_release_dep = $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.P, $(flexCUDA_cppfiles))))) -flexCUDA_cc_release_dep = $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.release.P, $(flexCUDA_ccfiles))))) -flexCUDA_c_release_dep = $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.P, $(flexCUDA_cfiles))))) -flexCUDA_release_dep = $(flexCUDA_cpp_release_dep) $(flexCUDA_cc_release_dep) $(flexCUDA_c_release_dep) --include $(flexCUDA_release_dep) -flexCUDA_cpp_debug_dep = $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.P, $(flexCUDA_cppfiles))))) -flexCUDA_cc_debug_dep = $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.debug.P, $(flexCUDA_ccfiles))))) -flexCUDA_c_debug_dep = $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.P, $(flexCUDA_cfiles))))) -flexCUDA_debug_dep = $(flexCUDA_cpp_debug_dep) $(flexCUDA_cc_debug_dep) $(flexCUDA_c_debug_dep) --include $(flexCUDA_debug_dep) -flexCUDA_release_hpaths := -flexCUDA_release_hpaths += ./../../.. -flexCUDA_release_hpaths += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include -flexCUDA_release_hpaths += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport -flexCUDA_release_hpaths += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include -flexCUDA_release_lpaths := -flexCUDA_release_lpaths += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/lib -flexCUDA_release_lpaths += ./../../../lib/android -flexCUDA_release_lpaths += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/libs/armeabi-v7a -flexCUDA_release_defines := $(flexCUDA_custom_defines) -flexCUDA_release_defines += android -flexCUDA_release_defines += ANDROID=1 -flexCUDA_release_defines += ANDROID_PLAT=1 -flexCUDA_release_defines += DISABLE_IMPORTGL -flexCUDA_release_libraries := -flexCUDA_release_common_cflags := $(flexCUDA_custom_cflags) -flexCUDA_release_common_cflags += -MMD -flexCUDA_release_common_cflags += $(addprefix -D, $(flexCUDA_release_defines)) -flexCUDA_release_common_cflags += $(addprefix -I, $(flexCUDA_release_hpaths)) -flexCUDA_release_cflags := $(flexCUDA_release_common_cflags) -flexCUDA_release_cflags += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions -flexCUDA_release_cflags += -O3 -ffast-math -flexCUDA_release_cppflags := $(flexCUDA_release_common_cflags) -flexCUDA_release_cppflags += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions -flexCUDA_release_cppflags += -O3 -ffast-math -flexCUDA_release_lflags := $(flexCUDA_custom_lflags) -flexCUDA_release_lflags += $(addprefix -L, $(flexCUDA_release_lpaths)) -flexCUDA_release_lflags += -Wl,--start-group $(addprefix -l, $(flexCUDA_release_libraries)) -Wl,--end-group -flexCUDA_release_objsdir = $(OBJS_DIR)/flexCUDA_release -flexCUDA_release_cpp_o = $(addprefix $(flexCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexCUDA_cppfiles))))) -flexCUDA_release_cc_o = $(addprefix $(flexCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(flexCUDA_ccfiles))))) -flexCUDA_release_c_o = $(addprefix $(flexCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.o, $(flexCUDA_cfiles))))) -flexCUDA_release_cuda_src_cuda_bvh_cu_o += $(OBJS_DIR)/flexCUDA_release/cuda/src/cudabvh.o -flexCUDA_release_cuda_src_cuda_flex_cu_o += $(OBJS_DIR)/flexCUDA_release/cuda/src/cudaflex.o -flexCUDA_release_cuda_src_cuda_sort_cu_o += $(OBJS_DIR)/flexCUDA_release/cuda/src/cudasort.o -flexCUDA_release_obj = $(flexCUDA_release_cpp_o) $(flexCUDA_release_cc_o) $(flexCUDA_release_c_o) $(flexCUDA_release_cuda_src_cuda_bvh_cu_o) $(flexCUDA_release_cuda_src_cuda_flex_cu_o) $(flexCUDA_release_cuda_src_cuda_sort_cu_o) -flexCUDA_release_bin := ./../../../lib/android/libNvFlexReleaseCUDA_armv7l.a - -clean_flexCUDA_release: - @$(ECHO) clean flexCUDA release - @$(RMDIR) $(flexCUDA_release_objsdir) - @$(RMDIR) $(flexCUDA_release_bin) - @$(RMDIR) $(DEPSDIR)/flexCUDA/release - -build_flexCUDA_release: postbuild_flexCUDA_release -postbuild_flexCUDA_release: mainbuild_flexCUDA_release -mainbuild_flexCUDA_release: prebuild_flexCUDA_release $(flexCUDA_release_bin) -prebuild_flexCUDA_release: - -$(flexCUDA_release_bin): $(flexCUDA_release_obj) - mkdir -p `dirname ./../../../lib/android/libNvFlexReleaseCUDA_armv7l.a` - @$(AR) rcs $(flexCUDA_release_bin) $(flexCUDA_release_obj) - $(ECHO) building $@ complete! - -$(flexCUDA_release_cuda_src_cuda_bvh_cu_o): $(flexCUDA_cuda_src_cuda_bvh_cu) - @mkdir -p `dirname $(OBJS_DIR)/flexCUDA_release/cuda/src/cudabvh.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 "../../../src/cuda/bvh.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudabvh.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 "../../../src/cuda/bvh.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudabvh.o" - -$(flexCUDA_release_cuda_src_cuda_flex_cu_o): $(flexCUDA_cuda_src_cuda_flex_cu) - @mkdir -p `dirname $(OBJS_DIR)/flexCUDA_release/cuda/src/cudaflex.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 "../../../src/cuda/flex.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudaflex.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 "../../../src/cuda/flex.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudaflex.o" - -$(flexCUDA_release_cuda_src_cuda_sort_cu_o): $(flexCUDA_cuda_src_cuda_sort_cu) - @mkdir -p `dirname $(OBJS_DIR)/flexCUDA_release/cuda/src/cudasort.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 "../../../src/cuda/sort.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudasort.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 "../../../src/cuda/sort.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudasort.o" - -flexCUDA_release_DEPDIR = $(dir $(@))/$(*F) -$(flexCUDA_release_cpp_o): $(flexCUDA_release_objsdir)/%.o: - $(ECHO) flexCUDA: compiling release $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cppfiles))... - mkdir -p $(dir $(@)) - $(CXX) $(flexCUDA_release_cppflags) -c $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cppfiles)) -o $@ - @mkdir -p $(dir $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cppfiles)))))) - cp $(flexCUDA_release_DEPDIR).d $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cppfiles))))).P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexCUDA_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cppfiles))))).P; \ - rm -f $(flexCUDA_release_DEPDIR).d - -$(flexCUDA_release_cc_o): $(flexCUDA_release_objsdir)/%.o: - $(ECHO) flexCUDA: compiling release $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_ccfiles))... - mkdir -p $(dir $(@)) - $(CXX) $(flexCUDA_release_cppflags) -c $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_ccfiles)) -o $@ - mkdir -p $(dir $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_ccfiles)))))) - cp $(flexCUDA_release_DEPDIR).d $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_ccfiles))))).release.P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexCUDA_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_ccfiles))))).release.P; \ - rm -f $(flexCUDA_release_DEPDIR).d - -$(flexCUDA_release_c_o): $(flexCUDA_release_objsdir)/%.o: - $(ECHO) flexCUDA: compiling release $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cfiles))... - mkdir -p $(dir $(@)) - $(CC) $(flexCUDA_release_cflags) -c $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cfiles)) -o $@ - @mkdir -p $(dir $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cfiles)))))) - cp $(flexCUDA_release_DEPDIR).d $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cfiles))))).P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexCUDA_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cfiles))))).P; \ - rm -f $(flexCUDA_release_DEPDIR).d - -flexCUDA_debug_hpaths := -flexCUDA_debug_hpaths += ./../../.. -flexCUDA_debug_hpaths += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include -flexCUDA_debug_hpaths += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport -flexCUDA_debug_hpaths += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include -flexCUDA_debug_lpaths := -flexCUDA_debug_lpaths += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/lib -flexCUDA_debug_lpaths += ./../../../lib/android -flexCUDA_debug_lpaths += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/libs/armeabi-v7a -flexCUDA_debug_defines := $(flexCUDA_custom_defines) -flexCUDA_debug_defines += android -flexCUDA_debug_defines += ANDROID=1 -flexCUDA_debug_defines += ANDROID_PLAT=1 -flexCUDA_debug_defines += DISABLE_IMPORTGL -flexCUDA_debug_libraries := -flexCUDA_debug_common_cflags := $(flexCUDA_custom_cflags) -flexCUDA_debug_common_cflags += -MMD -flexCUDA_debug_common_cflags += $(addprefix -D, $(flexCUDA_debug_defines)) -flexCUDA_debug_common_cflags += $(addprefix -I, $(flexCUDA_debug_hpaths)) -flexCUDA_debug_cflags := $(flexCUDA_debug_common_cflags) -flexCUDA_debug_cflags += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions -flexCUDA_debug_cflags += -g -O0 -flexCUDA_debug_cppflags := $(flexCUDA_debug_common_cflags) -flexCUDA_debug_cppflags += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions -flexCUDA_debug_cppflags += -g -O0 -flexCUDA_debug_lflags := $(flexCUDA_custom_lflags) -flexCUDA_debug_lflags += $(addprefix -L, $(flexCUDA_debug_lpaths)) -flexCUDA_debug_lflags += -Wl,--start-group $(addprefix -l, $(flexCUDA_debug_libraries)) -Wl,--end-group -flexCUDA_debug_objsdir = $(OBJS_DIR)/flexCUDA_debug -flexCUDA_debug_cpp_o = $(addprefix $(flexCUDA_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexCUDA_cppfiles))))) -flexCUDA_debug_cc_o = $(addprefix $(flexCUDA_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(flexCUDA_ccfiles))))) -flexCUDA_debug_c_o = $(addprefix $(flexCUDA_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.o, $(flexCUDA_cfiles))))) -flexCUDA_debug_cuda_src_cuda_bvh_cu_o += $(OBJS_DIR)/flexCUDA_debug/cuda/src/cudabvh.o -flexCUDA_debug_cuda_src_cuda_flex_cu_o += $(OBJS_DIR)/flexCUDA_debug/cuda/src/cudaflex.o -flexCUDA_debug_cuda_src_cuda_sort_cu_o += $(OBJS_DIR)/flexCUDA_debug/cuda/src/cudasort.o -flexCUDA_debug_obj = $(flexCUDA_debug_cpp_o) $(flexCUDA_debug_cc_o) $(flexCUDA_debug_c_o) $(flexCUDA_debug_cuda_src_cuda_bvh_cu_o) $(flexCUDA_debug_cuda_src_cuda_flex_cu_o) $(flexCUDA_debug_cuda_src_cuda_sort_cu_o) -flexCUDA_debug_bin := ./../../../lib/android/libNvFlexDebugCUDA_armv7l.a - -clean_flexCUDA_debug: - @$(ECHO) clean flexCUDA debug - @$(RMDIR) $(flexCUDA_debug_objsdir) - @$(RMDIR) $(flexCUDA_debug_bin) - @$(RMDIR) $(DEPSDIR)/flexCUDA/debug - -build_flexCUDA_debug: postbuild_flexCUDA_debug -postbuild_flexCUDA_debug: mainbuild_flexCUDA_debug -mainbuild_flexCUDA_debug: prebuild_flexCUDA_debug $(flexCUDA_debug_bin) -prebuild_flexCUDA_debug: - -$(flexCUDA_debug_bin): $(flexCUDA_debug_obj) - mkdir -p `dirname ./../../../lib/android/libNvFlexDebugCUDA_armv7l.a` - @$(AR) rcs $(flexCUDA_debug_bin) $(flexCUDA_debug_obj) - $(ECHO) building $@ complete! - -$(flexCUDA_debug_cuda_src_cuda_bvh_cu_o): $(flexCUDA_cuda_src_cuda_bvh_cu) - @mkdir -p `dirname $(OBJS_DIR)/flexCUDA_debug/cuda/src/cudabvh.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 "../../../src/cuda/bvh.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudabvh.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 "../../../src/cuda/bvh.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudabvh.o" - -$(flexCUDA_debug_cuda_src_cuda_flex_cu_o): $(flexCUDA_cuda_src_cuda_flex_cu) - @mkdir -p `dirname $(OBJS_DIR)/flexCUDA_debug/cuda/src/cudaflex.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 "../../../src/cuda/flex.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudaflex.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 "../../../src/cuda/flex.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudaflex.o" - -$(flexCUDA_debug_cuda_src_cuda_sort_cu_o): $(flexCUDA_cuda_src_cuda_sort_cu) - @mkdir -p `dirname $(OBJS_DIR)/flexCUDA_debug/cuda/src/cudasort.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 "../../../src/cuda/sort.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudasort.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 "../../../src/cuda/sort.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudasort.o" - -flexCUDA_debug_DEPDIR = $(dir $(@))/$(*F) -$(flexCUDA_debug_cpp_o): $(flexCUDA_debug_objsdir)/%.o: - $(ECHO) flexCUDA: compiling debug $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cppfiles))... - mkdir -p $(dir $(@)) - $(CXX) $(flexCUDA_debug_cppflags) -c $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cppfiles)) -o $@ - @mkdir -p $(dir $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cppfiles)))))) - cp $(flexCUDA_debug_DEPDIR).d $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cppfiles))))).P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexCUDA_debug_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cppfiles))))).P; \ - rm -f $(flexCUDA_debug_DEPDIR).d - -$(flexCUDA_debug_cc_o): $(flexCUDA_debug_objsdir)/%.o: - $(ECHO) flexCUDA: compiling debug $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_ccfiles))... - mkdir -p $(dir $(@)) - $(CXX) $(flexCUDA_debug_cppflags) -c $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_ccfiles)) -o $@ - mkdir -p $(dir $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_ccfiles)))))) - cp $(flexCUDA_debug_DEPDIR).d $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_ccfiles))))).debug.P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexCUDA_debug_DEPDIR).d >> $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_ccfiles))))).debug.P; \ - rm -f $(flexCUDA_debug_DEPDIR).d - -$(flexCUDA_debug_c_o): $(flexCUDA_debug_objsdir)/%.o: - $(ECHO) flexCUDA: compiling debug $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cfiles))... - mkdir -p $(dir $(@)) - $(CC) $(flexCUDA_debug_cflags) -c $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cfiles)) -o $@ - @mkdir -p $(dir $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cfiles)))))) - cp $(flexCUDA_debug_DEPDIR).d $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cfiles))))).P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexCUDA_debug_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cfiles))))).P; \ - rm -f $(flexCUDA_debug_DEPDIR).d - -clean_flexCUDA: clean_flexCUDA_release clean_flexCUDA_debug - rm -rf $(DEPSDIR) - -export VERBOSE -ifndef VERBOSE -.SILENT: -endif diff --git a/demo/compiler/makeandroid/Makefile.flexDemoCUDA.mk b/demo/compiler/makeandroid/Makefile.flexDemoCUDA.mk deleted file mode 100644 index 74e8454..0000000 --- a/demo/compiler/makeandroid/Makefile.flexDemoCUDA.mk +++ /dev/null @@ -1,143 +0,0 @@ -# Makefile generated by XPJ for android --include Makefile.custom -ProjectName = flexDemoCUDA -flexDemoCUDA_cppfiles += ./../../imgui.cpp -flexDemoCUDA_cppfiles += ./../../main.cpp -flexDemoCUDA_cppfiles += ./../../opengl/imguiRenderGL.cpp -flexDemoCUDA_cppfiles += ./../../opengl/shader.cpp -flexDemoCUDA_cppfiles += ./../../opengl/shadersGL.cpp -flexDemoCUDA_cppfiles += ./../../../core/aabbtree.cpp -flexDemoCUDA_cppfiles += ./../../../core/core.cpp -flexDemoCUDA_cppfiles += ./../../../core/extrude.cpp -flexDemoCUDA_cppfiles += ./../../../core/maths.cpp -flexDemoCUDA_cppfiles += ./../../../core/mesh.cpp -flexDemoCUDA_cppfiles += ./../../../core/perlin.cpp -flexDemoCUDA_cppfiles += ./../../../core/pfm.cpp -flexDemoCUDA_cppfiles += ./../../../core/platform.cpp -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))))) -flexDemoCUDA_c_release_dep = $(addprefix $(DEPSDIR)/flexDemoCUDA/release/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.P, $(flexDemoCUDA_cfiles))))) -flexDemoCUDA_release_dep = $(flexDemoCUDA_cpp_release_dep) $(flexDemoCUDA_cc_release_dep) $(flexDemoCUDA_c_release_dep) --include $(flexDemoCUDA_release_dep) -flexDemoCUDA_release_hpaths := -flexDemoCUDA_release_hpaths += ./../../.. -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 += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/lib -flexDemoCUDA_release_lpaths += ./../../../lib/android -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) -flexDemoCUDA_release_defines += android -flexDemoCUDA_release_defines += ANDROID=1 -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++ -flexDemoCUDA_release_libraries += c -flexDemoCUDA_release_libraries += m -flexDemoCUDA_release_libraries += log -flexDemoCUDA_release_libraries += dl -flexDemoCUDA_release_libraries += EGL -flexDemoCUDA_release_libraries += gomp -flexDemoCUDA_release_libraries += cudart_static -flexDemoCUDA_release_libraries += Regal_static -flexDemoCUDA_release_libraries += stlport_static -flexDemoCUDA_release_libraries += NvFlexRelease_armv7l -flexDemoCUDA_release_libraries += NvFlexExtRelease_armv7l -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_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=/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))))) -flexDemoCUDA_release_c_o = $(addprefix $(flexDemoCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.o, $(flexDemoCUDA_cfiles))))) -flexDemoCUDA_release_obj = $(flexDemoCUDA_release_cpp_o) $(flexDemoCUDA_release_cc_o) $(flexDemoCUDA_release_c_o) -flexDemoCUDA_release_bin := ./../android/flex_project/libs/armeabi-v7a/libflexDemo.so - -clean_flexDemoCUDA_release: - @$(ECHO) clean flexDemoCUDA release - @$(RMDIR) $(flexDemoCUDA_release_objsdir) - @$(RMDIR) $(flexDemoCUDA_release_bin) - @$(RMDIR) $(DEPSDIR)/flexDemoCUDA/release - -build_flexDemoCUDA_release: postbuild_flexDemoCUDA_release -postbuild_flexDemoCUDA_release: mainbuild_flexDemoCUDA_release preantbuild_flexDemoCUDA_release antbuild_flexDemoCUDA_release -preantbuild_flexDemoCUDA_release: mainbuild_flexDemoCUDA_release -antbuild_flexDemoCUDA_release: preantbuild_flexDemoCUDA_release - dos2unix $(ANT_TOOL); JAVA_HOME=$(JAVA_HOME) $(ANT_TOOL) -f ./../android/flex_project/build.xml debug -mainbuild_flexDemoCUDA_release: prebuild_flexDemoCUDA_release $(flexDemoCUDA_release_bin) -prebuild_flexDemoCUDA_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! - -flexDemoCUDA_release_DEPDIR = $(dir $(@))/$(*F) -$(flexDemoCUDA_release_cpp_o): $(flexDemoCUDA_release_objsdir)/%.o: - $(ECHO) flexDemoCUDA: compiling release $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDemoCUDA_release_objsdir),, $@))), $(flexDemoCUDA_cppfiles))... - mkdir -p $(dir $(@)) - $(CXX) $(flexDemoCUDA_release_cppflags) -c $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDemoCUDA_release_objsdir),, $@))), $(flexDemoCUDA_cppfiles)) -o $@ - @mkdir -p $(dir $(addprefix $(DEPSDIR)/flexDemoCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDemoCUDA_release_objsdir),, $@))), $(flexDemoCUDA_cppfiles)))))) - cp $(flexDemoCUDA_release_DEPDIR).d $(addprefix $(DEPSDIR)/flexDemoCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDemoCUDA_release_objsdir),, $@))), $(flexDemoCUDA_cppfiles))))).P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexDemoCUDA_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexDemoCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDemoCUDA_release_objsdir),, $@))), $(flexDemoCUDA_cppfiles))))).P; \ - rm -f $(flexDemoCUDA_release_DEPDIR).d - -$(flexDemoCUDA_release_cc_o): $(flexDemoCUDA_release_objsdir)/%.o: - $(ECHO) flexDemoCUDA: compiling release $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDemoCUDA_release_objsdir),, $@))), $(flexDemoCUDA_ccfiles))... - mkdir -p $(dir $(@)) - $(CXX) $(flexDemoCUDA_release_cppflags) -c $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDemoCUDA_release_objsdir),, $@))), $(flexDemoCUDA_ccfiles)) -o $@ - mkdir -p $(dir $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDemoCUDA_release_objsdir),, $@))), $(flexDemoCUDA_ccfiles)))))) - cp $(flexDemoCUDA_release_DEPDIR).d $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDemoCUDA_release_objsdir),, $@))), $(flexDemoCUDA_ccfiles))))).release.P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexDemoCUDA_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDemoCUDA_release_objsdir),, $@))), $(flexDemoCUDA_ccfiles))))).release.P; \ - rm -f $(flexDemoCUDA_release_DEPDIR).d - -$(flexDemoCUDA_release_c_o): $(flexDemoCUDA_release_objsdir)/%.o: - $(ECHO) flexDemoCUDA: compiling release $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDemoCUDA_release_objsdir),, $@))), $(flexDemoCUDA_cfiles))... - mkdir -p $(dir $(@)) - $(CC) $(flexDemoCUDA_release_cflags) -c $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDemoCUDA_release_objsdir),, $@))), $(flexDemoCUDA_cfiles)) -o $@ - @mkdir -p $(dir $(addprefix $(DEPSDIR)/flexDemoCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDemoCUDA_release_objsdir),, $@))), $(flexDemoCUDA_cfiles)))))) - cp $(flexDemoCUDA_release_DEPDIR).d $(addprefix $(DEPSDIR)/flexDemoCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDemoCUDA_release_objsdir),, $@))), $(flexDemoCUDA_cfiles))))).P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexDemoCUDA_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexDemoCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDemoCUDA_release_objsdir),, $@))), $(flexDemoCUDA_cfiles))))).P; \ - rm -f $(flexDemoCUDA_release_DEPDIR).d - -clean_flexDemoCUDA: clean_flexDemoCUDA_release - rm -rf $(DEPSDIR) - -export VERBOSE -ifndef VERBOSE -.SILENT: -endif diff --git a/demo/compiler/makeandroid/Makefile.flexDevice.mk b/demo/compiler/makeandroid/Makefile.flexDevice.mk deleted file mode 100644 index 4467ea7..0000000 --- a/demo/compiler/makeandroid/Makefile.flexDevice.mk +++ /dev/null @@ -1,100 +0,0 @@ -# Makefile generated by XPJ for android --include Makefile.custom -ProjectName = flexDevice -flexDevice_cppfiles += ./../../../src/device/PhysXDevice.cpp -flexDevice_cppfiles += ./../../../src/device/flexDevice.cpp - -flexDevice_cpp_release_dep = $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.P, $(flexDevice_cppfiles))))) -flexDevice_cc_release_dep = $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.release.P, $(flexDevice_ccfiles))))) -flexDevice_c_release_dep = $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.P, $(flexDevice_cfiles))))) -flexDevice_release_dep = $(flexDevice_cpp_release_dep) $(flexDevice_cc_release_dep) $(flexDevice_c_release_dep) --include $(flexDevice_release_dep) -flexDevice_release_hpaths := -flexDevice_release_hpaths += ./../../.. -flexDevice_release_hpaths += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/platforms/android-15/arch-arm/usr/include -flexDevice_release_hpaths += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/stlport -flexDevice_release_hpaths += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/include -flexDevice_release_lpaths := -flexDevice_release_lpaths += ./../../../../../../external/CUDA/cuda-6.0-linux/targets/armv7-linux-androideabi/lib -flexDevice_release_lpaths += ./../../../lib/android -flexDevice_release_lpaths += ./../../../../../../external/android-ndk/android-ndk-r10e-linux/sources/cxx-stl/stlport/libs/armeabi-v7a -flexDevice_release_defines := $(flexDevice_custom_defines) -flexDevice_release_defines += android -flexDevice_release_defines += ANDROID=1 -flexDevice_release_defines += ANDROID_PLAT=1 -flexDevice_release_defines += DISABLE_IMPORTGL -flexDevice_release_libraries := -flexDevice_release_common_cflags := $(flexDevice_custom_cflags) -flexDevice_release_common_cflags += -MMD -flexDevice_release_common_cflags += $(addprefix -D, $(flexDevice_release_defines)) -flexDevice_release_common_cflags += $(addprefix -I, $(flexDevice_release_hpaths)) -flexDevice_release_cflags := $(flexDevice_release_common_cflags) -flexDevice_release_cflags += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions -flexDevice_release_cflags += -O3 -ffast-math -flexDevice_release_cppflags := $(flexDevice_release_common_cflags) -flexDevice_release_cppflags += -Wall -std=c++11 -fpermissive -fno-strict-aliasing -fno-rtti -fno-exceptions -flexDevice_release_cppflags += -O3 -ffast-math -flexDevice_release_lflags := $(flexDevice_custom_lflags) -flexDevice_release_lflags += $(addprefix -L, $(flexDevice_release_lpaths)) -flexDevice_release_lflags += -Wl,--start-group $(addprefix -l, $(flexDevice_release_libraries)) -Wl,--end-group -flexDevice_release_objsdir = $(OBJS_DIR)/flexDevice_release -flexDevice_release_cpp_o = $(addprefix $(flexDevice_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexDevice_cppfiles))))) -flexDevice_release_cc_o = $(addprefix $(flexDevice_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(flexDevice_ccfiles))))) -flexDevice_release_c_o = $(addprefix $(flexDevice_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.o, $(flexDevice_cfiles))))) -flexDevice_release_obj = $(flexDevice_release_cpp_o) $(flexDevice_release_cc_o) $(flexDevice_release_c_o) -flexDevice_release_bin := ./../../../lib/android/libflexDevice_x64.a - -clean_flexDevice_release: - @$(ECHO) clean flexDevice release - @$(RMDIR) $(flexDevice_release_objsdir) - @$(RMDIR) $(flexDevice_release_bin) - @$(RMDIR) $(DEPSDIR)/flexDevice/release - -build_flexDevice_release: postbuild_flexDevice_release -postbuild_flexDevice_release: mainbuild_flexDevice_release -mainbuild_flexDevice_release: prebuild_flexDevice_release $(flexDevice_release_bin) -prebuild_flexDevice_release: - -$(flexDevice_release_bin): $(flexDevice_release_obj) - mkdir -p `dirname ./../../../lib/android/libflexDevice_x64.a` - @$(AR) rcs $(flexDevice_release_bin) $(flexDevice_release_obj) - $(ECHO) building $@ complete! - -flexDevice_release_DEPDIR = $(dir $(@))/$(*F) -$(flexDevice_release_cpp_o): $(flexDevice_release_objsdir)/%.o: - $(ECHO) flexDevice: compiling release $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cppfiles))... - mkdir -p $(dir $(@)) - $(CXX) $(flexDevice_release_cppflags) -c $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cppfiles)) -o $@ - @mkdir -p $(dir $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cppfiles)))))) - cp $(flexDevice_release_DEPDIR).d $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cppfiles))))).P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexDevice_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cppfiles))))).P; \ - rm -f $(flexDevice_release_DEPDIR).d - -$(flexDevice_release_cc_o): $(flexDevice_release_objsdir)/%.o: - $(ECHO) flexDevice: compiling release $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_ccfiles))... - mkdir -p $(dir $(@)) - $(CXX) $(flexDevice_release_cppflags) -c $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_ccfiles)) -o $@ - mkdir -p $(dir $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_ccfiles)))))) - cp $(flexDevice_release_DEPDIR).d $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_ccfiles))))).release.P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexDevice_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_ccfiles))))).release.P; \ - rm -f $(flexDevice_release_DEPDIR).d - -$(flexDevice_release_c_o): $(flexDevice_release_objsdir)/%.o: - $(ECHO) flexDevice: compiling release $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cfiles))... - mkdir -p $(dir $(@)) - $(CC) $(flexDevice_release_cflags) -c $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cfiles)) -o $@ - @mkdir -p $(dir $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cfiles)))))) - cp $(flexDevice_release_DEPDIR).d $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cfiles))))).P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexDevice_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cfiles))))).P; \ - rm -f $(flexDevice_release_DEPDIR).d - -clean_flexDevice: clean_flexDevice_release - rm -rf $(DEPSDIR) - -export VERBOSE -ifndef VERBOSE -.SILENT: -endif diff --git a/demo/compiler/makeandroid/Makefile.flexExtCUDA.mk b/demo/compiler/makeandroid/Makefile.flexExtCUDA.mk deleted file mode 100644 index 9e4826c..0000000 --- a/demo/compiler/makeandroid/Makefile.flexExtCUDA.mk +++ /dev/null @@ -1,213 +0,0 @@ -# Makefile generated by XPJ for android --include Makefile.custom -ProjectName = flexExtCUDA -flexExtCUDA_cppfiles += ./../../../extensions/flexExtCloth.cpp -flexExtCUDA_cppfiles += ./../../../extensions/flexExtContainer.cpp -flexExtCUDA_cppfiles += ./../../../extensions/flexExtMovingFrame.cpp -flexExtCUDA_cppfiles += ./../../../extensions/flexExtRigid.cpp -flexExtCUDA_cppfiles += ./../../../extensions/flexExtSoft.cpp -flexExtCUDA_cuda_extensions_cuda_flexExt_cu += ./../../../extensions/cuda/flexExt.cu -flexExtCUDA_cppfiles += ./../../../core/sdf.cpp -flexExtCUDA_cppfiles += ./../../../core/voxelize.cpp -flexExtCUDA_cppfiles += ./../../../core/maths.cpp -flexExtCUDA_cppfiles += ./../../../core/aabbtree.cpp - -flexExtCUDA_cpp_release_dep = $(addprefix $(DEPSDIR)/flexExtCUDA/release/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.P, $(flexExtCUDA_cppfiles))))) -flexExtCUDA_cc_release_dep = $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.release.P, $(flexExtCUDA_ccfiles))))) -flexExtCUDA_c_release_dep = $(addprefix $(DEPSDIR)/flexExtCUDA/release/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.P, $(flexExtCUDA_cfiles))))) -flexExtCUDA_release_dep = $(flexExtCUDA_cpp_release_dep) $(flexExtCUDA_cc_release_dep) $(flexExtCUDA_c_release_dep) --include $(flexExtCUDA_release_dep) -flexExtCUDA_cpp_debug_dep = $(addprefix $(DEPSDIR)/flexExtCUDA/debug/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.P, $(flexExtCUDA_cppfiles))))) -flexExtCUDA_cc_debug_dep = $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.debug.P, $(flexExtCUDA_ccfiles))))) -flexExtCUDA_c_debug_dep = $(addprefix $(DEPSDIR)/flexExtCUDA/debug/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.P, $(flexExtCUDA_cfiles))))) -flexExtCUDA_debug_dep = $(flexExtCUDA_cpp_debug_dep) $(flexExtCUDA_cc_debug_dep) $(flexExtCUDA_c_debug_dep) --include $(flexExtCUDA_debug_dep) -flexExtCUDA_release_hpaths := -flexExtCUDA_release_hpaths += ./../../.. -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 += ./../../../../../../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_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_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 -flexExtCUDA_release_objsdir = $(OBJS_DIR)/flexExtCUDA_release -flexExtCUDA_release_cpp_o = $(addprefix $(flexExtCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexExtCUDA_cppfiles))))) -flexExtCUDA_release_cc_o = $(addprefix $(flexExtCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(flexExtCUDA_ccfiles))))) -flexExtCUDA_release_c_o = $(addprefix $(flexExtCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.o, $(flexExtCUDA_cfiles))))) -flexExtCUDA_release_cuda_extensions_cuda_flexExt_cu_o += $(OBJS_DIR)/flexExtCUDA_release/cuda/extensions/cudaflexExt.o -flexExtCUDA_release_obj = $(flexExtCUDA_release_cpp_o) $(flexExtCUDA_release_cc_o) $(flexExtCUDA_release_c_o) $(flexExtCUDA_release_cuda_extensions_cuda_flexExt_cu_o) -flexExtCUDA_release_bin := ./../../../lib/android/libflexExt_cuda_release_armv7l.a - -clean_flexExtCUDA_release: - @$(ECHO) clean flexExtCUDA release - @$(RMDIR) $(flexExtCUDA_release_objsdir) - @$(RMDIR) $(flexExtCUDA_release_bin) - @$(RMDIR) $(DEPSDIR)/flexExtCUDA/release - -build_flexExtCUDA_release: postbuild_flexExtCUDA_release -postbuild_flexExtCUDA_release: mainbuild_flexExtCUDA_release -mainbuild_flexExtCUDA_release: prebuild_flexExtCUDA_release $(flexExtCUDA_release_bin) -prebuild_flexExtCUDA_release: - -$(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) "../../../../../../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: - $(ECHO) flexExtCUDA: compiling release $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_cppfiles))... - mkdir -p $(dir $(@)) - $(CXX) $(flexExtCUDA_release_cppflags) -c $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_cppfiles)) -o $@ - @mkdir -p $(dir $(addprefix $(DEPSDIR)/flexExtCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_cppfiles)))))) - cp $(flexExtCUDA_release_DEPDIR).d $(addprefix $(DEPSDIR)/flexExtCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_cppfiles))))).P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexExtCUDA_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexExtCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_cppfiles))))).P; \ - rm -f $(flexExtCUDA_release_DEPDIR).d - -$(flexExtCUDA_release_cc_o): $(flexExtCUDA_release_objsdir)/%.o: - $(ECHO) flexExtCUDA: compiling release $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_ccfiles))... - mkdir -p $(dir $(@)) - $(CXX) $(flexExtCUDA_release_cppflags) -c $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_ccfiles)) -o $@ - mkdir -p $(dir $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_ccfiles)))))) - cp $(flexExtCUDA_release_DEPDIR).d $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_ccfiles))))).release.P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexExtCUDA_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_ccfiles))))).release.P; \ - rm -f $(flexExtCUDA_release_DEPDIR).d - -$(flexExtCUDA_release_c_o): $(flexExtCUDA_release_objsdir)/%.o: - $(ECHO) flexExtCUDA: compiling release $(filter %$(strip $(subst .c.o,.c, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_cfiles))... - mkdir -p $(dir $(@)) - $(CC) $(flexExtCUDA_release_cflags) -c $(filter %$(strip $(subst .c.o,.c, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_cfiles)) -o $@ - @mkdir -p $(dir $(addprefix $(DEPSDIR)/flexExtCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_cfiles)))))) - cp $(flexExtCUDA_release_DEPDIR).d $(addprefix $(DEPSDIR)/flexExtCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_cfiles))))).P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexExtCUDA_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexExtCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexExtCUDA_release_objsdir),, $@))), $(flexExtCUDA_cfiles))))).P; \ - rm -f $(flexExtCUDA_release_DEPDIR).d - -flexExtCUDA_debug_hpaths := -flexExtCUDA_debug_hpaths += ./../../.. -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 += ./../../../../../../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_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_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 -flexExtCUDA_debug_objsdir = $(OBJS_DIR)/flexExtCUDA_debug -flexExtCUDA_debug_cpp_o = $(addprefix $(flexExtCUDA_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexExtCUDA_cppfiles))))) -flexExtCUDA_debug_cc_o = $(addprefix $(flexExtCUDA_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(flexExtCUDA_ccfiles))))) -flexExtCUDA_debug_c_o = $(addprefix $(flexExtCUDA_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.o, $(flexExtCUDA_cfiles))))) -flexExtCUDA_debug_cuda_extensions_cuda_flexExt_cu_o += $(OBJS_DIR)/flexExtCUDA_debug/cuda/extensions/cudaflexExt.o -flexExtCUDA_debug_obj = $(flexExtCUDA_debug_cpp_o) $(flexExtCUDA_debug_cc_o) $(flexExtCUDA_debug_c_o) $(flexExtCUDA_debug_cuda_extensions_cuda_flexExt_cu_o) -flexExtCUDA_debug_bin := ./../../../lib/android/libflexExt_cuda_debug_armv7l.a - -clean_flexExtCUDA_debug: - @$(ECHO) clean flexExtCUDA debug - @$(RMDIR) $(flexExtCUDA_debug_objsdir) - @$(RMDIR) $(flexExtCUDA_debug_bin) - @$(RMDIR) $(DEPSDIR)/flexExtCUDA/debug - -build_flexExtCUDA_debug: postbuild_flexExtCUDA_debug -postbuild_flexExtCUDA_debug: mainbuild_flexExtCUDA_debug -mainbuild_flexExtCUDA_debug: prebuild_flexExtCUDA_debug $(flexExtCUDA_debug_bin) -prebuild_flexExtCUDA_debug: - -$(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) "../../../../../../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: - $(ECHO) flexExtCUDA: compiling debug $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_cppfiles))... - mkdir -p $(dir $(@)) - $(CXX) $(flexExtCUDA_debug_cppflags) -c $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_cppfiles)) -o $@ - @mkdir -p $(dir $(addprefix $(DEPSDIR)/flexExtCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_cppfiles)))))) - cp $(flexExtCUDA_debug_DEPDIR).d $(addprefix $(DEPSDIR)/flexExtCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_cppfiles))))).P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexExtCUDA_debug_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexExtCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_cppfiles))))).P; \ - rm -f $(flexExtCUDA_debug_DEPDIR).d - -$(flexExtCUDA_debug_cc_o): $(flexExtCUDA_debug_objsdir)/%.o: - $(ECHO) flexExtCUDA: compiling debug $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_ccfiles))... - mkdir -p $(dir $(@)) - $(CXX) $(flexExtCUDA_debug_cppflags) -c $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_ccfiles)) -o $@ - mkdir -p $(dir $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_ccfiles)))))) - cp $(flexExtCUDA_debug_DEPDIR).d $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_ccfiles))))).debug.P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexExtCUDA_debug_DEPDIR).d >> $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_ccfiles))))).debug.P; \ - rm -f $(flexExtCUDA_debug_DEPDIR).d - -$(flexExtCUDA_debug_c_o): $(flexExtCUDA_debug_objsdir)/%.o: - $(ECHO) flexExtCUDA: compiling debug $(filter %$(strip $(subst .c.o,.c, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_cfiles))... - mkdir -p $(dir $(@)) - $(CC) $(flexExtCUDA_debug_cflags) -c $(filter %$(strip $(subst .c.o,.c, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_cfiles)) -o $@ - @mkdir -p $(dir $(addprefix $(DEPSDIR)/flexExtCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_cfiles)))))) - cp $(flexExtCUDA_debug_DEPDIR).d $(addprefix $(DEPSDIR)/flexExtCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_cfiles))))).P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexExtCUDA_debug_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexExtCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexExtCUDA_debug_objsdir),, $@))), $(flexExtCUDA_cfiles))))).P; \ - rm -f $(flexExtCUDA_debug_DEPDIR).d - -clean_flexExtCUDA: clean_flexExtCUDA_release clean_flexExtCUDA_debug - rm -rf $(DEPSDIR) - -export VERBOSE -ifndef VERBOSE -.SILENT: -endif diff --git a/demo/compiler/makelinux64/Makefile.flexCUDA.mk b/demo/compiler/makelinux64/Makefile.flexCUDA.mk deleted file mode 100644 index 3d3b9cd..0000000 --- a/demo/compiler/makelinux64/Makefile.flexCUDA.mk +++ /dev/null @@ -1,217 +0,0 @@ -# Makefile generated by XPJ for linux64 --include Makefile.custom -ProjectName = flexCUDA -flexCUDA_cppfiles += ./../../../src/cuda/util.cpp -flexCUDA_cuda_src_cuda_bvh_cu += ./../../../src/cuda/bvh.cu -flexCUDA_cuda_src_cuda_flex_cu += ./../../../src/cuda/flex.cu -flexCUDA_cuda_src_cuda_sort_cu += ./../../../src/cuda/sort.cu - -flexCUDA_cpp_release_dep = $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.P, $(flexCUDA_cppfiles))))) -flexCUDA_cc_release_dep = $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.release.P, $(flexCUDA_ccfiles))))) -flexCUDA_c_release_dep = $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.P, $(flexCUDA_cfiles))))) -flexCUDA_release_dep = $(flexCUDA_cpp_release_dep) $(flexCUDA_cc_release_dep) $(flexCUDA_c_release_dep) --include $(flexCUDA_release_dep) -flexCUDA_cpp_debug_dep = $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.P, $(flexCUDA_cppfiles))))) -flexCUDA_cc_debug_dep = $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.debug.P, $(flexCUDA_ccfiles))))) -flexCUDA_c_debug_dep = $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.P, $(flexCUDA_cfiles))))) -flexCUDA_debug_dep = $(flexCUDA_cpp_debug_dep) $(flexCUDA_cc_debug_dep) $(flexCUDA_c_debug_dep) --include $(flexCUDA_debug_dep) -flexCUDA_release_hpaths := -flexCUDA_release_hpaths += ./../../../../../../external/CUDA/8.0.44-linux/include -flexCUDA_release_hpaths += ./../../../../../../external/CUDA/8.0.44-linux/extras/cupti/include -flexCUDA_release_hpaths += ./../../.. -flexCUDA_release_lpaths := -flexCUDA_release_lpaths += ./../../../../../../external/CUDA/8.0.44-linux/lib64 -flexCUDA_release_defines := $(flexCUDA_custom_defines) -flexCUDA_release_libraries := -flexCUDA_release_libraries += ./../../../lib/linux64/NvFlexDevice_x64.a -flexCUDA_release_common_cflags := $(flexCUDA_custom_cflags) -flexCUDA_release_common_cflags += -MMD -flexCUDA_release_common_cflags += $(addprefix -D, $(flexCUDA_release_defines)) -flexCUDA_release_common_cflags += $(addprefix -I, $(flexCUDA_release_hpaths)) -flexCUDA_release_common_cflags += -m64 -flexCUDA_release_cflags := $(flexCUDA_release_common_cflags) -flexCUDA_release_cflags += -Wall -std=c++0x -fPIC -fpermissive -fno-strict-aliasing -flexCUDA_release_cflags += -O3 -ffast-math -DNDEBUG -flexCUDA_release_cppflags := $(flexCUDA_release_common_cflags) -flexCUDA_release_cppflags += -Wall -std=c++0x -fPIC -fpermissive -fno-strict-aliasing -flexCUDA_release_cppflags += -O3 -ffast-math -DNDEBUG -flexCUDA_release_lflags := $(flexCUDA_custom_lflags) -flexCUDA_release_lflags += $(addprefix -L, $(flexCUDA_release_lpaths)) -flexCUDA_release_lflags += -Wl,--start-group $(addprefix -l, $(flexCUDA_release_libraries)) -Wl,--end-group -flexCUDA_release_lflags += -m64 -flexCUDA_release_objsdir = $(OBJS_DIR)/flexCUDA_release -flexCUDA_release_cpp_o = $(addprefix $(flexCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexCUDA_cppfiles))))) -flexCUDA_release_cc_o = $(addprefix $(flexCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(flexCUDA_ccfiles))))) -flexCUDA_release_c_o = $(addprefix $(flexCUDA_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.o, $(flexCUDA_cfiles))))) -flexCUDA_release_cuda_src_cuda_bvh_cu_o += $(OBJS_DIR)/flexCUDA_release/cuda/src/cudabvh.o -flexCUDA_release_cuda_src_cuda_flex_cu_o += $(OBJS_DIR)/flexCUDA_release/cuda/src/cudaflex.o -flexCUDA_release_cuda_src_cuda_sort_cu_o += $(OBJS_DIR)/flexCUDA_release/cuda/src/cudasort.o -flexCUDA_release_obj = $(flexCUDA_release_cpp_o) $(flexCUDA_release_cc_o) $(flexCUDA_release_c_o) $(flexCUDA_release_cuda_src_cuda_bvh_cu_o) $(flexCUDA_release_cuda_src_cuda_flex_cu_o) $(flexCUDA_release_cuda_src_cuda_sort_cu_o) -flexCUDA_release_bin := ./../../../lib/linux64/NvFlexReleaseCUDA_x64.a - -clean_flexCUDA_release: - @$(ECHO) clean flexCUDA release - @$(RMDIR) $(flexCUDA_release_objsdir) - @$(RMDIR) $(flexCUDA_release_bin) - @$(RMDIR) $(DEPSDIR)/flexCUDA/release - -build_flexCUDA_release: postbuild_flexCUDA_release -postbuild_flexCUDA_release: mainbuild_flexCUDA_release -mainbuild_flexCUDA_release: prebuild_flexCUDA_release $(flexCUDA_release_bin) -prebuild_flexCUDA_release: - -$(flexCUDA_release_bin): $(flexCUDA_release_obj) - mkdir -p `dirname ./../../../lib/linux64/NvFlexReleaseCUDA_x64.a` - @$(AR) rcs $(flexCUDA_release_bin) $(flexCUDA_release_obj) - $(ECHO) building $@ complete! - -$(flexCUDA_release_cuda_src_cuda_bvh_cu_o): $(flexCUDA_cuda_src_cuda_bvh_cu) - @mkdir -p `dirname $(OBJS_DIR)/flexCUDA_release/cuda/src/cudabvh.o` - $(ECHO) ../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2 --compile "../../../src/cuda/bvh.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudabvh.o" - ../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2 --compile "../../../src/cuda/bvh.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudabvh.o" - -$(flexCUDA_release_cuda_src_cuda_flex_cu_o): $(flexCUDA_cuda_src_cuda_flex_cu) - @mkdir -p `dirname $(OBJS_DIR)/flexCUDA_release/cuda/src/cudaflex.o` - $(ECHO) ../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2 --compile "../../../src/cuda/flex.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudaflex.o" - ../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2 --compile "../../../src/cuda/flex.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudaflex.o" - -$(flexCUDA_release_cuda_src_cuda_sort_cu_o): $(flexCUDA_cuda_src_cuda_sort_cu) - @mkdir -p `dirname $(OBJS_DIR)/flexCUDA_release/cuda/src/cudasort.o` - $(ECHO) ../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2 --compile "../../../src/cuda/sort.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudasort.o" - ../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2 --compile "../../../src/cuda/sort.cu" -o "$(OBJS_DIR)/flexCUDA_release/cuda/src/cudasort.o" - -flexCUDA_release_DEPDIR = $(dir $(@))/$(*F) -$(flexCUDA_release_cpp_o): $(flexCUDA_release_objsdir)/%.o: - $(ECHO) flexCUDA: compiling release $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cppfiles))... - mkdir -p $(dir $(@)) - $(CXX) $(flexCUDA_release_cppflags) -c $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cppfiles)) -o $@ - @mkdir -p $(dir $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cppfiles)))))) - cp $(flexCUDA_release_DEPDIR).d $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cppfiles))))).P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexCUDA_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cppfiles))))).P; \ - rm -f $(flexCUDA_release_DEPDIR).d - -$(flexCUDA_release_cc_o): $(flexCUDA_release_objsdir)/%.o: - $(ECHO) flexCUDA: compiling release $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_ccfiles))... - mkdir -p $(dir $(@)) - $(CXX) $(flexCUDA_release_cppflags) -c $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_ccfiles)) -o $@ - mkdir -p $(dir $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_ccfiles)))))) - cp $(flexCUDA_release_DEPDIR).d $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_ccfiles))))).release.P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexCUDA_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_ccfiles))))).release.P; \ - rm -f $(flexCUDA_release_DEPDIR).d - -$(flexCUDA_release_c_o): $(flexCUDA_release_objsdir)/%.o: - $(ECHO) flexCUDA: compiling release $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cfiles))... - mkdir -p $(dir $(@)) - $(CC) $(flexCUDA_release_cflags) -c $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cfiles)) -o $@ - @mkdir -p $(dir $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cfiles)))))) - cp $(flexCUDA_release_DEPDIR).d $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cfiles))))).P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexCUDA_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexCUDA/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_release_objsdir),, $@))), $(flexCUDA_cfiles))))).P; \ - rm -f $(flexCUDA_release_DEPDIR).d - -flexCUDA_debug_hpaths := -flexCUDA_debug_hpaths += ./../../../../../../external/CUDA/8.0.44-linux/include -flexCUDA_debug_hpaths += ./../../../../../../external/CUDA/8.0.44-linux/extras/cupti/include -flexCUDA_debug_hpaths += ./../../.. -flexCUDA_debug_lpaths := -flexCUDA_debug_lpaths += ./../../../../../../external/CUDA/8.0.44-linux/lib64 -flexCUDA_debug_defines := $(flexCUDA_custom_defines) -flexCUDA_debug_libraries := -flexCUDA_debug_libraries += ./../../../lib/linux64/NvFlexDevice_x64.a -flexCUDA_debug_common_cflags := $(flexCUDA_custom_cflags) -flexCUDA_debug_common_cflags += -MMD -flexCUDA_debug_common_cflags += $(addprefix -D, $(flexCUDA_debug_defines)) -flexCUDA_debug_common_cflags += $(addprefix -I, $(flexCUDA_debug_hpaths)) -flexCUDA_debug_common_cflags += -m64 -flexCUDA_debug_cflags := $(flexCUDA_debug_common_cflags) -flexCUDA_debug_cflags += -Wall -std=c++0x -fPIC -fpermissive -fno-strict-aliasing -flexCUDA_debug_cflags += -g -O0 -flexCUDA_debug_cppflags := $(flexCUDA_debug_common_cflags) -flexCUDA_debug_cppflags += -Wall -std=c++0x -fPIC -fpermissive -fno-strict-aliasing -flexCUDA_debug_cppflags += -g -O0 -flexCUDA_debug_lflags := $(flexCUDA_custom_lflags) -flexCUDA_debug_lflags += $(addprefix -L, $(flexCUDA_debug_lpaths)) -flexCUDA_debug_lflags += -Wl,--start-group $(addprefix -l, $(flexCUDA_debug_libraries)) -Wl,--end-group -flexCUDA_debug_lflags += -m64 -flexCUDA_debug_objsdir = $(OBJS_DIR)/flexCUDA_debug -flexCUDA_debug_cpp_o = $(addprefix $(flexCUDA_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexCUDA_cppfiles))))) -flexCUDA_debug_cc_o = $(addprefix $(flexCUDA_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(flexCUDA_ccfiles))))) -flexCUDA_debug_c_o = $(addprefix $(flexCUDA_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.o, $(flexCUDA_cfiles))))) -flexCUDA_debug_cuda_src_cuda_bvh_cu_o += $(OBJS_DIR)/flexCUDA_debug/cuda/src/cudabvh.o -flexCUDA_debug_cuda_src_cuda_flex_cu_o += $(OBJS_DIR)/flexCUDA_debug/cuda/src/cudaflex.o -flexCUDA_debug_cuda_src_cuda_sort_cu_o += $(OBJS_DIR)/flexCUDA_debug/cuda/src/cudasort.o -flexCUDA_debug_obj = $(flexCUDA_debug_cpp_o) $(flexCUDA_debug_cc_o) $(flexCUDA_debug_c_o) $(flexCUDA_debug_cuda_src_cuda_bvh_cu_o) $(flexCUDA_debug_cuda_src_cuda_flex_cu_o) $(flexCUDA_debug_cuda_src_cuda_sort_cu_o) -flexCUDA_debug_bin := ./../../../lib/linux64/NvFlexDebugCUDA_x64.a - -clean_flexCUDA_debug: - @$(ECHO) clean flexCUDA debug - @$(RMDIR) $(flexCUDA_debug_objsdir) - @$(RMDIR) $(flexCUDA_debug_bin) - @$(RMDIR) $(DEPSDIR)/flexCUDA/debug - -build_flexCUDA_debug: postbuild_flexCUDA_debug -postbuild_flexCUDA_debug: mainbuild_flexCUDA_debug -mainbuild_flexCUDA_debug: prebuild_flexCUDA_debug $(flexCUDA_debug_bin) -prebuild_flexCUDA_debug: - -$(flexCUDA_debug_bin): $(flexCUDA_debug_obj) - mkdir -p `dirname ./../../../lib/linux64/NvFlexDebugCUDA_x64.a` - @$(AR) rcs $(flexCUDA_debug_bin) $(flexCUDA_debug_obj) - $(ECHO) building $@ complete! - -$(flexCUDA_debug_cuda_src_cuda_bvh_cu_o): $(flexCUDA_cuda_src_cuda_bvh_cu) - @mkdir -p `dirname $(OBJS_DIR)/flexCUDA_debug/cuda/src/cudabvh.o` - $(ECHO) ../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2 --compile "../../../src/cuda/bvh.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudabvh.o" - ../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2 --compile "../../../src/cuda/bvh.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudabvh.o" - -$(flexCUDA_debug_cuda_src_cuda_flex_cu_o): $(flexCUDA_cuda_src_cuda_flex_cu) - @mkdir -p `dirname $(OBJS_DIR)/flexCUDA_debug/cuda/src/cudaflex.o` - $(ECHO) ../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2 --compile "../../../src/cuda/flex.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudaflex.o" - ../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2 --compile "../../../src/cuda/flex.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudaflex.o" - -$(flexCUDA_debug_cuda_src_cuda_sort_cu_o): $(flexCUDA_cuda_src_cuda_sort_cu) - @mkdir -p `dirname $(OBJS_DIR)/flexCUDA_debug/cuda/src/cudasort.o` - $(ECHO) ../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2 --compile "../../../src/cuda/sort.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudasort.o" - ../../../../../../external/CUDA/8.0.44-linux/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES -I../../.. -I../../../external -I../../../../../../external/CUDA/8.0.44-linux/include -I../../../external/cub-1.3.2 --compile "../../../src/cuda/sort.cu" -o "$(OBJS_DIR)/flexCUDA_debug/cuda/src/cudasort.o" - -flexCUDA_debug_DEPDIR = $(dir $(@))/$(*F) -$(flexCUDA_debug_cpp_o): $(flexCUDA_debug_objsdir)/%.o: - $(ECHO) flexCUDA: compiling debug $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cppfiles))... - mkdir -p $(dir $(@)) - $(CXX) $(flexCUDA_debug_cppflags) -c $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cppfiles)) -o $@ - @mkdir -p $(dir $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cppfiles)))))) - cp $(flexCUDA_debug_DEPDIR).d $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cppfiles))))).P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexCUDA_debug_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cppfiles))))).P; \ - rm -f $(flexCUDA_debug_DEPDIR).d - -$(flexCUDA_debug_cc_o): $(flexCUDA_debug_objsdir)/%.o: - $(ECHO) flexCUDA: compiling debug $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_ccfiles))... - mkdir -p $(dir $(@)) - $(CXX) $(flexCUDA_debug_cppflags) -c $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_ccfiles)) -o $@ - mkdir -p $(dir $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_ccfiles)))))) - cp $(flexCUDA_debug_DEPDIR).d $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_ccfiles))))).debug.P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexCUDA_debug_DEPDIR).d >> $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_ccfiles))))).debug.P; \ - rm -f $(flexCUDA_debug_DEPDIR).d - -$(flexCUDA_debug_c_o): $(flexCUDA_debug_objsdir)/%.o: - $(ECHO) flexCUDA: compiling debug $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cfiles))... - mkdir -p $(dir $(@)) - $(CC) $(flexCUDA_debug_cflags) -c $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cfiles)) -o $@ - @mkdir -p $(dir $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cfiles)))))) - cp $(flexCUDA_debug_DEPDIR).d $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cfiles))))).P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexCUDA_debug_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexCUDA/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexCUDA_debug_objsdir),, $@))), $(flexCUDA_cfiles))))).P; \ - rm -f $(flexCUDA_debug_DEPDIR).d - -clean_flexCUDA: clean_flexCUDA_release clean_flexCUDA_debug - rm -rf $(DEPSDIR) - -export VERBOSE -ifndef VERBOSE -.SILENT: -endif diff --git a/demo/compiler/makelinux64/Makefile.flexDemoCUDA.mk b/demo/compiler/makelinux64/Makefile.flexDemoCUDA.mk index f37fc83..5737c66 100644 --- a/demo/compiler/makelinux64/Makefile.flexDemoCUDA.mk +++ b/demo/compiler/makelinux64/Makefile.flexDemoCUDA.mk @@ -3,9 +3,7 @@ ProjectName = flexDemoCUDA flexDemoCUDA_cppfiles += ./../../imgui.cpp flexDemoCUDA_cppfiles += ./../../main.cpp -flexDemoCUDA_cppfiles += ./../../opengl/imguiRenderGL.cpp -flexDemoCUDA_cppfiles += ./../../opengl/shader.cpp -flexDemoCUDA_cppfiles += ./../../opengl/shadersGL.cpp +flexDemoCUDA_cppfiles += ./../../shadersDemoContext.cpp flexDemoCUDA_cppfiles += ./../../../core/aabbtree.cpp flexDemoCUDA_cppfiles += ./../../../core/core.cpp flexDemoCUDA_cppfiles += ./../../../core/extrude.cpp @@ -14,9 +12,13 @@ flexDemoCUDA_cppfiles += ./../../../core/mesh.cpp flexDemoCUDA_cppfiles += ./../../../core/perlin.cpp flexDemoCUDA_cppfiles += ./../../../core/pfm.cpp flexDemoCUDA_cppfiles += ./../../../core/platform.cpp +flexDemoCUDA_cppfiles += ./../../../core/png.cpp flexDemoCUDA_cppfiles += ./../../../core/sdf.cpp flexDemoCUDA_cppfiles += ./../../../core/tga.cpp flexDemoCUDA_cppfiles += ./../../../core/voxelize.cpp +flexDemoCUDA_cppfiles += ./../../opengl/imguiRenderGL.cpp +flexDemoCUDA_cppfiles += ./../../opengl/shader.cpp +flexDemoCUDA_cppfiles += ./../../opengl/shadersGL.cpp 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))))) @@ -29,11 +31,11 @@ flexDemoCUDA_c_debug_dep = $(addprefix $(DEPSDIR)/flexDemoCUDA/debug/, $(su flexDemoCUDA_debug_dep = $(flexDemoCUDA_cpp_debug_dep) $(flexDemoCUDA_cc_debug_dep) $(flexDemoCUDA_c_debug_dep) -include $(flexDemoCUDA_debug_dep) flexDemoCUDA_release_hpaths := -flexDemoCUDA_release_hpaths += $(CUDA_PATH)/include -flexDemoCUDA_release_hpaths += $(CUDA_PATH)/extras/cupti/include +flexDemoCUDA_release_hpaths += /usr/local/cuda/include +flexDemoCUDA_release_hpaths += /usr/local/cuda/extras/cupti/include flexDemoCUDA_release_hpaths += ./../../.. flexDemoCUDA_release_lpaths := -flexDemoCUDA_release_lpaths += $(CUDA_PATH)/lib64 +flexDemoCUDA_release_lpaths += /usr/local/cuda/lib64 flexDemoCUDA_release_lpaths += ./../../../lib/linux64 flexDemoCUDA_release_defines := $(flexDemoCUDA_custom_defines) flexDemoCUDA_release_libraries := @@ -54,7 +56,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 -lrt -pthread +flexDemoCUDA_release_lflags += -g -L/usr/lib -L"../../../lib/linux64" -L../../../external/SDL2-2.0.4/lib/x64/ -L/usr/local/cuda/lib64 -lGL -lglut -lGLU -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))))) @@ -111,11 +113,11 @@ $(flexDemoCUDA_release_c_o): $(flexDemoCUDA_release_objsdir)/%.o: rm -f $(flexDemoCUDA_release_DEPDIR).d flexDemoCUDA_debug_hpaths := -flexDemoCUDA_debug_hpaths += $(CUDA_PATH)/include -flexDemoCUDA_debug_hpaths += $(CUDA_PATH)/extras/cupti/include +flexDemoCUDA_debug_hpaths += /usr/local/cuda/include +flexDemoCUDA_debug_hpaths += /usr/local/cuda/extras/cupti/include flexDemoCUDA_debug_hpaths += ./../../.. flexDemoCUDA_debug_lpaths := -flexDemoCUDA_debug_lpaths += $(CUDA_PATH)/lib64 +flexDemoCUDA_debug_lpaths += /usr/local/cuda/lib64 flexDemoCUDA_debug_lpaths += ./../../../lib/linux64 flexDemoCUDA_debug_defines := $(flexDemoCUDA_custom_defines) flexDemoCUDA_debug_libraries := @@ -136,7 +138,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 -lrt -pthread +flexDemoCUDA_debug_lflags += -g -L/usr/lib -L"../../../lib/linux64" -L../../../external/SDL2-2.0.4/lib/x64/ -L/usr/local/cuda/lib64 -lGL -lglut -lGLU -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/makelinux64/Makefile.flexDevice.mk b/demo/compiler/makelinux64/Makefile.flexDevice.mk deleted file mode 100644 index 6bea080..0000000 --- a/demo/compiler/makelinux64/Makefile.flexDevice.mk +++ /dev/null @@ -1,177 +0,0 @@ -# Makefile generated by XPJ for linux64 --include Makefile.custom -ProjectName = flexDevice -flexDevice_cppfiles += ./../../../src/device/PhysXDevice.cpp -flexDevice_cppfiles += ./../../../src/device/flexDevice.cpp - -flexDevice_cpp_release_dep = $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.P, $(flexDevice_cppfiles))))) -flexDevice_cc_release_dep = $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.release.P, $(flexDevice_ccfiles))))) -flexDevice_c_release_dep = $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.P, $(flexDevice_cfiles))))) -flexDevice_release_dep = $(flexDevice_cpp_release_dep) $(flexDevice_cc_release_dep) $(flexDevice_c_release_dep) --include $(flexDevice_release_dep) -flexDevice_cpp_debug_dep = $(addprefix $(DEPSDIR)/flexDevice/debug/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.P, $(flexDevice_cppfiles))))) -flexDevice_cc_debug_dep = $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.debug.P, $(flexDevice_ccfiles))))) -flexDevice_c_debug_dep = $(addprefix $(DEPSDIR)/flexDevice/debug/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.P, $(flexDevice_cfiles))))) -flexDevice_debug_dep = $(flexDevice_cpp_debug_dep) $(flexDevice_cc_debug_dep) $(flexDevice_c_debug_dep) --include $(flexDevice_debug_dep) -flexDevice_release_hpaths := -flexDevice_release_hpaths += ./../../../../../../external/CUDA/8.0.44-linux/include -flexDevice_release_hpaths += ./../../../../../../external/CUDA/8.0.44-linux/extras/cupti/include -flexDevice_release_hpaths += ./../../.. -flexDevice_release_lpaths := -flexDevice_release_lpaths += ./../../../../../../external/CUDA/8.0.44-linux/lib64 -flexDevice_release_defines := $(flexDevice_custom_defines) -flexDevice_release_libraries := -flexDevice_release_common_cflags := $(flexDevice_custom_cflags) -flexDevice_release_common_cflags += -MMD -flexDevice_release_common_cflags += $(addprefix -D, $(flexDevice_release_defines)) -flexDevice_release_common_cflags += $(addprefix -I, $(flexDevice_release_hpaths)) -flexDevice_release_common_cflags += -m64 -flexDevice_release_cflags := $(flexDevice_release_common_cflags) -flexDevice_release_cflags += -Wall -std=c++0x -fPIC -fpermissive -fno-strict-aliasing -flexDevice_release_cflags += -O3 -ffast-math -DNDEBUG -flexDevice_release_cppflags := $(flexDevice_release_common_cflags) -flexDevice_release_cppflags += -Wall -std=c++0x -fPIC -fpermissive -fno-strict-aliasing -flexDevice_release_cppflags += -O3 -ffast-math -DNDEBUG -flexDevice_release_lflags := $(flexDevice_custom_lflags) -flexDevice_release_lflags += $(addprefix -L, $(flexDevice_release_lpaths)) -flexDevice_release_lflags += -Wl,--start-group $(addprefix -l, $(flexDevice_release_libraries)) -Wl,--end-group -flexDevice_release_lflags += -m64 -flexDevice_release_objsdir = $(OBJS_DIR)/flexDevice_release -flexDevice_release_cpp_o = $(addprefix $(flexDevice_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexDevice_cppfiles))))) -flexDevice_release_cc_o = $(addprefix $(flexDevice_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(flexDevice_ccfiles))))) -flexDevice_release_c_o = $(addprefix $(flexDevice_release_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.o, $(flexDevice_cfiles))))) -flexDevice_release_obj = $(flexDevice_release_cpp_o) $(flexDevice_release_cc_o) $(flexDevice_release_c_o) -flexDevice_release_bin := ./../../../lib/linux64/NvFlexDeviceRelease_x64.a - -clean_flexDevice_release: - @$(ECHO) clean flexDevice release - @$(RMDIR) $(flexDevice_release_objsdir) - @$(RMDIR) $(flexDevice_release_bin) - @$(RMDIR) $(DEPSDIR)/flexDevice/release - -build_flexDevice_release: postbuild_flexDevice_release -postbuild_flexDevice_release: mainbuild_flexDevice_release -mainbuild_flexDevice_release: prebuild_flexDevice_release $(flexDevice_release_bin) -prebuild_flexDevice_release: - -$(flexDevice_release_bin): $(flexDevice_release_obj) - mkdir -p `dirname ./../../../lib/linux64/NvFlexDeviceRelease_x64.a` - @$(AR) rcs $(flexDevice_release_bin) $(flexDevice_release_obj) - $(ECHO) building $@ complete! - -flexDevice_release_DEPDIR = $(dir $(@))/$(*F) -$(flexDevice_release_cpp_o): $(flexDevice_release_objsdir)/%.o: - $(ECHO) flexDevice: compiling release $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cppfiles))... - mkdir -p $(dir $(@)) - $(CXX) $(flexDevice_release_cppflags) -c $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cppfiles)) -o $@ - @mkdir -p $(dir $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cppfiles)))))) - cp $(flexDevice_release_DEPDIR).d $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cppfiles))))).P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexDevice_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cppfiles))))).P; \ - rm -f $(flexDevice_release_DEPDIR).d - -$(flexDevice_release_cc_o): $(flexDevice_release_objsdir)/%.o: - $(ECHO) flexDevice: compiling release $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_ccfiles))... - mkdir -p $(dir $(@)) - $(CXX) $(flexDevice_release_cppflags) -c $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_ccfiles)) -o $@ - mkdir -p $(dir $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_ccfiles)))))) - cp $(flexDevice_release_DEPDIR).d $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_ccfiles))))).release.P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexDevice_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_ccfiles))))).release.P; \ - rm -f $(flexDevice_release_DEPDIR).d - -$(flexDevice_release_c_o): $(flexDevice_release_objsdir)/%.o: - $(ECHO) flexDevice: compiling release $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cfiles))... - mkdir -p $(dir $(@)) - $(CC) $(flexDevice_release_cflags) -c $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cfiles)) -o $@ - @mkdir -p $(dir $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cfiles)))))) - cp $(flexDevice_release_DEPDIR).d $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cfiles))))).P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexDevice_release_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexDevice/release/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_release_objsdir),, $@))), $(flexDevice_cfiles))))).P; \ - rm -f $(flexDevice_release_DEPDIR).d - -flexDevice_debug_hpaths := -flexDevice_debug_hpaths += ./../../../../../../external/CUDA/8.0.44-linux/include -flexDevice_debug_hpaths += ./../../../../../../external/CUDA/8.0.44-linux/extras/cupti/include -flexDevice_debug_hpaths += ./../../.. -flexDevice_debug_lpaths := -flexDevice_debug_lpaths += ./../../../../../../external/CUDA/8.0.44-linux/lib64 -flexDevice_debug_defines := $(flexDevice_custom_defines) -flexDevice_debug_libraries := -flexDevice_debug_common_cflags := $(flexDevice_custom_cflags) -flexDevice_debug_common_cflags += -MMD -flexDevice_debug_common_cflags += $(addprefix -D, $(flexDevice_debug_defines)) -flexDevice_debug_common_cflags += $(addprefix -I, $(flexDevice_debug_hpaths)) -flexDevice_debug_common_cflags += -m64 -flexDevice_debug_cflags := $(flexDevice_debug_common_cflags) -flexDevice_debug_cflags += -Wall -std=c++0x -fPIC -fpermissive -fno-strict-aliasing -flexDevice_debug_cflags += -g -O0 -flexDevice_debug_cppflags := $(flexDevice_debug_common_cflags) -flexDevice_debug_cppflags += -Wall -std=c++0x -fPIC -fpermissive -fno-strict-aliasing -flexDevice_debug_cppflags += -g -O0 -flexDevice_debug_lflags := $(flexDevice_custom_lflags) -flexDevice_debug_lflags += $(addprefix -L, $(flexDevice_debug_lpaths)) -flexDevice_debug_lflags += -Wl,--start-group $(addprefix -l, $(flexDevice_debug_libraries)) -Wl,--end-group -flexDevice_debug_lflags += -m64 -flexDevice_debug_objsdir = $(OBJS_DIR)/flexDevice_debug -flexDevice_debug_cpp_o = $(addprefix $(flexDevice_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cpp, %.cpp.o, $(flexDevice_cppfiles))))) -flexDevice_debug_cc_o = $(addprefix $(flexDevice_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.cc, %.cc.o, $(flexDevice_ccfiles))))) -flexDevice_debug_c_o = $(addprefix $(flexDevice_debug_objsdir)/, $(subst ./, , $(subst ../, , $(patsubst %.c, %.c.o, $(flexDevice_cfiles))))) -flexDevice_debug_obj = $(flexDevice_debug_cpp_o) $(flexDevice_debug_cc_o) $(flexDevice_debug_c_o) -flexDevice_debug_bin := ./../../../lib/linux64/NvFlexDeviceDebug_x64.a - -clean_flexDevice_debug: - @$(ECHO) clean flexDevice debug - @$(RMDIR) $(flexDevice_debug_objsdir) - @$(RMDIR) $(flexDevice_debug_bin) - @$(RMDIR) $(DEPSDIR)/flexDevice/debug - -build_flexDevice_debug: postbuild_flexDevice_debug -postbuild_flexDevice_debug: mainbuild_flexDevice_debug -mainbuild_flexDevice_debug: prebuild_flexDevice_debug $(flexDevice_debug_bin) -prebuild_flexDevice_debug: - -$(flexDevice_debug_bin): $(flexDevice_debug_obj) - mkdir -p `dirname ./../../../lib/linux64/NvFlexDeviceDebug_x64.a` - @$(AR) rcs $(flexDevice_debug_bin) $(flexDevice_debug_obj) - $(ECHO) building $@ complete! - -flexDevice_debug_DEPDIR = $(dir $(@))/$(*F) -$(flexDevice_debug_cpp_o): $(flexDevice_debug_objsdir)/%.o: - $(ECHO) flexDevice: compiling debug $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_cppfiles))... - mkdir -p $(dir $(@)) - $(CXX) $(flexDevice_debug_cppflags) -c $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_cppfiles)) -o $@ - @mkdir -p $(dir $(addprefix $(DEPSDIR)/flexDevice/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_cppfiles)))))) - cp $(flexDevice_debug_DEPDIR).d $(addprefix $(DEPSDIR)/flexDevice/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_cppfiles))))).P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexDevice_debug_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexDevice/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cpp.o,.cpp, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_cppfiles))))).P; \ - rm -f $(flexDevice_debug_DEPDIR).d - -$(flexDevice_debug_cc_o): $(flexDevice_debug_objsdir)/%.o: - $(ECHO) flexDevice: compiling debug $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_ccfiles))... - mkdir -p $(dir $(@)) - $(CXX) $(flexDevice_debug_cppflags) -c $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_ccfiles)) -o $@ - mkdir -p $(dir $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_ccfiles)))))) - cp $(flexDevice_debug_DEPDIR).d $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_ccfiles))))).debug.P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexDevice_debug_DEPDIR).d >> $(addprefix $(DEPSDIR)/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .cc.o,.cc, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_ccfiles))))).debug.P; \ - rm -f $(flexDevice_debug_DEPDIR).d - -$(flexDevice_debug_c_o): $(flexDevice_debug_objsdir)/%.o: - $(ECHO) flexDevice: compiling debug $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_cfiles))... - mkdir -p $(dir $(@)) - $(CC) $(flexDevice_debug_cflags) -c $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_cfiles)) -o $@ - @mkdir -p $(dir $(addprefix $(DEPSDIR)/flexDevice/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_cfiles)))))) - cp $(flexDevice_debug_DEPDIR).d $(addprefix $(DEPSDIR)/flexDevice/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_cfiles))))).P; \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(flexDevice_debug_DEPDIR).d >> $(addprefix $(DEPSDIR)/flexDevice/debug/, $(subst ./, , $(subst ../, , $(filter %$(strip $(subst .c.o,.c, $(subst $(flexDevice_debug_objsdir),, $@))), $(flexDevice_cfiles))))).P; \ - rm -f $(flexDevice_debug_DEPDIR).d - -clean_flexDevice: clean_flexDevice_release clean_flexDevice_debug - rm -rf $(DEPSDIR) - -export VERBOSE -ifndef VERBOSE -.SILENT: -endif diff --git a/demo/compiler/makelinux64/Makefile.flexExtCUDA.mk b/demo/compiler/makelinux64/Makefile.flexExtCUDA.mk index 78dd100..c0c766e 100644 --- a/demo/compiler/makelinux64/Makefile.flexExtCUDA.mk +++ b/demo/compiler/makelinux64/Makefile.flexExtCUDA.mk @@ -23,12 +23,12 @@ flexExtCUDA_c_debug_dep = $(addprefix $(DEPSDIR)/flexExtCUDA/debug/, $(subs flexExtCUDA_debug_dep = $(flexExtCUDA_cpp_debug_dep) $(flexExtCUDA_cc_debug_dep) $(flexExtCUDA_c_debug_dep) -include $(flexExtCUDA_debug_dep) flexExtCUDA_release_hpaths := -flexExtCUDA_release_hpaths += $(CUDA_PATH)/include -flexExtCUDA_release_hpaths += $(CUDA_PATH)/extras/cupti/include +flexExtCUDA_release_hpaths += /usr/local/cuda/include +flexExtCUDA_release_hpaths += /usr/local/cuda/extras/cupti/include flexExtCUDA_release_hpaths += ./../../.. flexExtCUDA_release_hpaths += ./../../../external/freeglut/include flexExtCUDA_release_lpaths := -flexExtCUDA_release_lpaths += $(CUDA_PATH)/lib64 +flexExtCUDA_release_lpaths += /usr/local/cuda/lib64 flexExtCUDA_release_defines := $(flexExtCUDA_custom_defines) flexExtCUDA_release_libraries := flexExtCUDA_release_libraries += ./../../../lib/linux64/NvFlexReleaseCUDA_x64.a @@ -71,8 +71,8 @@ $(flexExtCUDA_release_bin): $(flexExtCUDA_release_obj) $(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 -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES -I../../.. -I../../../external -I$(CUDA_PATH)/include -I../../../external/cub-1.3.2 --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_release/cuda/extensions/cudaflexExt.o" - $(CUDA_PATH)/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES -I../../.. -I../../../external -I$(CUDA_PATH)/include -I../../../external/cub-1.3.2 --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_release/cuda/extensions/cudaflexExt.o" + $(ECHO) /usr/local/cuda/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES -I../../.. -I../../../external -I/usr/local/cuda/include -I../../../external/cub-1.3.2 --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_release/cuda/extensions/cudaflexExt.o" + /usr/local/cuda/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES -I../../.. -I../../../external -I/usr/local/cuda/include -I../../../external/cub-1.3.2 --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: @@ -106,12 +106,12 @@ $(flexExtCUDA_release_c_o): $(flexExtCUDA_release_objsdir)/%.o: rm -f $(flexExtCUDA_release_DEPDIR).d flexExtCUDA_debug_hpaths := -flexExtCUDA_debug_hpaths += $(CUDA_PATH)/include -flexExtCUDA_debug_hpaths += $(CUDA_PATH)/extras/cupti/include +flexExtCUDA_debug_hpaths += /usr/local/cuda/include +flexExtCUDA_debug_hpaths += /usr/local/cuda/extras/cupti/include flexExtCUDA_debug_hpaths += ./../../.. flexExtCUDA_debug_hpaths += ./../../../external/freeglut/include flexExtCUDA_debug_lpaths := -flexExtCUDA_debug_lpaths += $(CUDA_PATH)/lib64 +flexExtCUDA_debug_lpaths += /usr/local/cuda/lib64 flexExtCUDA_debug_defines := $(flexExtCUDA_custom_defines) flexExtCUDA_debug_libraries := flexExtCUDA_debug_libraries += ./../../../lib/linux64/NvFlexDebugCUDA_x64.a @@ -154,8 +154,8 @@ $(flexExtCUDA_debug_bin): $(flexExtCUDA_debug_obj) $(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 -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES -I../../.. -I../../../external -I$(CUDA_PATH)/include -I../../../external/cub-1.3.2 --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_debug/cuda/extensions/cudaflexExt.o" - $(CUDA_PATH)/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES -I../../.. -I../../../external -I$(CUDA_PATH)/include -I../../../external/cub-1.3.2 --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_debug/cuda/extensions/cudaflexExt.o" + $(ECHO) /usr/local/cuda/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES -I../../.. -I../../../external -I/usr/local/cuda/include -I../../../external/cub-1.3.2 --compile "./../../../extensions/cuda/flexExt.cu" -o "$(OBJS_DIR)/flexExtCUDA_debug/cuda/extensions/cudaflexExt.o" + /usr/local/cuda/bin/nvcc -O3 -g -arch=sm_30 -m64 -Xcompiler -fPIC -D_FORCE_INLINES -I../../.. -I../../../external -I/usr/local/cuda/include -I../../../external/cub-1.3.2 --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/vc12win32/flexDemoCUDA.vcxproj b/demo/compiler/vc12win32/flexDemoCUDA.vcxproj index aa6f0ae..cf2dd1c 100644 --- a/demo/compiler/vc12win32/flexDemoCUDA.vcxproj +++ b/demo/compiler/vc12win32/flexDemoCUDA.vcxproj @@ -47,7 +47,7 @@ <FloatingPointModel>Precise</FloatingPointModel> <AdditionalOptions> /d2Zi+</AdditionalOptions> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../..;./../..;./../../d3d11;./../../d3d12;./../../../external/SDL2-2.0.4/include;./../../../external/D3D12/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> @@ -55,7 +55,8 @@ <PrecompiledHeaderFile></PrecompiledHeaderFile> </ClCompile> <Link> - <AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;./../../../lib/win32/NvFlexDebugCUDA_x86.lib;./../../../lib/win32/NvFlexExtDebugCUDA_x86.lib;./../../../lib/win32/NvFlexDeviceDebug_x86.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib;./../../../external/glew/lib/win32/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions> + <AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;delayimp.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib;./../../../external/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexDebugCUDA_x86.lib;./../../../lib/win32/NvFlexExtDebugCUDA_x86.lib;./../../../lib/win32/NvFlexDeviceDebug_x86.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)NvFlexDemoDebugCUDA_x86.exe</OutputFile> <AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ProgramDatabaseFile>$(OutDir)/NvFlexDemoDebugCUDA_x86.exe.pdb</ProgramDatabaseFile> @@ -87,7 +88,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions> /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../..;./../..;./../../d3d11;./../../d3d12;./../../../external/SDL2-2.0.4/include;./../../../external/D3D12/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> @@ -95,7 +96,8 @@ <PrecompiledHeaderFile></PrecompiledHeaderFile> </ClCompile> <Link> - <AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;./../../../lib/win32/NvFlexReleaseCUDA_x86.lib;./../../../lib/win32/NvFlexExtReleaseCUDA_x86.lib;./../../../lib/win32/NvFlexDeviceRelease_x86.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib;./../../../external/glew/lib/win32/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions> + <AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;delayimp.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib;./../../../external/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexReleaseCUDA_x86.lib;./../../../lib/win32/NvFlexExtReleaseCUDA_x86.lib;./../../../lib/win32/NvFlexDeviceRelease_x86.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)NvFlexDemoReleaseCUDA_x86.exe</OutputFile> <AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ProgramDatabaseFile>$(OutDir)/NvFlexDemoReleaseCUDA_x86.exe.pdb</ProgramDatabaseFile> @@ -182,8 +184,6 @@ </ClInclude> <ClInclude Include="..\..\scenes\pasta.h"> </ClInclude> - <ClInclude Include="..\..\scenes\plasticbody.h"> - </ClInclude> <ClInclude Include="..\..\scenes\player.h"> </ClInclude> <ClInclude Include="..\..\scenes\potpourri.h"> @@ -192,8 +192,6 @@ </ClInclude> <ClInclude Include="..\..\scenes\restitution.h"> </ClInclude> - <ClInclude Include="..\..\scenes\ridigbody.h"> - </ClInclude> <ClInclude Include="..\..\scenes\rigidfluidcoupling.h"> </ClInclude> <ClInclude Include="..\..\scenes\rigidpile.h"> @@ -232,8 +230,12 @@ </ClCompile> <ClCompile Include="..\..\main.cpp"> </ClCompile> + <ClCompile Include="..\..\shadersDemoContext.cpp"> + </ClCompile> <ClInclude Include="..\..\benchmark.h"> </ClInclude> + <ClInclude Include="..\..\demoContext.h"> + </ClInclude> <ClInclude Include="..\..\helpers.h"> </ClInclude> <ClInclude Include="..\..\imgui.h"> @@ -242,19 +244,9 @@ </ClInclude> <ClInclude Include="..\..\shaders.h"> </ClInclude> - <ClInclude Include="..\..\stb_truetype.h"> + <ClInclude Include="..\..\shadersDemoContext.h"> </ClInclude> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\opengl\imguiRenderGL.cpp"> - </ClCompile> - <ClCompile Include="..\..\opengl\shader.cpp"> - </ClCompile> - <ClCompile Include="..\..\opengl\shadersGL.cpp"> - </ClCompile> - <ClInclude Include="..\..\opengl\imguiRenderGL.h"> - </ClInclude> - <ClInclude Include="..\..\opengl\shader.h"> + <ClInclude Include="..\..\stb_truetype.h"> </ClInclude> </ItemGroup> <ItemGroup> @@ -282,6 +274,8 @@ </ClCompile> <ClCompile Include="..\..\..\core\platform.cpp"> </ClCompile> + <ClCompile Include="..\..\..\core\png.cpp"> + </ClCompile> <ClCompile Include="..\..\..\core\sdf.cpp"> </ClCompile> <ClCompile Include="..\..\..\core\tga.cpp"> @@ -316,14 +310,14 @@ </ClInclude> <ClInclude Include="..\..\..\core\platform.h"> </ClInclude> + <ClInclude Include="..\..\..\core\png.h"> + </ClInclude> <ClInclude Include="..\..\..\core\point3.h"> </ClInclude> <ClInclude Include="..\..\..\core\quat.h"> </ClInclude> <ClInclude Include="..\..\..\core\sdf.h"> </ClInclude> - <ClInclude Include="..\..\..\core\skylight.h"> - </ClInclude> <ClInclude Include="..\..\..\core\tga.h"> </ClInclude> <ClInclude Include="..\..\..\core\types.h"> @@ -338,6 +332,640 @@ </ClInclude> </ItemGroup> <ItemGroup> + <ClCompile Include="..\..\opengl\imguiRenderGL.cpp"> + </ClCompile> + <ClCompile Include="..\..\opengl\shader.cpp"> + </ClCompile> + <ClCompile Include="..\..\opengl\shadersGL.cpp"> + </ClCompile> + <ClInclude Include="..\..\opengl\demoContextOGL.h"> + </ClInclude> + <ClInclude Include="..\..\opengl\imguiRenderGL.h"> + </ClInclude> + <ClInclude Include="..\..\opengl\shader.h"> + </ClInclude> + <ClInclude Include="..\..\opengl\utilsGL.h"> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\d3d11\appD3D11Ctx.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\debugLineRenderD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\demoContextD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\diffuseRenderD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\fluidRenderD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\imguiGraphD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\imguiInteropD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\meshRenderD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\pointRenderD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\renderTargetD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\shadowMapD3D11.cpp"> + </ClCompile> + <ClInclude Include="..\..\d3d11\appD3D11Ctx.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\debugLineRenderD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\demoContextD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\diffuseRenderD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\fluidRenderD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\imguiGraphD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\meshRenderD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\pointRenderD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\renderTargetD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\shadowMapD3D11.h"> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\d3d12\appD3D12Ctx.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\bufferD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\demoContextD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\diffusePointRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\fluidCompositeRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\fluidEllipsoidRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\imguiGraphD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\lineRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\meshRenderer.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\meshRendererD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\meshRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\meshUtil.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12CircularResourceHeap.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12CounterFence.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12DescriptorHeap.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12Handle.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12HelperUtil.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12RenderTarget.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12Resource.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12ResourceScopeManager.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDxDebugUtil.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDxFormatUtil.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoFreeList.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvResult.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\pipelineUtilD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\pointRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\renderStateD3D12.h"> + </ClInclude> + <ClCompile Include="..\..\d3d12\appD3D12Ctx.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\bufferD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\demoContextD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\diffusePointRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\fluidCompositeRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\fluidEllipsoidRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\imguiGraphD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\imguiInteropD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\lineRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\meshRenderer.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\meshRendererD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\meshRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\meshUtil.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12CircularResourceHeap.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12CounterFence.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12DescriptorHeap.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12HelperUtil.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12RenderTarget.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12Resource.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12ResourceScopeManager.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDxDebugUtil.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDxFormatUtil.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoFreeList.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\pipelineUtilD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\pointRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\renderStateD3D12.cpp"> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d\imguiGraph.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d\imguiGraphLoader.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d\loader.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d\renderParamsD3D.cpp"> + </ClCompile> + <ClInclude Include="..\..\d3d\appGraphCtx.h"> + </ClInclude> + <ClInclude Include="..\..\d3d\imguiGraph.h"> + </ClInclude> + <ClInclude Include="..\..\d3d\loader.h"> + </ClInclude> + <ClInclude Include="..\..\d3d\loaderMacros.h"> + </ClInclude> + <ClInclude Include="..\..\d3d\renderParamsD3D.h"> + </ClInclude> + <ClInclude Include="..\..\d3d\shaderCommonD3D.h"> + </ClInclude> + </ItemGroup> + <ItemGroup> + <FxCompile Include="./../../d3d/shaders/debugLineVS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">debugLineVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">debugLineVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/debugLinePS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">debugLinePS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">debugLinePS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/imguiPS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">imguiPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">imguiPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/imguiVS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">imguiVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">imguiVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/meshPS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">meshPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">meshPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/meshAsyncComputeBenchPS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">meshPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">meshPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/meshShadowPS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">meshPS_Shadow</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">meshPS_Shadow</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/meshVS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">meshVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">meshVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/pointVS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/pointGS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Geometry</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointGS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Geometry</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointGS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/pointPS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/pointShadowPS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointShadowPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointShadowPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/diffuseVS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">diffuseVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">diffuseVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/diffuseGS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Geometry</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">diffuseGS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Geometry</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">diffuseGS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/diffusePS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">diffusePS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">diffusePS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/ellipsoidDepthVS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">ellipsoidDepthVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">ellipsoidDepthVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/ellipsoidDepthGS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Geometry</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">ellipsoidDepthGS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Geometry</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">ellipsoidDepthGS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/ellipsoidDepthPS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">ellipsoidDepthPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">ellipsoidDepthPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/passThroughVS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">passThroughVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">passThroughVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/blurDepthPS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">blurDepthPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">blurDepthPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/compositePS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">compositePS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">compositePS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/pointThicknessVS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointThicknessVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointThicknessVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/pointThicknessGS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Geometry</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointThicknessGS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Geometry</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointThicknessGS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/pointThicknessPS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointThicknessPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointThicknessPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + </ItemGroup> + <ItemGroup> <ProjectReference Include="./../../../extensions/compiler/vc12win32/flexExtCUDA.vcxproj"> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> </ProjectReference> diff --git a/demo/compiler/vc12win32/flexDemoCUDA.vcxproj.filters b/demo/compiler/vc12win32/flexDemoCUDA.vcxproj.filters index e5989dc..2ae88c6 100644 --- a/demo/compiler/vc12win32/flexDemoCUDA.vcxproj.filters +++ b/demo/compiler/vc12win32/flexDemoCUDA.vcxproj.filters @@ -108,9 +108,6 @@ <ClInclude Include="..\..\scenes\pasta.h">
<Filter>demo\scenes</Filter>
</ClInclude>
- <ClInclude Include="..\..\scenes\plasticbody.h">
- <Filter>demo\scenes</Filter>
- </ClInclude>
<ClInclude Include="..\..\scenes\player.h">
<Filter>demo\scenes</Filter>
</ClInclude>
@@ -123,9 +120,6 @@ <ClInclude Include="..\..\scenes\restitution.h">
<Filter>demo\scenes</Filter>
</ClInclude>
- <ClInclude Include="..\..\scenes\ridigbody.h">
- <Filter>demo\scenes</Filter>
- </ClInclude>
<ClInclude Include="..\..\scenes\rigidfluidcoupling.h">
<Filter>demo\scenes</Filter>
</ClInclude>
@@ -182,9 +176,15 @@ <ClCompile Include="..\..\main.cpp">
<Filter>demo</Filter>
</ClCompile>
+ <ClCompile Include="..\..\shadersDemoContext.cpp">
+ <Filter>demo</Filter>
+ </ClCompile>
<ClInclude Include="..\..\benchmark.h">
<Filter>demo</Filter>
</ClInclude>
+ <ClInclude Include="..\..\demoContext.h">
+ <Filter>demo</Filter>
+ </ClInclude>
<ClInclude Include="..\..\helpers.h">
<Filter>demo</Filter>
</ClInclude>
@@ -197,29 +197,11 @@ <ClInclude Include="..\..\shaders.h">
<Filter>demo</Filter>
</ClInclude>
- <ClInclude Include="..\..\stb_truetype.h">
+ <ClInclude Include="..\..\shadersDemoContext.h">
<Filter>demo</Filter>
</ClInclude>
- </ItemGroup>
- <ItemGroup>
- <Filter Include="opengl">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\opengl\imguiRenderGL.cpp">
- <Filter>opengl</Filter>
- </ClCompile>
- <ClCompile Include="..\..\opengl\shader.cpp">
- <Filter>opengl</Filter>
- </ClCompile>
- <ClCompile Include="..\..\opengl\shadersGL.cpp">
- <Filter>opengl</Filter>
- </ClCompile>
- <ClInclude Include="..\..\opengl\imguiRenderGL.h">
- <Filter>opengl</Filter>
- </ClInclude>
- <ClInclude Include="..\..\opengl\shader.h">
- <Filter>opengl</Filter>
+ <ClInclude Include="..\..\stb_truetype.h">
+ <Filter>demo</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
@@ -266,6 +248,9 @@ <ClCompile Include="..\..\..\core\platform.cpp">
<Filter>core</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\core\png.cpp">
+ <Filter>core</Filter>
+ </ClCompile>
<ClCompile Include="..\..\..\core\sdf.cpp">
<Filter>core</Filter>
</ClCompile>
@@ -317,6 +302,9 @@ <ClInclude Include="..\..\..\core\platform.h">
<Filter>core</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\core\png.h">
+ <Filter>core</Filter>
+ </ClInclude>
<ClInclude Include="..\..\..\core\point3.h">
<Filter>core</Filter>
</ClInclude>
@@ -326,9 +314,6 @@ <ClInclude Include="..\..\..\core\sdf.h">
<Filter>core</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\core\skylight.h">
- <Filter>core</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\core\tga.h">
<Filter>core</Filter>
</ClInclude>
@@ -348,4 +333,391 @@ <Filter>core</Filter>
</ClInclude>
</ItemGroup>
+ <ItemGroup>
+ <Filter Include="opengl">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\opengl\imguiRenderGL.cpp">
+ <Filter>opengl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\opengl\shader.cpp">
+ <Filter>opengl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\opengl\shadersGL.cpp">
+ <Filter>opengl</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\opengl\demoContextOGL.h">
+ <Filter>opengl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\opengl\imguiRenderGL.h">
+ <Filter>opengl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\opengl\shader.h">
+ <Filter>opengl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\opengl\utilsGL.h">
+ <Filter>opengl</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="d3d11">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\d3d11\appD3D11Ctx.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\debugLineRenderD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\demoContextD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\diffuseRenderD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\fluidRenderD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\imguiGraphD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\imguiInteropD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\meshRenderD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\pointRenderD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\renderTargetD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\shadowMapD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\d3d11\appD3D11Ctx.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\debugLineRenderD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\demoContextD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\diffuseRenderD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\fluidRenderD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\imguiGraphD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\meshRenderD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\pointRenderD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\renderTargetD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\shadowMapD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="d3d12">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\d3d12\appD3D12Ctx.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\bufferD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\demoContextD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\diffusePointRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\fluidCompositeRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\fluidEllipsoidRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\imguiGraphD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\lineRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\meshRenderer.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\meshRendererD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\meshRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\meshUtil.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12CircularResourceHeap.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12CounterFence.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12DescriptorHeap.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12Handle.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12HelperUtil.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12RenderTarget.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12Resource.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12ResourceScopeManager.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDxDebugUtil.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDxFormatUtil.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoFreeList.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvResult.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\pipelineUtilD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\pointRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\renderStateD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClCompile Include="..\..\d3d12\appD3D12Ctx.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\bufferD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\demoContextD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\diffusePointRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\fluidCompositeRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\fluidEllipsoidRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\imguiGraphD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\imguiInteropD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\lineRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\meshRenderer.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\meshRendererD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\meshRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\meshUtil.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12CircularResourceHeap.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12CounterFence.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12DescriptorHeap.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12HelperUtil.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12RenderTarget.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12Resource.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12ResourceScopeManager.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDxDebugUtil.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDxFormatUtil.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoFreeList.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\pipelineUtilD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\pointRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\renderStateD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="d3d">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp">
+ <Filter>d3d</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d\imguiGraph.cpp">
+ <Filter>d3d</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d\imguiGraphLoader.cpp">
+ <Filter>d3d</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d\loader.cpp">
+ <Filter>d3d</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d\renderParamsD3D.cpp">
+ <Filter>d3d</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\d3d\appGraphCtx.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d\imguiGraph.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d\loader.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d\loaderMacros.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d\renderParamsD3D.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d\shaderCommonD3D.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup><Filter Include="Shader Files"></Filter></ItemGroup>
+ <ItemGroup>
+ <FxCompile Include="./../../d3d/shaders/debugLineVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/debugLinePS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/imguiPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/imguiVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/meshPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/meshAsyncComputeBenchPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/meshShadowPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/meshVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointGS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointShadowPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/diffuseVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/diffuseGS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/diffusePS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/ellipsoidDepthVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/ellipsoidDepthGS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/ellipsoidDepthPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/passThroughVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/blurDepthPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/compositePS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessGS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ </ItemGroup>
</Project>
\ No newline at end of file diff --git a/demo/compiler/vc12win32/flexDemoCUDA.vcxproj.user b/demo/compiler/vc12win32/flexDemoCUDA.vcxproj.user index 2fc5615..1860514 100644 --- a/demo/compiler/vc12win32/flexDemoCUDA.vcxproj.user +++ b/demo/compiler/vc12win32/flexDemoCUDA.vcxproj.user @@ -1,15 +1,9 @@ -<?xml version="1.0" encoding="utf-8" ?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+ <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
+</PropertyGroup>
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+ <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
+</PropertyGroup>
+</Project>
\ No newline at end of file diff --git a/demo/compiler/vc12win32/flexDemoD3D.vcxproj b/demo/compiler/vc12win32/flexDemoD3D.vcxproj index 264f9d9..bb24f2d 100644 --- a/demo/compiler/vc12win32/flexDemoD3D.vcxproj +++ b/demo/compiler/vc12win32/flexDemoD3D.vcxproj @@ -55,7 +55,8 @@ <PrecompiledHeaderFile></PrecompiledHeaderFile> </ClCompile> <Link> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib;./../../../external/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexDebugD3D_x86.lib;./../../../lib/win32/NvFlexExtDebugD3D_x86.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions> + <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;delayimp.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib;./../../../external/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexDebugD3D_x86.lib;./../../../lib/win32/NvFlexExtDebugD3D_x86.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)NvFlexDemoDebugD3D_x86.exe</OutputFile> <AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ProgramDatabaseFile>$(OutDir)/NvFlexDemoDebugD3D_x86.exe.pdb</ProgramDatabaseFile> @@ -94,7 +95,8 @@ <PrecompiledHeaderFile></PrecompiledHeaderFile> </ClCompile> <Link> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib;./../../../external/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexReleaseD3D_x86.lib;./../../../lib/win32/NvFlexExtReleaseD3D_x86.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions> + <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;delayimp.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib;./../../../external/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexReleaseD3D_x86.lib;./../../../lib/win32/NvFlexExtReleaseD3D_x86.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)NvFlexDemoReleaseD3D_x86.exe</OutputFile> <AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ProgramDatabaseFile>$(OutDir)/NvFlexDemoReleaseD3D_x86.exe.pdb</ProgramDatabaseFile> @@ -181,8 +183,6 @@ </ClInclude> <ClInclude Include="..\..\scenes\pasta.h"> </ClInclude> - <ClInclude Include="..\..\scenes\plasticbody.h"> - </ClInclude> <ClInclude Include="..\..\scenes\player.h"> </ClInclude> <ClInclude Include="..\..\scenes\potpourri.h"> @@ -191,8 +191,6 @@ </ClInclude> <ClInclude Include="..\..\scenes\restitution.h"> </ClInclude> - <ClInclude Include="..\..\scenes\ridigbody.h"> - </ClInclude> <ClInclude Include="..\..\scenes\rigidfluidcoupling.h"> </ClInclude> <ClInclude Include="..\..\scenes\rigidpile.h"> @@ -231,8 +229,12 @@ </ClCompile> <ClCompile Include="..\..\main.cpp"> </ClCompile> + <ClCompile Include="..\..\shadersDemoContext.cpp"> + </ClCompile> <ClInclude Include="..\..\benchmark.h"> </ClInclude> + <ClInclude Include="..\..\demoContext.h"> + </ClInclude> <ClInclude Include="..\..\helpers.h"> </ClInclude> <ClInclude Include="..\..\imgui.h"> @@ -241,6 +243,8 @@ </ClInclude> <ClInclude Include="..\..\shaders.h"> </ClInclude> + <ClInclude Include="..\..\shadersDemoContext.h"> + </ClInclude> <ClInclude Include="..\..\stb_truetype.h"> </ClInclude> </ItemGroup> @@ -269,6 +273,8 @@ </ClCompile> <ClCompile Include="..\..\..\core\platform.cpp"> </ClCompile> + <ClCompile Include="..\..\..\core\png.cpp"> + </ClCompile> <ClCompile Include="..\..\..\core\sdf.cpp"> </ClCompile> <ClCompile Include="..\..\..\core\tga.cpp"> @@ -303,14 +309,14 @@ </ClInclude> <ClInclude Include="..\..\..\core\platform.h"> </ClInclude> + <ClInclude Include="..\..\..\core\png.h"> + </ClInclude> <ClInclude Include="..\..\..\core\point3.h"> </ClInclude> <ClInclude Include="..\..\..\core\quat.h"> </ClInclude> <ClInclude Include="..\..\..\core\sdf.h"> </ClInclude> - <ClInclude Include="..\..\..\core\skylight.h"> - </ClInclude> <ClInclude Include="..\..\..\core\tga.h"> </ClInclude> <ClInclude Include="..\..\..\core\types.h"> @@ -339,6 +345,8 @@ </ClInclude> <ClInclude Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.h"> </ClInclude> + <ClInclude Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.h"> + </ClInclude> <ClInclude Include="..\..\d3d12\imguiGraphD3D12.h"> </ClInclude> <ClInclude Include="..\..\d3d12\lineRenderPipelineD3D12.h"> @@ -395,6 +403,8 @@ </ClCompile> <ClCompile Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.cpp"> </ClCompile> + <ClCompile Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.cpp"> + </ClCompile> <ClCompile Include="..\..\d3d12\imguiGraphD3D12.cpp"> </ClCompile> <ClCompile Include="..\..\d3d12\imguiInteropD3D12.cpp"> @@ -483,8 +493,6 @@ <ItemGroup> <ClInclude Include="..\..\d3d\appGraphCtx.h"> </ClInclude> - <ClInclude Include="..\..\d3d\demoContext.h"> - </ClInclude> <ClInclude Include="..\..\d3d\imguiGraph.h"> </ClInclude> <ClInclude Include="..\..\d3d\loader.h"> @@ -495,8 +503,6 @@ </ClInclude> <ClInclude Include="..\..\d3d\shaderCommonD3D.h"> </ClInclude> - <ClInclude Include="..\..\d3d\shadersDemoContext.h"> - </ClInclude> <ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp"> </ClCompile> <ClCompile Include="..\..\d3d\imguiGraph.cpp"> @@ -507,8 +513,6 @@ </ClCompile> <ClCompile Include="..\..\d3d\renderParamsD3D.cpp"> </ClCompile> - <ClCompile Include="..\..\d3d\shadersDemoContext.cpp"> - </ClCompile> </ItemGroup> <ItemGroup> <FxCompile Include="./../../d3d/shaders/debugLineVS.hlsl"> @@ -889,6 +893,60 @@ <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> </FxCompile> + <FxCompile Include="./../../d3d/shaders/pointThicknessVS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointThicknessVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointThicknessVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/pointThicknessGS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Geometry</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointThicknessGS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Geometry</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointThicknessGS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/pointThicknessPS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointThicknessPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointThicknessPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> </ItemGroup> <ItemGroup> <ProjectReference Include="./../../../extensions/compiler/vc12win32/flexExtD3D.vcxproj"> diff --git a/demo/compiler/vc12win32/flexDemoD3D.vcxproj.filters b/demo/compiler/vc12win32/flexDemoD3D.vcxproj.filters index b7f0548..1f816b3 100644 --- a/demo/compiler/vc12win32/flexDemoD3D.vcxproj.filters +++ b/demo/compiler/vc12win32/flexDemoD3D.vcxproj.filters @@ -108,9 +108,6 @@ <ClInclude Include="..\..\scenes\pasta.h">
<Filter>demo\scenes</Filter>
</ClInclude>
- <ClInclude Include="..\..\scenes\plasticbody.h">
- <Filter>demo\scenes</Filter>
- </ClInclude>
<ClInclude Include="..\..\scenes\player.h">
<Filter>demo\scenes</Filter>
</ClInclude>
@@ -123,9 +120,6 @@ <ClInclude Include="..\..\scenes\restitution.h">
<Filter>demo\scenes</Filter>
</ClInclude>
- <ClInclude Include="..\..\scenes\ridigbody.h">
- <Filter>demo\scenes</Filter>
- </ClInclude>
<ClInclude Include="..\..\scenes\rigidfluidcoupling.h">
<Filter>demo\scenes</Filter>
</ClInclude>
@@ -182,9 +176,15 @@ <ClCompile Include="..\..\main.cpp">
<Filter>demo</Filter>
</ClCompile>
+ <ClCompile Include="..\..\shadersDemoContext.cpp">
+ <Filter>demo</Filter>
+ </ClCompile>
<ClInclude Include="..\..\benchmark.h">
<Filter>demo</Filter>
</ClInclude>
+ <ClInclude Include="..\..\demoContext.h">
+ <Filter>demo</Filter>
+ </ClInclude>
<ClInclude Include="..\..\helpers.h">
<Filter>demo</Filter>
</ClInclude>
@@ -197,6 +197,9 @@ <ClInclude Include="..\..\shaders.h">
<Filter>demo</Filter>
</ClInclude>
+ <ClInclude Include="..\..\shadersDemoContext.h">
+ <Filter>demo</Filter>
+ </ClInclude>
<ClInclude Include="..\..\stb_truetype.h">
<Filter>demo</Filter>
</ClInclude>
@@ -245,6 +248,9 @@ <ClCompile Include="..\..\..\core\platform.cpp">
<Filter>core</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\core\png.cpp">
+ <Filter>core</Filter>
+ </ClCompile>
<ClCompile Include="..\..\..\core\sdf.cpp">
<Filter>core</Filter>
</ClCompile>
@@ -296,6 +302,9 @@ <ClInclude Include="..\..\..\core\platform.h">
<Filter>core</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\core\png.h">
+ <Filter>core</Filter>
+ </ClInclude>
<ClInclude Include="..\..\..\core\point3.h">
<Filter>core</Filter>
</ClInclude>
@@ -305,9 +314,6 @@ <ClInclude Include="..\..\..\core\sdf.h">
<Filter>core</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\core\skylight.h">
- <Filter>core</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\core\tga.h">
<Filter>core</Filter>
</ClInclude>
@@ -353,6 +359,9 @@ <ClInclude Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.h">
<Filter>d3d12</Filter>
</ClInclude>
+ <ClInclude Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
<ClInclude Include="..\..\d3d12\imguiGraphD3D12.h">
<Filter>d3d12</Filter>
</ClInclude>
@@ -437,6 +446,9 @@ <ClCompile Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.cpp">
<Filter>d3d12</Filter>
</ClCompile>
+ <ClCompile Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
<ClCompile Include="..\..\d3d12\imguiGraphD3D12.cpp">
<Filter>d3d12</Filter>
</ClCompile>
@@ -575,9 +587,6 @@ <ClInclude Include="..\..\d3d\appGraphCtx.h">
<Filter>d3d</Filter>
</ClInclude>
- <ClInclude Include="..\..\d3d\demoContext.h">
- <Filter>d3d</Filter>
- </ClInclude>
<ClInclude Include="..\..\d3d\imguiGraph.h">
<Filter>d3d</Filter>
</ClInclude>
@@ -593,9 +602,6 @@ <ClInclude Include="..\..\d3d\shaderCommonD3D.h">
<Filter>d3d</Filter>
</ClInclude>
- <ClInclude Include="..\..\d3d\shadersDemoContext.h">
- <Filter>d3d</Filter>
- </ClInclude>
<ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp">
<Filter>d3d</Filter>
</ClCompile>
@@ -611,9 +617,6 @@ <ClCompile Include="..\..\d3d\renderParamsD3D.cpp">
<Filter>d3d</Filter>
</ClCompile>
- <ClCompile Include="..\..\d3d\shadersDemoContext.cpp">
- <Filter>d3d</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup><Filter Include="Shader Files"></Filter></ItemGroup>
<ItemGroup>
@@ -680,5 +683,14 @@ <FxCompile Include="./../../d3d/shaders/compositePS.hlsl">
<Filter>Shader Files</Filter>
</FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessGS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
</ItemGroup>
</Project>
\ No newline at end of file diff --git a/demo/compiler/vc12win32/flexDemoD3D.vcxproj.user b/demo/compiler/vc12win32/flexDemoD3D.vcxproj.user index 2fc5615..1860514 100644 --- a/demo/compiler/vc12win32/flexDemoD3D.vcxproj.user +++ b/demo/compiler/vc12win32/flexDemoD3D.vcxproj.user @@ -1,15 +1,9 @@ -<?xml version="1.0" encoding="utf-8" ?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+ <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
+</PropertyGroup>
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+ <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
+</PropertyGroup>
+</Project>
\ No newline at end of file diff --git a/demo/compiler/vc12win64/flexDemoCUDA.vcxproj b/demo/compiler/vc12win64/flexDemoCUDA.vcxproj index e37c7e7..6cf2016 100644 --- a/demo/compiler/vc12win64/flexDemoCUDA.vcxproj +++ b/demo/compiler/vc12win64/flexDemoCUDA.vcxproj @@ -47,7 +47,7 @@ <FloatingPointModel>Precise</FloatingPointModel> <AdditionalOptions> /d2Zi+</AdditionalOptions> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../..;./../..;./../../d3d11;./../../d3d12;./../../../external/SDL2-2.0.4/include;./../../../external/D3D12/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> @@ -55,7 +55,8 @@ <PrecompiledHeaderFile></PrecompiledHeaderFile> </ClCompile> <Link> - <AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;./../../../lib/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> + <AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions> + <AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;delayimp.lib;./../../../external/SDL2-2.0.4/lib/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/NvFlexDebugCUDA_x64.lib;./../../../lib/win64/NvFlexExtDebugCUDA_x64.lib;./../../../lib/win64/NvFlexDeviceDebug_x64.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)NvFlexDemoDebugCUDA_x64.exe</OutputFile> <AdditionalLibraryDirectories>$(CUDA_PATH)/lib/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ProgramDatabaseFile>$(OutDir)/NvFlexDemoDebugCUDA_x64.exe.pdb</ProgramDatabaseFile> @@ -87,7 +88,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions> /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../..;./../..;./../../d3d11;./../../d3d12;./../../../external/SDL2-2.0.4/include;./../../../external/D3D12/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> @@ -95,7 +96,8 @@ <PrecompiledHeaderFile></PrecompiledHeaderFile> </ClCompile> <Link> - <AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;./../../../lib/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> + <AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions> + <AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;delayimp.lib;./../../../external/SDL2-2.0.4/lib/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/NvFlexReleaseCUDA_x64.lib;./../../../lib/win64/NvFlexExtReleaseCUDA_x64.lib;./../../../lib/win64/NvFlexDeviceRelease_x64.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)NvFlexDemoReleaseCUDA_x64.exe</OutputFile> <AdditionalLibraryDirectories>$(CUDA_PATH)/lib/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ProgramDatabaseFile>$(OutDir)/NvFlexDemoReleaseCUDA_x64.exe.pdb</ProgramDatabaseFile> @@ -182,8 +184,6 @@ </ClInclude> <ClInclude Include="..\..\scenes\pasta.h"> </ClInclude> - <ClInclude Include="..\..\scenes\plasticbody.h"> - </ClInclude> <ClInclude Include="..\..\scenes\player.h"> </ClInclude> <ClInclude Include="..\..\scenes\potpourri.h"> @@ -192,8 +192,6 @@ </ClInclude> <ClInclude Include="..\..\scenes\restitution.h"> </ClInclude> - <ClInclude Include="..\..\scenes\ridigbody.h"> - </ClInclude> <ClInclude Include="..\..\scenes\rigidfluidcoupling.h"> </ClInclude> <ClInclude Include="..\..\scenes\rigidpile.h"> @@ -232,8 +230,12 @@ </ClCompile> <ClCompile Include="..\..\main.cpp"> </ClCompile> + <ClCompile Include="..\..\shadersDemoContext.cpp"> + </ClCompile> <ClInclude Include="..\..\benchmark.h"> </ClInclude> + <ClInclude Include="..\..\demoContext.h"> + </ClInclude> <ClInclude Include="..\..\helpers.h"> </ClInclude> <ClInclude Include="..\..\imgui.h"> @@ -242,19 +244,9 @@ </ClInclude> <ClInclude Include="..\..\shaders.h"> </ClInclude> - <ClInclude Include="..\..\stb_truetype.h"> + <ClInclude Include="..\..\shadersDemoContext.h"> </ClInclude> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\opengl\imguiRenderGL.cpp"> - </ClCompile> - <ClCompile Include="..\..\opengl\shader.cpp"> - </ClCompile> - <ClCompile Include="..\..\opengl\shadersGL.cpp"> - </ClCompile> - <ClInclude Include="..\..\opengl\imguiRenderGL.h"> - </ClInclude> - <ClInclude Include="..\..\opengl\shader.h"> + <ClInclude Include="..\..\stb_truetype.h"> </ClInclude> </ItemGroup> <ItemGroup> @@ -282,6 +274,8 @@ </ClCompile> <ClCompile Include="..\..\..\core\platform.cpp"> </ClCompile> + <ClCompile Include="..\..\..\core\png.cpp"> + </ClCompile> <ClCompile Include="..\..\..\core\sdf.cpp"> </ClCompile> <ClCompile Include="..\..\..\core\tga.cpp"> @@ -316,14 +310,14 @@ </ClInclude> <ClInclude Include="..\..\..\core\platform.h"> </ClInclude> + <ClInclude Include="..\..\..\core\png.h"> + </ClInclude> <ClInclude Include="..\..\..\core\point3.h"> </ClInclude> <ClInclude Include="..\..\..\core\quat.h"> </ClInclude> <ClInclude Include="..\..\..\core\sdf.h"> </ClInclude> - <ClInclude Include="..\..\..\core\skylight.h"> - </ClInclude> <ClInclude Include="..\..\..\core\tga.h"> </ClInclude> <ClInclude Include="..\..\..\core\types.h"> @@ -338,6 +332,640 @@ </ClInclude> </ItemGroup> <ItemGroup> + <ClCompile Include="..\..\opengl\imguiRenderGL.cpp"> + </ClCompile> + <ClCompile Include="..\..\opengl\shader.cpp"> + </ClCompile> + <ClCompile Include="..\..\opengl\shadersGL.cpp"> + </ClCompile> + <ClInclude Include="..\..\opengl\demoContextOGL.h"> + </ClInclude> + <ClInclude Include="..\..\opengl\imguiRenderGL.h"> + </ClInclude> + <ClInclude Include="..\..\opengl\shader.h"> + </ClInclude> + <ClInclude Include="..\..\opengl\utilsGL.h"> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\d3d11\appD3D11Ctx.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\debugLineRenderD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\demoContextD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\diffuseRenderD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\fluidRenderD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\imguiGraphD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\imguiInteropD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\meshRenderD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\pointRenderD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\renderTargetD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\shadowMapD3D11.cpp"> + </ClCompile> + <ClInclude Include="..\..\d3d11\appD3D11Ctx.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\debugLineRenderD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\demoContextD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\diffuseRenderD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\fluidRenderD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\imguiGraphD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\meshRenderD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\pointRenderD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\renderTargetD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\shadowMapD3D11.h"> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\d3d12\appD3D12Ctx.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\bufferD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\demoContextD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\diffusePointRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\fluidCompositeRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\fluidEllipsoidRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\imguiGraphD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\lineRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\meshRenderer.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\meshRendererD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\meshRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\meshUtil.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12CircularResourceHeap.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12CounterFence.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12DescriptorHeap.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12Handle.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12HelperUtil.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12RenderTarget.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12Resource.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12ResourceScopeManager.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDxDebugUtil.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDxFormatUtil.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoFreeList.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvResult.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\pipelineUtilD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\pointRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\renderStateD3D12.h"> + </ClInclude> + <ClCompile Include="..\..\d3d12\appD3D12Ctx.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\bufferD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\demoContextD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\diffusePointRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\fluidCompositeRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\fluidEllipsoidRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\imguiGraphD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\imguiInteropD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\lineRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\meshRenderer.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\meshRendererD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\meshRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\meshUtil.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12CircularResourceHeap.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12CounterFence.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12DescriptorHeap.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12HelperUtil.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12RenderTarget.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12Resource.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12ResourceScopeManager.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDxDebugUtil.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDxFormatUtil.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoFreeList.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\pipelineUtilD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\pointRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\renderStateD3D12.cpp"> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d\imguiGraph.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d\imguiGraphLoader.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d\loader.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d\renderParamsD3D.cpp"> + </ClCompile> + <ClInclude Include="..\..\d3d\appGraphCtx.h"> + </ClInclude> + <ClInclude Include="..\..\d3d\imguiGraph.h"> + </ClInclude> + <ClInclude Include="..\..\d3d\loader.h"> + </ClInclude> + <ClInclude Include="..\..\d3d\loaderMacros.h"> + </ClInclude> + <ClInclude Include="..\..\d3d\renderParamsD3D.h"> + </ClInclude> + <ClInclude Include="..\..\d3d\shaderCommonD3D.h"> + </ClInclude> + </ItemGroup> + <ItemGroup> + <FxCompile Include="./../../d3d/shaders/debugLineVS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|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/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> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation> + <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/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput> + </FxCompile> + <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/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'">debugLinePS</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="./../../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/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'">imguiPS</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="./../../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/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> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation> + <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/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="./../../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/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="./../../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/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_Shadow</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="./../../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/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> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation> + <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/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput> + </FxCompile> + <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/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> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation> + <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/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput> + </FxCompile> + <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/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> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation> + <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/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput> + </FxCompile> + <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/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'">pointPS</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="./../../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="./../../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/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> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation> + <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/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput> + </FxCompile> + <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/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> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation> + <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/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput> + </FxCompile> + <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/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'">diffusePS</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="./../../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/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> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation> + <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/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput> + </FxCompile> + <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/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> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation> + <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/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput> + </FxCompile> + <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/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'">ellipsoidDepthPS</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="./../../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/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> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation> + <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/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput> + </FxCompile> + <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/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'">blurDepthPS</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="./../../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/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'">compositePS</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="./../../d3d/shaders/pointThicknessVS.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'">pointThicknessVS</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'">Vertex</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'">pointThicknessVS</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="./../../d3d/shaders/pointThicknessGS.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'">pointThicknessGS</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'">Geometry</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'">pointThicknessGS</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="./../../d3d/shaders/pointThicknessPS.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'">pointThicknessPS</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'">pointThicknessPS</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> + </ItemGroup> + <ItemGroup> <ProjectReference Include="./../../../extensions/compiler/vc12win64/flexExtCUDA.vcxproj"> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> </ProjectReference> diff --git a/demo/compiler/vc12win64/flexDemoCUDA.vcxproj.filters b/demo/compiler/vc12win64/flexDemoCUDA.vcxproj.filters index e5989dc..2ae88c6 100644 --- a/demo/compiler/vc12win64/flexDemoCUDA.vcxproj.filters +++ b/demo/compiler/vc12win64/flexDemoCUDA.vcxproj.filters @@ -108,9 +108,6 @@ <ClInclude Include="..\..\scenes\pasta.h">
<Filter>demo\scenes</Filter>
</ClInclude>
- <ClInclude Include="..\..\scenes\plasticbody.h">
- <Filter>demo\scenes</Filter>
- </ClInclude>
<ClInclude Include="..\..\scenes\player.h">
<Filter>demo\scenes</Filter>
</ClInclude>
@@ -123,9 +120,6 @@ <ClInclude Include="..\..\scenes\restitution.h">
<Filter>demo\scenes</Filter>
</ClInclude>
- <ClInclude Include="..\..\scenes\ridigbody.h">
- <Filter>demo\scenes</Filter>
- </ClInclude>
<ClInclude Include="..\..\scenes\rigidfluidcoupling.h">
<Filter>demo\scenes</Filter>
</ClInclude>
@@ -182,9 +176,15 @@ <ClCompile Include="..\..\main.cpp">
<Filter>demo</Filter>
</ClCompile>
+ <ClCompile Include="..\..\shadersDemoContext.cpp">
+ <Filter>demo</Filter>
+ </ClCompile>
<ClInclude Include="..\..\benchmark.h">
<Filter>demo</Filter>
</ClInclude>
+ <ClInclude Include="..\..\demoContext.h">
+ <Filter>demo</Filter>
+ </ClInclude>
<ClInclude Include="..\..\helpers.h">
<Filter>demo</Filter>
</ClInclude>
@@ -197,29 +197,11 @@ <ClInclude Include="..\..\shaders.h">
<Filter>demo</Filter>
</ClInclude>
- <ClInclude Include="..\..\stb_truetype.h">
+ <ClInclude Include="..\..\shadersDemoContext.h">
<Filter>demo</Filter>
</ClInclude>
- </ItemGroup>
- <ItemGroup>
- <Filter Include="opengl">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\opengl\imguiRenderGL.cpp">
- <Filter>opengl</Filter>
- </ClCompile>
- <ClCompile Include="..\..\opengl\shader.cpp">
- <Filter>opengl</Filter>
- </ClCompile>
- <ClCompile Include="..\..\opengl\shadersGL.cpp">
- <Filter>opengl</Filter>
- </ClCompile>
- <ClInclude Include="..\..\opengl\imguiRenderGL.h">
- <Filter>opengl</Filter>
- </ClInclude>
- <ClInclude Include="..\..\opengl\shader.h">
- <Filter>opengl</Filter>
+ <ClInclude Include="..\..\stb_truetype.h">
+ <Filter>demo</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
@@ -266,6 +248,9 @@ <ClCompile Include="..\..\..\core\platform.cpp">
<Filter>core</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\core\png.cpp">
+ <Filter>core</Filter>
+ </ClCompile>
<ClCompile Include="..\..\..\core\sdf.cpp">
<Filter>core</Filter>
</ClCompile>
@@ -317,6 +302,9 @@ <ClInclude Include="..\..\..\core\platform.h">
<Filter>core</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\core\png.h">
+ <Filter>core</Filter>
+ </ClInclude>
<ClInclude Include="..\..\..\core\point3.h">
<Filter>core</Filter>
</ClInclude>
@@ -326,9 +314,6 @@ <ClInclude Include="..\..\..\core\sdf.h">
<Filter>core</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\core\skylight.h">
- <Filter>core</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\core\tga.h">
<Filter>core</Filter>
</ClInclude>
@@ -348,4 +333,391 @@ <Filter>core</Filter>
</ClInclude>
</ItemGroup>
+ <ItemGroup>
+ <Filter Include="opengl">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\opengl\imguiRenderGL.cpp">
+ <Filter>opengl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\opengl\shader.cpp">
+ <Filter>opengl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\opengl\shadersGL.cpp">
+ <Filter>opengl</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\opengl\demoContextOGL.h">
+ <Filter>opengl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\opengl\imguiRenderGL.h">
+ <Filter>opengl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\opengl\shader.h">
+ <Filter>opengl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\opengl\utilsGL.h">
+ <Filter>opengl</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="d3d11">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\d3d11\appD3D11Ctx.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\debugLineRenderD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\demoContextD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\diffuseRenderD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\fluidRenderD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\imguiGraphD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\imguiInteropD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\meshRenderD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\pointRenderD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\renderTargetD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\shadowMapD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\d3d11\appD3D11Ctx.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\debugLineRenderD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\demoContextD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\diffuseRenderD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\fluidRenderD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\imguiGraphD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\meshRenderD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\pointRenderD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\renderTargetD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\shadowMapD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="d3d12">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\d3d12\appD3D12Ctx.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\bufferD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\demoContextD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\diffusePointRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\fluidCompositeRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\fluidEllipsoidRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\imguiGraphD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\lineRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\meshRenderer.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\meshRendererD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\meshRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\meshUtil.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12CircularResourceHeap.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12CounterFence.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12DescriptorHeap.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12Handle.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12HelperUtil.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12RenderTarget.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12Resource.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12ResourceScopeManager.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDxDebugUtil.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDxFormatUtil.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoFreeList.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvResult.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\pipelineUtilD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\pointRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\renderStateD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClCompile Include="..\..\d3d12\appD3D12Ctx.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\bufferD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\demoContextD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\diffusePointRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\fluidCompositeRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\fluidEllipsoidRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\imguiGraphD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\imguiInteropD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\lineRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\meshRenderer.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\meshRendererD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\meshRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\meshUtil.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12CircularResourceHeap.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12CounterFence.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12DescriptorHeap.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12HelperUtil.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12RenderTarget.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12Resource.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12ResourceScopeManager.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDxDebugUtil.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDxFormatUtil.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoFreeList.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\pipelineUtilD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\pointRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\renderStateD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="d3d">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp">
+ <Filter>d3d</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d\imguiGraph.cpp">
+ <Filter>d3d</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d\imguiGraphLoader.cpp">
+ <Filter>d3d</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d\loader.cpp">
+ <Filter>d3d</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d\renderParamsD3D.cpp">
+ <Filter>d3d</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\d3d\appGraphCtx.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d\imguiGraph.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d\loader.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d\loaderMacros.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d\renderParamsD3D.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d\shaderCommonD3D.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup><Filter Include="Shader Files"></Filter></ItemGroup>
+ <ItemGroup>
+ <FxCompile Include="./../../d3d/shaders/debugLineVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/debugLinePS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/imguiPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/imguiVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/meshPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/meshAsyncComputeBenchPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/meshShadowPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/meshVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointGS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointShadowPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/diffuseVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/diffuseGS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/diffusePS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/ellipsoidDepthVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/ellipsoidDepthGS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/ellipsoidDepthPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/passThroughVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/blurDepthPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/compositePS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessGS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ </ItemGroup>
</Project>
\ No newline at end of file diff --git a/demo/compiler/vc12win64/flexDemoCUDA.vcxproj.user b/demo/compiler/vc12win64/flexDemoCUDA.vcxproj.user index 2273e49..0c241a3 100644 --- a/demo/compiler/vc12win64/flexDemoCUDA.vcxproj.user +++ b/demo/compiler/vc12win64/flexDemoCUDA.vcxproj.user @@ -1,15 +1,9 @@ -<?xml version="1.0" encoding="utf-8" ?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+ <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
+</PropertyGroup>
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+ <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
+</PropertyGroup>
+</Project>
\ No newline at end of file diff --git a/demo/compiler/vc12win64/flexDemoD3D.vcxproj b/demo/compiler/vc12win64/flexDemoD3D.vcxproj index d30d642..ff68d17 100644 --- a/demo/compiler/vc12win64/flexDemoD3D.vcxproj +++ b/demo/compiler/vc12win64/flexDemoD3D.vcxproj @@ -55,7 +55,8 @@ <PrecompiledHeaderFile></PrecompiledHeaderFile> </ClCompile> <Link> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;./../../../external/SDL2-2.0.4/lib/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> + <AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions> + <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;delayimp.lib;./../../../external/SDL2-2.0.4/lib/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> @@ -94,7 +95,8 @@ <PrecompiledHeaderFile></PrecompiledHeaderFile> </ClCompile> <Link> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;./../../../external/SDL2-2.0.4/lib/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> + <AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions> + <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;delayimp.lib;./../../../external/SDL2-2.0.4/lib/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> @@ -181,8 +183,6 @@ </ClInclude> <ClInclude Include="..\..\scenes\pasta.h"> </ClInclude> - <ClInclude Include="..\..\scenes\plasticbody.h"> - </ClInclude> <ClInclude Include="..\..\scenes\player.h"> </ClInclude> <ClInclude Include="..\..\scenes\potpourri.h"> @@ -191,8 +191,6 @@ </ClInclude> <ClInclude Include="..\..\scenes\restitution.h"> </ClInclude> - <ClInclude Include="..\..\scenes\ridigbody.h"> - </ClInclude> <ClInclude Include="..\..\scenes\rigidfluidcoupling.h"> </ClInclude> <ClInclude Include="..\..\scenes\rigidpile.h"> @@ -231,8 +229,12 @@ </ClCompile> <ClCompile Include="..\..\main.cpp"> </ClCompile> + <ClCompile Include="..\..\shadersDemoContext.cpp"> + </ClCompile> <ClInclude Include="..\..\benchmark.h"> </ClInclude> + <ClInclude Include="..\..\demoContext.h"> + </ClInclude> <ClInclude Include="..\..\helpers.h"> </ClInclude> <ClInclude Include="..\..\imgui.h"> @@ -241,6 +243,8 @@ </ClInclude> <ClInclude Include="..\..\shaders.h"> </ClInclude> + <ClInclude Include="..\..\shadersDemoContext.h"> + </ClInclude> <ClInclude Include="..\..\stb_truetype.h"> </ClInclude> </ItemGroup> @@ -269,6 +273,8 @@ </ClCompile> <ClCompile Include="..\..\..\core\platform.cpp"> </ClCompile> + <ClCompile Include="..\..\..\core\png.cpp"> + </ClCompile> <ClCompile Include="..\..\..\core\sdf.cpp"> </ClCompile> <ClCompile Include="..\..\..\core\tga.cpp"> @@ -303,14 +309,14 @@ </ClInclude> <ClInclude Include="..\..\..\core\platform.h"> </ClInclude> + <ClInclude Include="..\..\..\core\png.h"> + </ClInclude> <ClInclude Include="..\..\..\core\point3.h"> </ClInclude> <ClInclude Include="..\..\..\core\quat.h"> </ClInclude> <ClInclude Include="..\..\..\core\sdf.h"> </ClInclude> - <ClInclude Include="..\..\..\core\skylight.h"> - </ClInclude> <ClInclude Include="..\..\..\core\tga.h"> </ClInclude> <ClInclude Include="..\..\..\core\types.h"> @@ -339,6 +345,8 @@ </ClInclude> <ClInclude Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.h"> </ClInclude> + <ClInclude Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.h"> + </ClInclude> <ClInclude Include="..\..\d3d12\imguiGraphD3D12.h"> </ClInclude> <ClInclude Include="..\..\d3d12\lineRenderPipelineD3D12.h"> @@ -395,6 +403,8 @@ </ClCompile> <ClCompile Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.cpp"> </ClCompile> + <ClCompile Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.cpp"> + </ClCompile> <ClCompile Include="..\..\d3d12\imguiGraphD3D12.cpp"> </ClCompile> <ClCompile Include="..\..\d3d12\imguiInteropD3D12.cpp"> @@ -483,8 +493,6 @@ <ItemGroup> <ClInclude Include="..\..\d3d\appGraphCtx.h"> </ClInclude> - <ClInclude Include="..\..\d3d\demoContext.h"> - </ClInclude> <ClInclude Include="..\..\d3d\imguiGraph.h"> </ClInclude> <ClInclude Include="..\..\d3d\loader.h"> @@ -495,8 +503,6 @@ </ClInclude> <ClInclude Include="..\..\d3d\shaderCommonD3D.h"> </ClInclude> - <ClInclude Include="..\..\d3d\shadersDemoContext.h"> - </ClInclude> <ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp"> </ClCompile> <ClCompile Include="..\..\d3d\imguiGraph.cpp"> @@ -507,8 +513,6 @@ </ClCompile> <ClCompile Include="..\..\d3d\renderParamsD3D.cpp"> </ClCompile> - <ClCompile Include="..\..\d3d\shadersDemoContext.cpp"> - </ClCompile> </ItemGroup> <ItemGroup> <FxCompile Include="./../../d3d/shaders/debugLineVS.hlsl"> @@ -889,6 +893,60 @@ <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput> </FxCompile> + <FxCompile Include="./../../d3d/shaders/pointThicknessVS.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'">pointThicknessVS</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'">Vertex</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'">pointThicknessVS</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="./../../d3d/shaders/pointThicknessGS.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'">pointThicknessGS</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'">Geometry</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'">pointThicknessGS</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="./../../d3d/shaders/pointThicknessPS.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'">pointThicknessPS</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'">pointThicknessPS</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> </ItemGroup> <ItemGroup> <ProjectReference Include="./../../../extensions/compiler/vc12win64/flexExtD3D.vcxproj"> diff --git a/demo/compiler/vc12win64/flexDemoD3D.vcxproj.filters b/demo/compiler/vc12win64/flexDemoD3D.vcxproj.filters index b7f0548..1f816b3 100644 --- a/demo/compiler/vc12win64/flexDemoD3D.vcxproj.filters +++ b/demo/compiler/vc12win64/flexDemoD3D.vcxproj.filters @@ -108,9 +108,6 @@ <ClInclude Include="..\..\scenes\pasta.h">
<Filter>demo\scenes</Filter>
</ClInclude>
- <ClInclude Include="..\..\scenes\plasticbody.h">
- <Filter>demo\scenes</Filter>
- </ClInclude>
<ClInclude Include="..\..\scenes\player.h">
<Filter>demo\scenes</Filter>
</ClInclude>
@@ -123,9 +120,6 @@ <ClInclude Include="..\..\scenes\restitution.h">
<Filter>demo\scenes</Filter>
</ClInclude>
- <ClInclude Include="..\..\scenes\ridigbody.h">
- <Filter>demo\scenes</Filter>
- </ClInclude>
<ClInclude Include="..\..\scenes\rigidfluidcoupling.h">
<Filter>demo\scenes</Filter>
</ClInclude>
@@ -182,9 +176,15 @@ <ClCompile Include="..\..\main.cpp">
<Filter>demo</Filter>
</ClCompile>
+ <ClCompile Include="..\..\shadersDemoContext.cpp">
+ <Filter>demo</Filter>
+ </ClCompile>
<ClInclude Include="..\..\benchmark.h">
<Filter>demo</Filter>
</ClInclude>
+ <ClInclude Include="..\..\demoContext.h">
+ <Filter>demo</Filter>
+ </ClInclude>
<ClInclude Include="..\..\helpers.h">
<Filter>demo</Filter>
</ClInclude>
@@ -197,6 +197,9 @@ <ClInclude Include="..\..\shaders.h">
<Filter>demo</Filter>
</ClInclude>
+ <ClInclude Include="..\..\shadersDemoContext.h">
+ <Filter>demo</Filter>
+ </ClInclude>
<ClInclude Include="..\..\stb_truetype.h">
<Filter>demo</Filter>
</ClInclude>
@@ -245,6 +248,9 @@ <ClCompile Include="..\..\..\core\platform.cpp">
<Filter>core</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\core\png.cpp">
+ <Filter>core</Filter>
+ </ClCompile>
<ClCompile Include="..\..\..\core\sdf.cpp">
<Filter>core</Filter>
</ClCompile>
@@ -296,6 +302,9 @@ <ClInclude Include="..\..\..\core\platform.h">
<Filter>core</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\core\png.h">
+ <Filter>core</Filter>
+ </ClInclude>
<ClInclude Include="..\..\..\core\point3.h">
<Filter>core</Filter>
</ClInclude>
@@ -305,9 +314,6 @@ <ClInclude Include="..\..\..\core\sdf.h">
<Filter>core</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\core\skylight.h">
- <Filter>core</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\core\tga.h">
<Filter>core</Filter>
</ClInclude>
@@ -353,6 +359,9 @@ <ClInclude Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.h">
<Filter>d3d12</Filter>
</ClInclude>
+ <ClInclude Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
<ClInclude Include="..\..\d3d12\imguiGraphD3D12.h">
<Filter>d3d12</Filter>
</ClInclude>
@@ -437,6 +446,9 @@ <ClCompile Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.cpp">
<Filter>d3d12</Filter>
</ClCompile>
+ <ClCompile Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
<ClCompile Include="..\..\d3d12\imguiGraphD3D12.cpp">
<Filter>d3d12</Filter>
</ClCompile>
@@ -575,9 +587,6 @@ <ClInclude Include="..\..\d3d\appGraphCtx.h">
<Filter>d3d</Filter>
</ClInclude>
- <ClInclude Include="..\..\d3d\demoContext.h">
- <Filter>d3d</Filter>
- </ClInclude>
<ClInclude Include="..\..\d3d\imguiGraph.h">
<Filter>d3d</Filter>
</ClInclude>
@@ -593,9 +602,6 @@ <ClInclude Include="..\..\d3d\shaderCommonD3D.h">
<Filter>d3d</Filter>
</ClInclude>
- <ClInclude Include="..\..\d3d\shadersDemoContext.h">
- <Filter>d3d</Filter>
- </ClInclude>
<ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp">
<Filter>d3d</Filter>
</ClCompile>
@@ -611,9 +617,6 @@ <ClCompile Include="..\..\d3d\renderParamsD3D.cpp">
<Filter>d3d</Filter>
</ClCompile>
- <ClCompile Include="..\..\d3d\shadersDemoContext.cpp">
- <Filter>d3d</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup><Filter Include="Shader Files"></Filter></ItemGroup>
<ItemGroup>
@@ -680,5 +683,14 @@ <FxCompile Include="./../../d3d/shaders/compositePS.hlsl">
<Filter>Shader Files</Filter>
</FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessGS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
</ItemGroup>
</Project>
\ No newline at end of file diff --git a/demo/compiler/vc12win64/flexDemoD3D.vcxproj.user b/demo/compiler/vc12win64/flexDemoD3D.vcxproj.user index 2273e49..0c241a3 100644 --- a/demo/compiler/vc12win64/flexDemoD3D.vcxproj.user +++ b/demo/compiler/vc12win64/flexDemoD3D.vcxproj.user @@ -1,15 +1,9 @@ -<?xml version="1.0" encoding="utf-8" ?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+ <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
+</PropertyGroup>
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+ <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
+</PropertyGroup>
+</Project>
\ No newline at end of file diff --git a/demo/compiler/vc14win32/flexDemoCUDA.vcxproj b/demo/compiler/vc14win32/flexDemoCUDA.vcxproj index 984c2e4..bb178a8 100644 --- a/demo/compiler/vc14win32/flexDemoCUDA.vcxproj +++ b/demo/compiler/vc14win32/flexDemoCUDA.vcxproj @@ -13,6 +13,7 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{5159D6B6-76B6-4056-6797-30484A82D93C}</ProjectGuid> <RootNamespace>flexDemoCUDA</RootNamespace> + <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="Configuration"> @@ -47,7 +48,7 @@ <FloatingPointModel>Precise</FloatingPointModel> <AdditionalOptions> /d2Zi+</AdditionalOptions> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../..;./../..;./../../d3d11;./../../d3d12;./../../../external/SDL2-2.0.4/include;./../../../external/D3D12/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> @@ -55,7 +56,8 @@ <PrecompiledHeaderFile></PrecompiledHeaderFile> </ClCompile> <Link> - <AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;./../../../lib/win32/NvFlexDebugCUDA_x86.lib;./../../../lib/win32/NvFlexExtDebugCUDA_x86.lib;./../../../lib/win32/NvFlexDeviceDebug_x86.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib;./../../../external/glew/lib/win32/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions> + <AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;delayimp.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib;./../../../external/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexDebugCUDA_x86.lib;./../../../lib/win32/NvFlexExtDebugCUDA_x86.lib;./../../../lib/win32/NvFlexDeviceDebug_x86.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)NvFlexDemoDebugCUDA_x86.exe</OutputFile> <AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ProgramDatabaseFile>$(OutDir)/NvFlexDemoDebugCUDA_x86.exe.pdb</ProgramDatabaseFile> @@ -87,7 +89,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions> /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../..;./../..;./../../d3d11;./../../d3d12;./../../../external/SDL2-2.0.4/include;./../../../external/D3D12/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> @@ -95,7 +97,8 @@ <PrecompiledHeaderFile></PrecompiledHeaderFile> </ClCompile> <Link> - <AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;./../../../lib/win32/NvFlexReleaseCUDA_x86.lib;./../../../lib/win32/NvFlexExtReleaseCUDA_x86.lib;./../../../lib/win32/NvFlexDeviceRelease_x86.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib;./../../../external/glew/lib/win32/glew32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions> + <AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;delayimp.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib;./../../../external/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexReleaseCUDA_x86.lib;./../../../lib/win32/NvFlexExtReleaseCUDA_x86.lib;./../../../lib/win32/NvFlexDeviceRelease_x86.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)NvFlexDemoReleaseCUDA_x86.exe</OutputFile> <AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ProgramDatabaseFile>$(OutDir)/NvFlexDemoReleaseCUDA_x86.exe.pdb</ProgramDatabaseFile> @@ -182,8 +185,6 @@ </ClInclude> <ClInclude Include="..\..\scenes\pasta.h"> </ClInclude> - <ClInclude Include="..\..\scenes\plasticbody.h"> - </ClInclude> <ClInclude Include="..\..\scenes\player.h"> </ClInclude> <ClInclude Include="..\..\scenes\potpourri.h"> @@ -192,8 +193,6 @@ </ClInclude> <ClInclude Include="..\..\scenes\restitution.h"> </ClInclude> - <ClInclude Include="..\..\scenes\ridigbody.h"> - </ClInclude> <ClInclude Include="..\..\scenes\rigidfluidcoupling.h"> </ClInclude> <ClInclude Include="..\..\scenes\rigidpile.h"> @@ -232,8 +231,12 @@ </ClCompile> <ClCompile Include="..\..\main.cpp"> </ClCompile> + <ClCompile Include="..\..\shadersDemoContext.cpp"> + </ClCompile> <ClInclude Include="..\..\benchmark.h"> </ClInclude> + <ClInclude Include="..\..\demoContext.h"> + </ClInclude> <ClInclude Include="..\..\helpers.h"> </ClInclude> <ClInclude Include="..\..\imgui.h"> @@ -242,19 +245,9 @@ </ClInclude> <ClInclude Include="..\..\shaders.h"> </ClInclude> - <ClInclude Include="..\..\stb_truetype.h"> + <ClInclude Include="..\..\shadersDemoContext.h"> </ClInclude> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\opengl\imguiRenderGL.cpp"> - </ClCompile> - <ClCompile Include="..\..\opengl\shader.cpp"> - </ClCompile> - <ClCompile Include="..\..\opengl\shadersGL.cpp"> - </ClCompile> - <ClInclude Include="..\..\opengl\imguiRenderGL.h"> - </ClInclude> - <ClInclude Include="..\..\opengl\shader.h"> + <ClInclude Include="..\..\stb_truetype.h"> </ClInclude> </ItemGroup> <ItemGroup> @@ -282,6 +275,8 @@ </ClCompile> <ClCompile Include="..\..\..\core\platform.cpp"> </ClCompile> + <ClCompile Include="..\..\..\core\png.cpp"> + </ClCompile> <ClCompile Include="..\..\..\core\sdf.cpp"> </ClCompile> <ClCompile Include="..\..\..\core\tga.cpp"> @@ -316,14 +311,14 @@ </ClInclude> <ClInclude Include="..\..\..\core\platform.h"> </ClInclude> + <ClInclude Include="..\..\..\core\png.h"> + </ClInclude> <ClInclude Include="..\..\..\core\point3.h"> </ClInclude> <ClInclude Include="..\..\..\core\quat.h"> </ClInclude> <ClInclude Include="..\..\..\core\sdf.h"> </ClInclude> - <ClInclude Include="..\..\..\core\skylight.h"> - </ClInclude> <ClInclude Include="..\..\..\core\tga.h"> </ClInclude> <ClInclude Include="..\..\..\core\types.h"> @@ -338,6 +333,640 @@ </ClInclude> </ItemGroup> <ItemGroup> + <ClCompile Include="..\..\opengl\imguiRenderGL.cpp"> + </ClCompile> + <ClCompile Include="..\..\opengl\shader.cpp"> + </ClCompile> + <ClCompile Include="..\..\opengl\shadersGL.cpp"> + </ClCompile> + <ClInclude Include="..\..\opengl\demoContextOGL.h"> + </ClInclude> + <ClInclude Include="..\..\opengl\imguiRenderGL.h"> + </ClInclude> + <ClInclude Include="..\..\opengl\shader.h"> + </ClInclude> + <ClInclude Include="..\..\opengl\utilsGL.h"> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\d3d11\appD3D11Ctx.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\debugLineRenderD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\demoContextD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\diffuseRenderD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\fluidRenderD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\imguiGraphD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\imguiInteropD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\meshRenderD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\pointRenderD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\renderTargetD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\shadowMapD3D11.cpp"> + </ClCompile> + <ClInclude Include="..\..\d3d11\appD3D11Ctx.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\debugLineRenderD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\demoContextD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\diffuseRenderD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\fluidRenderD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\imguiGraphD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\meshRenderD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\pointRenderD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\renderTargetD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\shadowMapD3D11.h"> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\d3d12\appD3D12Ctx.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\bufferD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\demoContextD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\diffusePointRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\fluidCompositeRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\fluidEllipsoidRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\imguiGraphD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\lineRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\meshRenderer.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\meshRendererD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\meshRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\meshUtil.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12CircularResourceHeap.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12CounterFence.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12DescriptorHeap.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12Handle.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12HelperUtil.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12RenderTarget.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12Resource.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12ResourceScopeManager.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDxDebugUtil.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDxFormatUtil.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoFreeList.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvResult.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\pipelineUtilD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\pointRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\renderStateD3D12.h"> + </ClInclude> + <ClCompile Include="..\..\d3d12\appD3D12Ctx.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\bufferD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\demoContextD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\diffusePointRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\fluidCompositeRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\fluidEllipsoidRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\imguiGraphD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\imguiInteropD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\lineRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\meshRenderer.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\meshRendererD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\meshRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\meshUtil.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12CircularResourceHeap.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12CounterFence.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12DescriptorHeap.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12HelperUtil.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12RenderTarget.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12Resource.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12ResourceScopeManager.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDxDebugUtil.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDxFormatUtil.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoFreeList.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\pipelineUtilD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\pointRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\renderStateD3D12.cpp"> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d\imguiGraph.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d\imguiGraphLoader.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d\loader.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d\renderParamsD3D.cpp"> + </ClCompile> + <ClInclude Include="..\..\d3d\appGraphCtx.h"> + </ClInclude> + <ClInclude Include="..\..\d3d\imguiGraph.h"> + </ClInclude> + <ClInclude Include="..\..\d3d\loader.h"> + </ClInclude> + <ClInclude Include="..\..\d3d\loaderMacros.h"> + </ClInclude> + <ClInclude Include="..\..\d3d\renderParamsD3D.h"> + </ClInclude> + <ClInclude Include="..\..\d3d\shaderCommonD3D.h"> + </ClInclude> + </ItemGroup> + <ItemGroup> + <FxCompile Include="./../../d3d/shaders/debugLineVS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">debugLineVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">debugLineVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/debugLinePS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">debugLinePS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">debugLinePS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/imguiPS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">imguiPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">imguiPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/imguiVS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">imguiVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">imguiVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/meshPS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">meshPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">meshPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/meshAsyncComputeBenchPS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">meshPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">meshPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/meshShadowPS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">meshPS_Shadow</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">meshPS_Shadow</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/meshVS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">meshVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">meshVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/pointVS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/pointGS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Geometry</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointGS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Geometry</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointGS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/pointPS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/pointShadowPS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointShadowPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointShadowPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/diffuseVS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">diffuseVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">diffuseVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/diffuseGS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Geometry</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">diffuseGS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Geometry</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">diffuseGS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/diffusePS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">diffusePS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">diffusePS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/ellipsoidDepthVS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">ellipsoidDepthVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">ellipsoidDepthVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/ellipsoidDepthGS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Geometry</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">ellipsoidDepthGS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Geometry</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">ellipsoidDepthGS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/ellipsoidDepthPS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">ellipsoidDepthPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">ellipsoidDepthPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/passThroughVS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">passThroughVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">passThroughVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/blurDepthPS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">blurDepthPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">blurDepthPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/compositePS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">compositePS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">compositePS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/pointThicknessVS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointThicknessVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointThicknessVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/pointThicknessGS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Geometry</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointThicknessGS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Geometry</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointThicknessGS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/pointThicknessPS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointThicknessPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointThicknessPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + </ItemGroup> + <ItemGroup> <ProjectReference Include="./../../../extensions/compiler/vc14win32/flexExtCUDA.vcxproj"> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> </ProjectReference> diff --git a/demo/compiler/vc14win32/flexDemoCUDA.vcxproj.filters b/demo/compiler/vc14win32/flexDemoCUDA.vcxproj.filters index e5989dc..2ae88c6 100644 --- a/demo/compiler/vc14win32/flexDemoCUDA.vcxproj.filters +++ b/demo/compiler/vc14win32/flexDemoCUDA.vcxproj.filters @@ -108,9 +108,6 @@ <ClInclude Include="..\..\scenes\pasta.h">
<Filter>demo\scenes</Filter>
</ClInclude>
- <ClInclude Include="..\..\scenes\plasticbody.h">
- <Filter>demo\scenes</Filter>
- </ClInclude>
<ClInclude Include="..\..\scenes\player.h">
<Filter>demo\scenes</Filter>
</ClInclude>
@@ -123,9 +120,6 @@ <ClInclude Include="..\..\scenes\restitution.h">
<Filter>demo\scenes</Filter>
</ClInclude>
- <ClInclude Include="..\..\scenes\ridigbody.h">
- <Filter>demo\scenes</Filter>
- </ClInclude>
<ClInclude Include="..\..\scenes\rigidfluidcoupling.h">
<Filter>demo\scenes</Filter>
</ClInclude>
@@ -182,9 +176,15 @@ <ClCompile Include="..\..\main.cpp">
<Filter>demo</Filter>
</ClCompile>
+ <ClCompile Include="..\..\shadersDemoContext.cpp">
+ <Filter>demo</Filter>
+ </ClCompile>
<ClInclude Include="..\..\benchmark.h">
<Filter>demo</Filter>
</ClInclude>
+ <ClInclude Include="..\..\demoContext.h">
+ <Filter>demo</Filter>
+ </ClInclude>
<ClInclude Include="..\..\helpers.h">
<Filter>demo</Filter>
</ClInclude>
@@ -197,29 +197,11 @@ <ClInclude Include="..\..\shaders.h">
<Filter>demo</Filter>
</ClInclude>
- <ClInclude Include="..\..\stb_truetype.h">
+ <ClInclude Include="..\..\shadersDemoContext.h">
<Filter>demo</Filter>
</ClInclude>
- </ItemGroup>
- <ItemGroup>
- <Filter Include="opengl">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\opengl\imguiRenderGL.cpp">
- <Filter>opengl</Filter>
- </ClCompile>
- <ClCompile Include="..\..\opengl\shader.cpp">
- <Filter>opengl</Filter>
- </ClCompile>
- <ClCompile Include="..\..\opengl\shadersGL.cpp">
- <Filter>opengl</Filter>
- </ClCompile>
- <ClInclude Include="..\..\opengl\imguiRenderGL.h">
- <Filter>opengl</Filter>
- </ClInclude>
- <ClInclude Include="..\..\opengl\shader.h">
- <Filter>opengl</Filter>
+ <ClInclude Include="..\..\stb_truetype.h">
+ <Filter>demo</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
@@ -266,6 +248,9 @@ <ClCompile Include="..\..\..\core\platform.cpp">
<Filter>core</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\core\png.cpp">
+ <Filter>core</Filter>
+ </ClCompile>
<ClCompile Include="..\..\..\core\sdf.cpp">
<Filter>core</Filter>
</ClCompile>
@@ -317,6 +302,9 @@ <ClInclude Include="..\..\..\core\platform.h">
<Filter>core</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\core\png.h">
+ <Filter>core</Filter>
+ </ClInclude>
<ClInclude Include="..\..\..\core\point3.h">
<Filter>core</Filter>
</ClInclude>
@@ -326,9 +314,6 @@ <ClInclude Include="..\..\..\core\sdf.h">
<Filter>core</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\core\skylight.h">
- <Filter>core</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\core\tga.h">
<Filter>core</Filter>
</ClInclude>
@@ -348,4 +333,391 @@ <Filter>core</Filter>
</ClInclude>
</ItemGroup>
+ <ItemGroup>
+ <Filter Include="opengl">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\opengl\imguiRenderGL.cpp">
+ <Filter>opengl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\opengl\shader.cpp">
+ <Filter>opengl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\opengl\shadersGL.cpp">
+ <Filter>opengl</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\opengl\demoContextOGL.h">
+ <Filter>opengl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\opengl\imguiRenderGL.h">
+ <Filter>opengl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\opengl\shader.h">
+ <Filter>opengl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\opengl\utilsGL.h">
+ <Filter>opengl</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="d3d11">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\d3d11\appD3D11Ctx.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\debugLineRenderD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\demoContextD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\diffuseRenderD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\fluidRenderD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\imguiGraphD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\imguiInteropD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\meshRenderD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\pointRenderD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\renderTargetD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\shadowMapD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\d3d11\appD3D11Ctx.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\debugLineRenderD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\demoContextD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\diffuseRenderD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\fluidRenderD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\imguiGraphD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\meshRenderD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\pointRenderD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\renderTargetD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\shadowMapD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="d3d12">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\d3d12\appD3D12Ctx.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\bufferD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\demoContextD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\diffusePointRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\fluidCompositeRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\fluidEllipsoidRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\imguiGraphD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\lineRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\meshRenderer.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\meshRendererD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\meshRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\meshUtil.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12CircularResourceHeap.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12CounterFence.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12DescriptorHeap.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12Handle.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12HelperUtil.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12RenderTarget.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12Resource.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12ResourceScopeManager.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDxDebugUtil.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDxFormatUtil.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoFreeList.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvResult.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\pipelineUtilD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\pointRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\renderStateD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClCompile Include="..\..\d3d12\appD3D12Ctx.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\bufferD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\demoContextD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\diffusePointRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\fluidCompositeRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\fluidEllipsoidRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\imguiGraphD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\imguiInteropD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\lineRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\meshRenderer.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\meshRendererD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\meshRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\meshUtil.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12CircularResourceHeap.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12CounterFence.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12DescriptorHeap.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12HelperUtil.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12RenderTarget.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12Resource.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12ResourceScopeManager.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDxDebugUtil.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDxFormatUtil.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoFreeList.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\pipelineUtilD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\pointRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\renderStateD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="d3d">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp">
+ <Filter>d3d</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d\imguiGraph.cpp">
+ <Filter>d3d</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d\imguiGraphLoader.cpp">
+ <Filter>d3d</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d\loader.cpp">
+ <Filter>d3d</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d\renderParamsD3D.cpp">
+ <Filter>d3d</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\d3d\appGraphCtx.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d\imguiGraph.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d\loader.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d\loaderMacros.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d\renderParamsD3D.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d\shaderCommonD3D.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup><Filter Include="Shader Files"></Filter></ItemGroup>
+ <ItemGroup>
+ <FxCompile Include="./../../d3d/shaders/debugLineVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/debugLinePS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/imguiPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/imguiVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/meshPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/meshAsyncComputeBenchPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/meshShadowPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/meshVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointGS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointShadowPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/diffuseVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/diffuseGS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/diffusePS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/ellipsoidDepthVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/ellipsoidDepthGS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/ellipsoidDepthPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/passThroughVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/blurDepthPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/compositePS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessGS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ </ItemGroup>
</Project>
\ No newline at end of file diff --git a/demo/compiler/vc14win32/flexDemoCUDA.vcxproj.user b/demo/compiler/vc14win32/flexDemoCUDA.vcxproj.user index 2fc5615..1860514 100644 --- a/demo/compiler/vc14win32/flexDemoCUDA.vcxproj.user +++ b/demo/compiler/vc14win32/flexDemoCUDA.vcxproj.user @@ -1,15 +1,9 @@ -<?xml version="1.0" encoding="utf-8" ?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+ <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
+</PropertyGroup>
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+ <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
+</PropertyGroup>
+</Project>
\ No newline at end of file diff --git a/demo/compiler/vc14win32/flexDemoD3D.vcxproj b/demo/compiler/vc14win32/flexDemoD3D.vcxproj index a926666..846daf1 100644 --- a/demo/compiler/vc14win32/flexDemoD3D.vcxproj +++ b/demo/compiler/vc14win32/flexDemoD3D.vcxproj @@ -56,7 +56,8 @@ <PrecompiledHeaderFile></PrecompiledHeaderFile> </ClCompile> <Link> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib;./../../../external/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexDebugD3D_x86.lib;./../../../lib/win32/NvFlexExtDebugD3D_x86.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions> + <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;delayimp.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib;./../../../external/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexDebugD3D_x86.lib;./../../../lib/win32/NvFlexExtDebugD3D_x86.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)NvFlexDemoDebugD3D_x86.exe</OutputFile> <AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ProgramDatabaseFile>$(OutDir)/NvFlexDemoDebugD3D_x86.exe.pdb</ProgramDatabaseFile> @@ -95,7 +96,8 @@ <PrecompiledHeaderFile></PrecompiledHeaderFile> </ClCompile> <Link> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib;./../../../external/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexReleaseD3D_x86.lib;./../../../lib/win32/NvFlexExtReleaseD3D_x86.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions> + <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;delayimp.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2.lib;./../../../external/SDL2-2.0.4/lib/x86/SDL2main.lib;./../../../external/NvToolsExt/lib/Win32/nvToolsExt32_1.lib;./../../../external/D3D12/libs/x86/d3d12.lib;./../../../lib/win32/NvFlexReleaseD3D_x86.lib;./../../../lib/win32/NvFlexExtReleaseD3D_x86.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)NvFlexDemoReleaseD3D_x86.exe</OutputFile> <AdditionalLibraryDirectories>$(CUDA_PATH)/lib/win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ProgramDatabaseFile>$(OutDir)/NvFlexDemoReleaseD3D_x86.exe.pdb</ProgramDatabaseFile> @@ -182,8 +184,6 @@ </ClInclude> <ClInclude Include="..\..\scenes\pasta.h"> </ClInclude> - <ClInclude Include="..\..\scenes\plasticbody.h"> - </ClInclude> <ClInclude Include="..\..\scenes\player.h"> </ClInclude> <ClInclude Include="..\..\scenes\potpourri.h"> @@ -192,8 +192,6 @@ </ClInclude> <ClInclude Include="..\..\scenes\restitution.h"> </ClInclude> - <ClInclude Include="..\..\scenes\ridigbody.h"> - </ClInclude> <ClInclude Include="..\..\scenes\rigidfluidcoupling.h"> </ClInclude> <ClInclude Include="..\..\scenes\rigidpile.h"> @@ -232,8 +230,12 @@ </ClCompile> <ClCompile Include="..\..\main.cpp"> </ClCompile> + <ClCompile Include="..\..\shadersDemoContext.cpp"> + </ClCompile> <ClInclude Include="..\..\benchmark.h"> </ClInclude> + <ClInclude Include="..\..\demoContext.h"> + </ClInclude> <ClInclude Include="..\..\helpers.h"> </ClInclude> <ClInclude Include="..\..\imgui.h"> @@ -242,6 +244,8 @@ </ClInclude> <ClInclude Include="..\..\shaders.h"> </ClInclude> + <ClInclude Include="..\..\shadersDemoContext.h"> + </ClInclude> <ClInclude Include="..\..\stb_truetype.h"> </ClInclude> </ItemGroup> @@ -270,6 +274,8 @@ </ClCompile> <ClCompile Include="..\..\..\core\platform.cpp"> </ClCompile> + <ClCompile Include="..\..\..\core\png.cpp"> + </ClCompile> <ClCompile Include="..\..\..\core\sdf.cpp"> </ClCompile> <ClCompile Include="..\..\..\core\tga.cpp"> @@ -304,14 +310,14 @@ </ClInclude> <ClInclude Include="..\..\..\core\platform.h"> </ClInclude> + <ClInclude Include="..\..\..\core\png.h"> + </ClInclude> <ClInclude Include="..\..\..\core\point3.h"> </ClInclude> <ClInclude Include="..\..\..\core\quat.h"> </ClInclude> <ClInclude Include="..\..\..\core\sdf.h"> </ClInclude> - <ClInclude Include="..\..\..\core\skylight.h"> - </ClInclude> <ClInclude Include="..\..\..\core\tga.h"> </ClInclude> <ClInclude Include="..\..\..\core\types.h"> @@ -340,6 +346,8 @@ </ClInclude> <ClInclude Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.h"> </ClInclude> + <ClInclude Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.h"> + </ClInclude> <ClInclude Include="..\..\d3d12\imguiGraphD3D12.h"> </ClInclude> <ClInclude Include="..\..\d3d12\lineRenderPipelineD3D12.h"> @@ -396,6 +404,8 @@ </ClCompile> <ClCompile Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.cpp"> </ClCompile> + <ClCompile Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.cpp"> + </ClCompile> <ClCompile Include="..\..\d3d12\imguiGraphD3D12.cpp"> </ClCompile> <ClCompile Include="..\..\d3d12\imguiInteropD3D12.cpp"> @@ -484,8 +494,6 @@ <ItemGroup> <ClInclude Include="..\..\d3d\appGraphCtx.h"> </ClInclude> - <ClInclude Include="..\..\d3d\demoContext.h"> - </ClInclude> <ClInclude Include="..\..\d3d\imguiGraph.h"> </ClInclude> <ClInclude Include="..\..\d3d\loader.h"> @@ -496,8 +504,6 @@ </ClInclude> <ClInclude Include="..\..\d3d\shaderCommonD3D.h"> </ClInclude> - <ClInclude Include="..\..\d3d\shadersDemoContext.h"> - </ClInclude> <ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp"> </ClCompile> <ClCompile Include="..\..\d3d\imguiGraph.cpp"> @@ -508,8 +514,6 @@ </ClCompile> <ClCompile Include="..\..\d3d\renderParamsD3D.cpp"> </ClCompile> - <ClCompile Include="..\..\d3d\shadersDemoContext.cpp"> - </ClCompile> </ItemGroup> <ItemGroup> <FxCompile Include="./../../d3d/shaders/debugLineVS.hlsl"> @@ -890,6 +894,60 @@ <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> </FxCompile> + <FxCompile Include="./../../d3d/shaders/pointThicknessVS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointThicknessVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Vertex</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointThicknessVS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/pointThicknessGS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Geometry</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointThicknessGS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Geometry</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointThicknessGS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> + <FxCompile Include="./../../d3d/shaders/pointThicknessPS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">pointThicknessPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='debug|Win32'"> </ObjectFileOutput> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='release|Win32'">Pixel</ShaderType> + <ShaderModel Condition="'$(Configuration)|$(Platform)'=='release|Win32'">5.0</ShaderModel> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</EnableDebuggingInformation> + <DisableOptimizations Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</DisableOptimizations> + <EntryPointName Condition="'$(Configuration)|$(Platform)'=='release|Win32'">pointThicknessPS</EntryPointName> + <TreatWarningAsError Condition="'$(Configuration)|$(Platform)'=='release|Win32'">false</TreatWarningAsError> + <HeaderFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'">../../../demo/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|Win32'"> </ObjectFileOutput> + </FxCompile> </ItemGroup> <ItemGroup> <ProjectReference Include="./../../../extensions/compiler/vc14win32/flexExtD3D.vcxproj"> diff --git a/demo/compiler/vc14win32/flexDemoD3D.vcxproj.filters b/demo/compiler/vc14win32/flexDemoD3D.vcxproj.filters index b7f0548..1f816b3 100644 --- a/demo/compiler/vc14win32/flexDemoD3D.vcxproj.filters +++ b/demo/compiler/vc14win32/flexDemoD3D.vcxproj.filters @@ -108,9 +108,6 @@ <ClInclude Include="..\..\scenes\pasta.h">
<Filter>demo\scenes</Filter>
</ClInclude>
- <ClInclude Include="..\..\scenes\plasticbody.h">
- <Filter>demo\scenes</Filter>
- </ClInclude>
<ClInclude Include="..\..\scenes\player.h">
<Filter>demo\scenes</Filter>
</ClInclude>
@@ -123,9 +120,6 @@ <ClInclude Include="..\..\scenes\restitution.h">
<Filter>demo\scenes</Filter>
</ClInclude>
- <ClInclude Include="..\..\scenes\ridigbody.h">
- <Filter>demo\scenes</Filter>
- </ClInclude>
<ClInclude Include="..\..\scenes\rigidfluidcoupling.h">
<Filter>demo\scenes</Filter>
</ClInclude>
@@ -182,9 +176,15 @@ <ClCompile Include="..\..\main.cpp">
<Filter>demo</Filter>
</ClCompile>
+ <ClCompile Include="..\..\shadersDemoContext.cpp">
+ <Filter>demo</Filter>
+ </ClCompile>
<ClInclude Include="..\..\benchmark.h">
<Filter>demo</Filter>
</ClInclude>
+ <ClInclude Include="..\..\demoContext.h">
+ <Filter>demo</Filter>
+ </ClInclude>
<ClInclude Include="..\..\helpers.h">
<Filter>demo</Filter>
</ClInclude>
@@ -197,6 +197,9 @@ <ClInclude Include="..\..\shaders.h">
<Filter>demo</Filter>
</ClInclude>
+ <ClInclude Include="..\..\shadersDemoContext.h">
+ <Filter>demo</Filter>
+ </ClInclude>
<ClInclude Include="..\..\stb_truetype.h">
<Filter>demo</Filter>
</ClInclude>
@@ -245,6 +248,9 @@ <ClCompile Include="..\..\..\core\platform.cpp">
<Filter>core</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\core\png.cpp">
+ <Filter>core</Filter>
+ </ClCompile>
<ClCompile Include="..\..\..\core\sdf.cpp">
<Filter>core</Filter>
</ClCompile>
@@ -296,6 +302,9 @@ <ClInclude Include="..\..\..\core\platform.h">
<Filter>core</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\core\png.h">
+ <Filter>core</Filter>
+ </ClInclude>
<ClInclude Include="..\..\..\core\point3.h">
<Filter>core</Filter>
</ClInclude>
@@ -305,9 +314,6 @@ <ClInclude Include="..\..\..\core\sdf.h">
<Filter>core</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\core\skylight.h">
- <Filter>core</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\core\tga.h">
<Filter>core</Filter>
</ClInclude>
@@ -353,6 +359,9 @@ <ClInclude Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.h">
<Filter>d3d12</Filter>
</ClInclude>
+ <ClInclude Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
<ClInclude Include="..\..\d3d12\imguiGraphD3D12.h">
<Filter>d3d12</Filter>
</ClInclude>
@@ -437,6 +446,9 @@ <ClCompile Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.cpp">
<Filter>d3d12</Filter>
</ClCompile>
+ <ClCompile Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
<ClCompile Include="..\..\d3d12\imguiGraphD3D12.cpp">
<Filter>d3d12</Filter>
</ClCompile>
@@ -575,9 +587,6 @@ <ClInclude Include="..\..\d3d\appGraphCtx.h">
<Filter>d3d</Filter>
</ClInclude>
- <ClInclude Include="..\..\d3d\demoContext.h">
- <Filter>d3d</Filter>
- </ClInclude>
<ClInclude Include="..\..\d3d\imguiGraph.h">
<Filter>d3d</Filter>
</ClInclude>
@@ -593,9 +602,6 @@ <ClInclude Include="..\..\d3d\shaderCommonD3D.h">
<Filter>d3d</Filter>
</ClInclude>
- <ClInclude Include="..\..\d3d\shadersDemoContext.h">
- <Filter>d3d</Filter>
- </ClInclude>
<ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp">
<Filter>d3d</Filter>
</ClCompile>
@@ -611,9 +617,6 @@ <ClCompile Include="..\..\d3d\renderParamsD3D.cpp">
<Filter>d3d</Filter>
</ClCompile>
- <ClCompile Include="..\..\d3d\shadersDemoContext.cpp">
- <Filter>d3d</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup><Filter Include="Shader Files"></Filter></ItemGroup>
<ItemGroup>
@@ -680,5 +683,14 @@ <FxCompile Include="./../../d3d/shaders/compositePS.hlsl">
<Filter>Shader Files</Filter>
</FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessGS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
</ItemGroup>
</Project>
\ No newline at end of file diff --git a/demo/compiler/vc14win32/flexDemoD3D.vcxproj.user b/demo/compiler/vc14win32/flexDemoD3D.vcxproj.user index 2fc5615..1860514 100644 --- a/demo/compiler/vc14win32/flexDemoD3D.vcxproj.user +++ b/demo/compiler/vc14win32/flexDemoD3D.vcxproj.user @@ -1,15 +1,9 @@ -<?xml version="1.0" encoding="utf-8" ?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'">
+ <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
+</PropertyGroup>
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'">
+ <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
+</PropertyGroup>
+</Project>
\ No newline at end of file diff --git a/demo/compiler/vc14win64/flexDemoCUDA.vcxproj b/demo/compiler/vc14win64/flexDemoCUDA.vcxproj index 8b4c665..ee454a4 100644 --- a/demo/compiler/vc14win64/flexDemoCUDA.vcxproj +++ b/demo/compiler/vc14win64/flexDemoCUDA.vcxproj @@ -13,6 +13,7 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{5159D6B6-76B6-4056-6797-30484A82D93C}</ProjectGuid> <RootNamespace>flexDemoCUDA</RootNamespace> + <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'" Label="Configuration"> @@ -47,7 +48,7 @@ <FloatingPointModel>Precise</FloatingPointModel> <AdditionalOptions> /d2Zi+</AdditionalOptions> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../..;./../..;./../../d3d11;./../../d3d12;./../../../external/SDL2-2.0.4/include;./../../../external/D3D12/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_ITERATOR_DEBUG_LEVEL=0;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> @@ -55,7 +56,8 @@ <PrecompiledHeaderFile></PrecompiledHeaderFile> </ClCompile> <Link> - <AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;./../../../lib/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> + <AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions> + <AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;delayimp.lib;./../../../external/SDL2-2.0.4/lib/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/NvFlexDebugCUDA_x64.lib;./../../../lib/win64/NvFlexExtDebugCUDA_x64.lib;./../../../lib/win64/NvFlexDeviceDebug_x64.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)NvFlexDemoDebugCUDA_x64.exe</OutputFile> <AdditionalLibraryDirectories>$(CUDA_PATH)/lib/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ProgramDatabaseFile>$(OutDir)/NvFlexDemoDebugCUDA_x64.exe.pdb</ProgramDatabaseFile> @@ -87,7 +89,7 @@ <FloatingPointModel>Fast</FloatingPointModel> <AdditionalOptions> /d2Zi+</AdditionalOptions> <Optimization>Full</Optimization> - <AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../../../..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(CUDA_PATH)/include;$(CUDA_PATH)/extras/cupti/include;./../../..;./../..;./../../d3d11;./../../d3d12;./../../../external/SDL2-2.0.4/include;./../../../external/D3D12/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_CONSOLE;WIN32;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <WarningLevel>Level3</WarningLevel> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> @@ -95,7 +97,8 @@ <PrecompiledHeaderFile></PrecompiledHeaderFile> </ClCompile> <Link> - <AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;./../../../lib/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> + <AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions> + <AdditionalDependencies>cudart.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;delayimp.lib;./../../../external/SDL2-2.0.4/lib/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/NvFlexReleaseCUDA_x64.lib;./../../../lib/win64/NvFlexExtReleaseCUDA_x64.lib;./../../../lib/win64/NvFlexDeviceRelease_x64.lib;%(AdditionalDependencies)</AdditionalDependencies> <OutputFile>$(OutDir)NvFlexDemoReleaseCUDA_x64.exe</OutputFile> <AdditionalLibraryDirectories>$(CUDA_PATH)/lib/x64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <ProgramDatabaseFile>$(OutDir)/NvFlexDemoReleaseCUDA_x64.exe.pdb</ProgramDatabaseFile> @@ -182,8 +185,6 @@ </ClInclude> <ClInclude Include="..\..\scenes\pasta.h"> </ClInclude> - <ClInclude Include="..\..\scenes\plasticbody.h"> - </ClInclude> <ClInclude Include="..\..\scenes\player.h"> </ClInclude> <ClInclude Include="..\..\scenes\potpourri.h"> @@ -192,8 +193,6 @@ </ClInclude> <ClInclude Include="..\..\scenes\restitution.h"> </ClInclude> - <ClInclude Include="..\..\scenes\ridigbody.h"> - </ClInclude> <ClInclude Include="..\..\scenes\rigidfluidcoupling.h"> </ClInclude> <ClInclude Include="..\..\scenes\rigidpile.h"> @@ -232,8 +231,12 @@ </ClCompile> <ClCompile Include="..\..\main.cpp"> </ClCompile> + <ClCompile Include="..\..\shadersDemoContext.cpp"> + </ClCompile> <ClInclude Include="..\..\benchmark.h"> </ClInclude> + <ClInclude Include="..\..\demoContext.h"> + </ClInclude> <ClInclude Include="..\..\helpers.h"> </ClInclude> <ClInclude Include="..\..\imgui.h"> @@ -242,19 +245,9 @@ </ClInclude> <ClInclude Include="..\..\shaders.h"> </ClInclude> - <ClInclude Include="..\..\stb_truetype.h"> + <ClInclude Include="..\..\shadersDemoContext.h"> </ClInclude> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\..\opengl\imguiRenderGL.cpp"> - </ClCompile> - <ClCompile Include="..\..\opengl\shader.cpp"> - </ClCompile> - <ClCompile Include="..\..\opengl\shadersGL.cpp"> - </ClCompile> - <ClInclude Include="..\..\opengl\imguiRenderGL.h"> - </ClInclude> - <ClInclude Include="..\..\opengl\shader.h"> + <ClInclude Include="..\..\stb_truetype.h"> </ClInclude> </ItemGroup> <ItemGroup> @@ -282,6 +275,8 @@ </ClCompile> <ClCompile Include="..\..\..\core\platform.cpp"> </ClCompile> + <ClCompile Include="..\..\..\core\png.cpp"> + </ClCompile> <ClCompile Include="..\..\..\core\sdf.cpp"> </ClCompile> <ClCompile Include="..\..\..\core\tga.cpp"> @@ -316,14 +311,14 @@ </ClInclude> <ClInclude Include="..\..\..\core\platform.h"> </ClInclude> + <ClInclude Include="..\..\..\core\png.h"> + </ClInclude> <ClInclude Include="..\..\..\core\point3.h"> </ClInclude> <ClInclude Include="..\..\..\core\quat.h"> </ClInclude> <ClInclude Include="..\..\..\core\sdf.h"> </ClInclude> - <ClInclude Include="..\..\..\core\skylight.h"> - </ClInclude> <ClInclude Include="..\..\..\core\tga.h"> </ClInclude> <ClInclude Include="..\..\..\core\types.h"> @@ -338,6 +333,640 @@ </ClInclude> </ItemGroup> <ItemGroup> + <ClCompile Include="..\..\opengl\imguiRenderGL.cpp"> + </ClCompile> + <ClCompile Include="..\..\opengl\shader.cpp"> + </ClCompile> + <ClCompile Include="..\..\opengl\shadersGL.cpp"> + </ClCompile> + <ClInclude Include="..\..\opengl\demoContextOGL.h"> + </ClInclude> + <ClInclude Include="..\..\opengl\imguiRenderGL.h"> + </ClInclude> + <ClInclude Include="..\..\opengl\shader.h"> + </ClInclude> + <ClInclude Include="..\..\opengl\utilsGL.h"> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\d3d11\appD3D11Ctx.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\debugLineRenderD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\demoContextD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\diffuseRenderD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\fluidRenderD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\imguiGraphD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\imguiInteropD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\meshRenderD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\pointRenderD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\renderTargetD3D11.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d11\shadowMapD3D11.cpp"> + </ClCompile> + <ClInclude Include="..\..\d3d11\appD3D11Ctx.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\debugLineRenderD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\demoContextD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\diffuseRenderD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\fluidRenderD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\imguiGraphD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\meshRenderD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\pointRenderD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\renderTargetD3D11.h"> + </ClInclude> + <ClInclude Include="..\..\d3d11\shadowMapD3D11.h"> + </ClInclude> + </ItemGroup> + <ItemGroup> + <ClInclude Include="..\..\d3d12\appD3D12Ctx.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\bufferD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\demoContextD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\diffusePointRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\fluidCompositeRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\fluidEllipsoidRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\imguiGraphD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\lineRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\meshRenderer.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\meshRendererD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\meshRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\meshUtil.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12CircularResourceHeap.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12CounterFence.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12DescriptorHeap.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12Handle.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12HelperUtil.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12RenderTarget.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12Resource.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDx12ResourceScopeManager.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDxDebugUtil.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoDxFormatUtil.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvCoFreeList.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\NvResult.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\pipelineUtilD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\pointRenderPipelineD3D12.h"> + </ClInclude> + <ClInclude Include="..\..\d3d12\renderStateD3D12.h"> + </ClInclude> + <ClCompile Include="..\..\d3d12\appD3D12Ctx.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\bufferD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\demoContextD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\diffusePointRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\fluidCompositeRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\fluidEllipsoidRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\imguiGraphD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\imguiInteropD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\lineRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\meshRenderer.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\meshRendererD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\meshRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\meshUtil.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12CircularResourceHeap.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12CounterFence.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12DescriptorHeap.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12HelperUtil.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12RenderTarget.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12Resource.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDx12ResourceScopeManager.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDxDebugUtil.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoDxFormatUtil.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\NvCoFreeList.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\pipelineUtilD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\pointRenderPipelineD3D12.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d12\renderStateD3D12.cpp"> + </ClCompile> + </ItemGroup> + <ItemGroup> + <ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d\imguiGraph.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d\imguiGraphLoader.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d\loader.cpp"> + </ClCompile> + <ClCompile Include="..\..\d3d\renderParamsD3D.cpp"> + </ClCompile> + <ClInclude Include="..\..\d3d\appGraphCtx.h"> + </ClInclude> + <ClInclude Include="..\..\d3d\imguiGraph.h"> + </ClInclude> + <ClInclude Include="..\..\d3d\loader.h"> + </ClInclude> + <ClInclude Include="..\..\d3d\loaderMacros.h"> + </ClInclude> + <ClInclude Include="..\..\d3d\renderParamsD3D.h"> + </ClInclude> + <ClInclude Include="..\..\d3d\shaderCommonD3D.h"> + </ClInclude> + </ItemGroup> + <ItemGroup> + <FxCompile Include="./../../d3d/shaders/debugLineVS.hlsl"> + <ShaderType Condition="'$(Configuration)|$(Platform)'=='debug|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/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> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation> + <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/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput> + </FxCompile> + <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/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'">debugLinePS</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="./../../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/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'">imguiPS</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="./../../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/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> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation> + <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/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="./../../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/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="./../../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/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_Shadow</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="./../../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/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> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation> + <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/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput> + </FxCompile> + <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/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> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation> + <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/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput> + </FxCompile> + <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/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> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation> + <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/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput> + </FxCompile> + <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/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'">pointPS</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="./../../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="./../../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/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> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation> + <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/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput> + </FxCompile> + <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/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> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation> + <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/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput> + </FxCompile> + <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/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'">diffusePS</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="./../../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/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> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation> + <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/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput> + </FxCompile> + <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/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> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation> + <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/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput> + </FxCompile> + <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/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'">ellipsoidDepthPS</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="./../../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/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> + <EnableDebuggingInformation Condition="'$(Configuration)|$(Platform)'=='release|x64'">false</EnableDebuggingInformation> + <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/d3d/shaders/%(Filename).hlsl.h</HeaderFileOutput> + <ObjectFileOutput Condition="'$(Configuration)|$(Platform)'=='release|x64'"> </ObjectFileOutput> + </FxCompile> + <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/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'">blurDepthPS</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="./../../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/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'">compositePS</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="./../../d3d/shaders/pointThicknessVS.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'">pointThicknessVS</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'">Vertex</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'">pointThicknessVS</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="./../../d3d/shaders/pointThicknessGS.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'">pointThicknessGS</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'">Geometry</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'">pointThicknessGS</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="./../../d3d/shaders/pointThicknessPS.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'">pointThicknessPS</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'">pointThicknessPS</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> + </ItemGroup> + <ItemGroup> <ProjectReference Include="./../../../extensions/compiler/vc14win64/flexExtCUDA.vcxproj"> <ReferenceOutputAssembly>false</ReferenceOutputAssembly> </ProjectReference> diff --git a/demo/compiler/vc14win64/flexDemoCUDA.vcxproj.filters b/demo/compiler/vc14win64/flexDemoCUDA.vcxproj.filters index e5989dc..2ae88c6 100644 --- a/demo/compiler/vc14win64/flexDemoCUDA.vcxproj.filters +++ b/demo/compiler/vc14win64/flexDemoCUDA.vcxproj.filters @@ -108,9 +108,6 @@ <ClInclude Include="..\..\scenes\pasta.h">
<Filter>demo\scenes</Filter>
</ClInclude>
- <ClInclude Include="..\..\scenes\plasticbody.h">
- <Filter>demo\scenes</Filter>
- </ClInclude>
<ClInclude Include="..\..\scenes\player.h">
<Filter>demo\scenes</Filter>
</ClInclude>
@@ -123,9 +120,6 @@ <ClInclude Include="..\..\scenes\restitution.h">
<Filter>demo\scenes</Filter>
</ClInclude>
- <ClInclude Include="..\..\scenes\ridigbody.h">
- <Filter>demo\scenes</Filter>
- </ClInclude>
<ClInclude Include="..\..\scenes\rigidfluidcoupling.h">
<Filter>demo\scenes</Filter>
</ClInclude>
@@ -182,9 +176,15 @@ <ClCompile Include="..\..\main.cpp">
<Filter>demo</Filter>
</ClCompile>
+ <ClCompile Include="..\..\shadersDemoContext.cpp">
+ <Filter>demo</Filter>
+ </ClCompile>
<ClInclude Include="..\..\benchmark.h">
<Filter>demo</Filter>
</ClInclude>
+ <ClInclude Include="..\..\demoContext.h">
+ <Filter>demo</Filter>
+ </ClInclude>
<ClInclude Include="..\..\helpers.h">
<Filter>demo</Filter>
</ClInclude>
@@ -197,29 +197,11 @@ <ClInclude Include="..\..\shaders.h">
<Filter>demo</Filter>
</ClInclude>
- <ClInclude Include="..\..\stb_truetype.h">
+ <ClInclude Include="..\..\shadersDemoContext.h">
<Filter>demo</Filter>
</ClInclude>
- </ItemGroup>
- <ItemGroup>
- <Filter Include="opengl">
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\..\opengl\imguiRenderGL.cpp">
- <Filter>opengl</Filter>
- </ClCompile>
- <ClCompile Include="..\..\opengl\shader.cpp">
- <Filter>opengl</Filter>
- </ClCompile>
- <ClCompile Include="..\..\opengl\shadersGL.cpp">
- <Filter>opengl</Filter>
- </ClCompile>
- <ClInclude Include="..\..\opengl\imguiRenderGL.h">
- <Filter>opengl</Filter>
- </ClInclude>
- <ClInclude Include="..\..\opengl\shader.h">
- <Filter>opengl</Filter>
+ <ClInclude Include="..\..\stb_truetype.h">
+ <Filter>demo</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
@@ -266,6 +248,9 @@ <ClCompile Include="..\..\..\core\platform.cpp">
<Filter>core</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\core\png.cpp">
+ <Filter>core</Filter>
+ </ClCompile>
<ClCompile Include="..\..\..\core\sdf.cpp">
<Filter>core</Filter>
</ClCompile>
@@ -317,6 +302,9 @@ <ClInclude Include="..\..\..\core\platform.h">
<Filter>core</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\core\png.h">
+ <Filter>core</Filter>
+ </ClInclude>
<ClInclude Include="..\..\..\core\point3.h">
<Filter>core</Filter>
</ClInclude>
@@ -326,9 +314,6 @@ <ClInclude Include="..\..\..\core\sdf.h">
<Filter>core</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\core\skylight.h">
- <Filter>core</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\core\tga.h">
<Filter>core</Filter>
</ClInclude>
@@ -348,4 +333,391 @@ <Filter>core</Filter>
</ClInclude>
</ItemGroup>
+ <ItemGroup>
+ <Filter Include="opengl">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\opengl\imguiRenderGL.cpp">
+ <Filter>opengl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\opengl\shader.cpp">
+ <Filter>opengl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\opengl\shadersGL.cpp">
+ <Filter>opengl</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\opengl\demoContextOGL.h">
+ <Filter>opengl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\opengl\imguiRenderGL.h">
+ <Filter>opengl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\opengl\shader.h">
+ <Filter>opengl</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\opengl\utilsGL.h">
+ <Filter>opengl</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="d3d11">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\d3d11\appD3D11Ctx.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\debugLineRenderD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\demoContextD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\diffuseRenderD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\fluidRenderD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\imguiGraphD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\imguiInteropD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\meshRenderD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\pointRenderD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\renderTargetD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d11\shadowMapD3D11.cpp">
+ <Filter>d3d11</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\d3d11\appD3D11Ctx.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\debugLineRenderD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\demoContextD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\diffuseRenderD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\fluidRenderD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\imguiGraphD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\meshRenderD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\pointRenderD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\renderTargetD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d11\shadowMapD3D11.h">
+ <Filter>d3d11</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="d3d12">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\d3d12\appD3D12Ctx.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\bufferD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\demoContextD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\diffusePointRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\fluidCompositeRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\fluidEllipsoidRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\imguiGraphD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\lineRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\meshRenderer.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\meshRendererD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\meshRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\meshUtil.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12CircularResourceHeap.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12CounterFence.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12DescriptorHeap.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12Handle.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12HelperUtil.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12RenderTarget.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12Resource.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDx12ResourceScopeManager.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDxDebugUtil.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoDxFormatUtil.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvCoFreeList.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\NvResult.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\pipelineUtilD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\pointRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d12\renderStateD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
+ <ClCompile Include="..\..\d3d12\appD3D12Ctx.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\bufferD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\demoContextD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\diffusePointRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\fluidCompositeRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\fluidEllipsoidRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\imguiGraphD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\imguiInteropD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\lineRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\meshRenderer.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\meshRendererD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\meshRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\meshUtil.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12CircularResourceHeap.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12CounterFence.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12DescriptorHeap.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12HelperUtil.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12RenderTarget.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12Resource.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDx12ResourceScopeManager.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDxDebugUtil.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoDxFormatUtil.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\NvCoFreeList.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\pipelineUtilD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\pointRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d12\renderStateD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="d3d">
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp">
+ <Filter>d3d</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d\imguiGraph.cpp">
+ <Filter>d3d</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d\imguiGraphLoader.cpp">
+ <Filter>d3d</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d\loader.cpp">
+ <Filter>d3d</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\d3d\renderParamsD3D.cpp">
+ <Filter>d3d</Filter>
+ </ClCompile>
+ <ClInclude Include="..\..\d3d\appGraphCtx.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d\imguiGraph.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d\loader.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d\loaderMacros.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d\renderParamsD3D.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\d3d\shaderCommonD3D.h">
+ <Filter>d3d</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup><Filter Include="Shader Files"></Filter></ItemGroup>
+ <ItemGroup>
+ <FxCompile Include="./../../d3d/shaders/debugLineVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/debugLinePS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/imguiPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/imguiVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/meshPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/meshAsyncComputeBenchPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/meshShadowPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/meshVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointGS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointShadowPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/diffuseVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/diffuseGS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/diffusePS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/ellipsoidDepthVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/ellipsoidDepthGS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/ellipsoidDepthPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/passThroughVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/blurDepthPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/compositePS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessGS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ </ItemGroup>
</Project>
\ No newline at end of file diff --git a/demo/compiler/vc14win64/flexDemoCUDA.vcxproj.user b/demo/compiler/vc14win64/flexDemoCUDA.vcxproj.user index 2273e49..0c241a3 100644 --- a/demo/compiler/vc14win64/flexDemoCUDA.vcxproj.user +++ b/demo/compiler/vc14win64/flexDemoCUDA.vcxproj.user @@ -1,15 +1,9 @@ -<?xml version="1.0" encoding="utf-8" ?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+ <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
+</PropertyGroup>
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+ <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
+</PropertyGroup>
+</Project>
\ No newline at end of file diff --git a/demo/compiler/vc14win64/flexDemoD3D.vcxproj b/demo/compiler/vc14win64/flexDemoD3D.vcxproj index 3fbd922..4707fca 100644 --- a/demo/compiler/vc14win64/flexDemoD3D.vcxproj +++ b/demo/compiler/vc14win64/flexDemoD3D.vcxproj @@ -56,7 +56,8 @@ <PrecompiledHeaderFile></PrecompiledHeaderFile> </ClCompile> <Link> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;./../../../external/SDL2-2.0.4/lib/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> + <AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions> + <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;delayimp.lib;./../../../external/SDL2-2.0.4/lib/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> @@ -95,7 +96,8 @@ <PrecompiledHeaderFile></PrecompiledHeaderFile> </ClCompile> <Link> - <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;./../../../external/SDL2-2.0.4/lib/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> + <AdditionalOptions>/DELAYLOAD:d3d11.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll</AdditionalOptions> + <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;d3dcompiler.lib;delayimp.lib;./../../../external/SDL2-2.0.4/lib/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> @@ -182,8 +184,6 @@ </ClInclude> <ClInclude Include="..\..\scenes\pasta.h"> </ClInclude> - <ClInclude Include="..\..\scenes\plasticbody.h"> - </ClInclude> <ClInclude Include="..\..\scenes\player.h"> </ClInclude> <ClInclude Include="..\..\scenes\potpourri.h"> @@ -192,8 +192,6 @@ </ClInclude> <ClInclude Include="..\..\scenes\restitution.h"> </ClInclude> - <ClInclude Include="..\..\scenes\ridigbody.h"> - </ClInclude> <ClInclude Include="..\..\scenes\rigidfluidcoupling.h"> </ClInclude> <ClInclude Include="..\..\scenes\rigidpile.h"> @@ -232,8 +230,12 @@ </ClCompile> <ClCompile Include="..\..\main.cpp"> </ClCompile> + <ClCompile Include="..\..\shadersDemoContext.cpp"> + </ClCompile> <ClInclude Include="..\..\benchmark.h"> </ClInclude> + <ClInclude Include="..\..\demoContext.h"> + </ClInclude> <ClInclude Include="..\..\helpers.h"> </ClInclude> <ClInclude Include="..\..\imgui.h"> @@ -242,6 +244,8 @@ </ClInclude> <ClInclude Include="..\..\shaders.h"> </ClInclude> + <ClInclude Include="..\..\shadersDemoContext.h"> + </ClInclude> <ClInclude Include="..\..\stb_truetype.h"> </ClInclude> </ItemGroup> @@ -270,6 +274,8 @@ </ClCompile> <ClCompile Include="..\..\..\core\platform.cpp"> </ClCompile> + <ClCompile Include="..\..\..\core\png.cpp"> + </ClCompile> <ClCompile Include="..\..\..\core\sdf.cpp"> </ClCompile> <ClCompile Include="..\..\..\core\tga.cpp"> @@ -304,14 +310,14 @@ </ClInclude> <ClInclude Include="..\..\..\core\platform.h"> </ClInclude> + <ClInclude Include="..\..\..\core\png.h"> + </ClInclude> <ClInclude Include="..\..\..\core\point3.h"> </ClInclude> <ClInclude Include="..\..\..\core\quat.h"> </ClInclude> <ClInclude Include="..\..\..\core\sdf.h"> </ClInclude> - <ClInclude Include="..\..\..\core\skylight.h"> - </ClInclude> <ClInclude Include="..\..\..\core\tga.h"> </ClInclude> <ClInclude Include="..\..\..\core\types.h"> @@ -340,6 +346,8 @@ </ClInclude> <ClInclude Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.h"> </ClInclude> + <ClInclude Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.h"> + </ClInclude> <ClInclude Include="..\..\d3d12\imguiGraphD3D12.h"> </ClInclude> <ClInclude Include="..\..\d3d12\lineRenderPipelineD3D12.h"> @@ -396,6 +404,8 @@ </ClCompile> <ClCompile Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.cpp"> </ClCompile> + <ClCompile Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.cpp"> + </ClCompile> <ClCompile Include="..\..\d3d12\imguiGraphD3D12.cpp"> </ClCompile> <ClCompile Include="..\..\d3d12\imguiInteropD3D12.cpp"> @@ -484,8 +494,6 @@ <ItemGroup> <ClInclude Include="..\..\d3d\appGraphCtx.h"> </ClInclude> - <ClInclude Include="..\..\d3d\demoContext.h"> - </ClInclude> <ClInclude Include="..\..\d3d\imguiGraph.h"> </ClInclude> <ClInclude Include="..\..\d3d\loader.h"> @@ -496,8 +504,6 @@ </ClInclude> <ClInclude Include="..\..\d3d\shaderCommonD3D.h"> </ClInclude> - <ClInclude Include="..\..\d3d\shadersDemoContext.h"> - </ClInclude> <ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp"> </ClCompile> <ClCompile Include="..\..\d3d\imguiGraph.cpp"> @@ -508,8 +514,6 @@ </ClCompile> <ClCompile Include="..\..\d3d\renderParamsD3D.cpp"> </ClCompile> - <ClCompile Include="..\..\d3d\shadersDemoContext.cpp"> - </ClCompile> </ItemGroup> <ItemGroup> <FxCompile Include="./../../d3d/shaders/debugLineVS.hlsl"> @@ -890,6 +894,60 @@ <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/pointThicknessVS.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'">pointThicknessVS</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'">Vertex</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'">pointThicknessVS</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="./../../d3d/shaders/pointThicknessGS.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'">pointThicknessGS</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'">Geometry</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'">pointThicknessGS</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="./../../d3d/shaders/pointThicknessPS.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'">pointThicknessPS</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'">pointThicknessPS</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> </ItemGroup> <ItemGroup> <ProjectReference Include="./../../../extensions/compiler/vc14win64/flexExtD3D.vcxproj"> diff --git a/demo/compiler/vc14win64/flexDemoD3D.vcxproj.filters b/demo/compiler/vc14win64/flexDemoD3D.vcxproj.filters index b7f0548..1f816b3 100644 --- a/demo/compiler/vc14win64/flexDemoD3D.vcxproj.filters +++ b/demo/compiler/vc14win64/flexDemoD3D.vcxproj.filters @@ -108,9 +108,6 @@ <ClInclude Include="..\..\scenes\pasta.h">
<Filter>demo\scenes</Filter>
</ClInclude>
- <ClInclude Include="..\..\scenes\plasticbody.h">
- <Filter>demo\scenes</Filter>
- </ClInclude>
<ClInclude Include="..\..\scenes\player.h">
<Filter>demo\scenes</Filter>
</ClInclude>
@@ -123,9 +120,6 @@ <ClInclude Include="..\..\scenes\restitution.h">
<Filter>demo\scenes</Filter>
</ClInclude>
- <ClInclude Include="..\..\scenes\ridigbody.h">
- <Filter>demo\scenes</Filter>
- </ClInclude>
<ClInclude Include="..\..\scenes\rigidfluidcoupling.h">
<Filter>demo\scenes</Filter>
</ClInclude>
@@ -182,9 +176,15 @@ <ClCompile Include="..\..\main.cpp">
<Filter>demo</Filter>
</ClCompile>
+ <ClCompile Include="..\..\shadersDemoContext.cpp">
+ <Filter>demo</Filter>
+ </ClCompile>
<ClInclude Include="..\..\benchmark.h">
<Filter>demo</Filter>
</ClInclude>
+ <ClInclude Include="..\..\demoContext.h">
+ <Filter>demo</Filter>
+ </ClInclude>
<ClInclude Include="..\..\helpers.h">
<Filter>demo</Filter>
</ClInclude>
@@ -197,6 +197,9 @@ <ClInclude Include="..\..\shaders.h">
<Filter>demo</Filter>
</ClInclude>
+ <ClInclude Include="..\..\shadersDemoContext.h">
+ <Filter>demo</Filter>
+ </ClInclude>
<ClInclude Include="..\..\stb_truetype.h">
<Filter>demo</Filter>
</ClInclude>
@@ -245,6 +248,9 @@ <ClCompile Include="..\..\..\core\platform.cpp">
<Filter>core</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\core\png.cpp">
+ <Filter>core</Filter>
+ </ClCompile>
<ClCompile Include="..\..\..\core\sdf.cpp">
<Filter>core</Filter>
</ClCompile>
@@ -296,6 +302,9 @@ <ClInclude Include="..\..\..\core\platform.h">
<Filter>core</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\core\png.h">
+ <Filter>core</Filter>
+ </ClInclude>
<ClInclude Include="..\..\..\core\point3.h">
<Filter>core</Filter>
</ClInclude>
@@ -305,9 +314,6 @@ <ClInclude Include="..\..\..\core\sdf.h">
<Filter>core</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\core\skylight.h">
- <Filter>core</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\core\tga.h">
<Filter>core</Filter>
</ClInclude>
@@ -353,6 +359,9 @@ <ClInclude Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.h">
<Filter>d3d12</Filter>
</ClInclude>
+ <ClInclude Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.h">
+ <Filter>d3d12</Filter>
+ </ClInclude>
<ClInclude Include="..\..\d3d12\imguiGraphD3D12.h">
<Filter>d3d12</Filter>
</ClInclude>
@@ -437,6 +446,9 @@ <ClCompile Include="..\..\d3d12\fluidSmoothRenderPipelineD3D12.cpp">
<Filter>d3d12</Filter>
</ClCompile>
+ <ClCompile Include="..\..\d3d12\fluidThicknessRenderPipelineD3D12.cpp">
+ <Filter>d3d12</Filter>
+ </ClCompile>
<ClCompile Include="..\..\d3d12\imguiGraphD3D12.cpp">
<Filter>d3d12</Filter>
</ClCompile>
@@ -575,9 +587,6 @@ <ClInclude Include="..\..\d3d\appGraphCtx.h">
<Filter>d3d</Filter>
</ClInclude>
- <ClInclude Include="..\..\d3d\demoContext.h">
- <Filter>d3d</Filter>
- </ClInclude>
<ClInclude Include="..\..\d3d\imguiGraph.h">
<Filter>d3d</Filter>
</ClInclude>
@@ -593,9 +602,6 @@ <ClInclude Include="..\..\d3d\shaderCommonD3D.h">
<Filter>d3d</Filter>
</ClInclude>
- <ClInclude Include="..\..\d3d\shadersDemoContext.h">
- <Filter>d3d</Filter>
- </ClInclude>
<ClCompile Include="..\..\d3d\appGraphCtxLoader.cpp">
<Filter>d3d</Filter>
</ClCompile>
@@ -611,9 +617,6 @@ <ClCompile Include="..\..\d3d\renderParamsD3D.cpp">
<Filter>d3d</Filter>
</ClCompile>
- <ClCompile Include="..\..\d3d\shadersDemoContext.cpp">
- <Filter>d3d</Filter>
- </ClCompile>
</ItemGroup>
<ItemGroup><Filter Include="Shader Files"></Filter></ItemGroup>
<ItemGroup>
@@ -680,5 +683,14 @@ <FxCompile Include="./../../d3d/shaders/compositePS.hlsl">
<Filter>Shader Files</Filter>
</FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessVS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessGS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
+ <FxCompile Include="./../../d3d/shaders/pointThicknessPS.hlsl">
+ <Filter>Shader Files</Filter>
+ </FxCompile>
</ItemGroup>
</Project>
\ No newline at end of file diff --git a/demo/compiler/vc14win64/flexDemoD3D.vcxproj.user b/demo/compiler/vc14win64/flexDemoD3D.vcxproj.user index 2273e49..0c241a3 100644 --- a/demo/compiler/vc14win64/flexDemoD3D.vcxproj.user +++ b/demo/compiler/vc14win64/flexDemoD3D.vcxproj.user @@ -1,15 +1,9 @@ -<?xml version="1.0" encoding="utf-8" ?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
- <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
- </PropertyGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'">
+ <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
+</PropertyGroup>
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'">
+ <LocalDebuggerWorkingDirectory>$(OutputPath)</LocalDebuggerWorkingDirectory>
+</PropertyGroup>
+</Project>
\ No newline at end of file diff --git a/demo/compiler/xpj/flexDemoCUDA.xpj b/demo/compiler/xpj/flexDemoCUDA.xpj deleted file mode 100644 index c4b7ab5..0000000 --- a/demo/compiler/xpj/flexDemoCUDA.xpj +++ /dev/null @@ -1,226 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> - -<XPJ version="4"> - - <template filename="../../../common.xpjt"/> - - <Project name="flexDemoCUDA"> - - <Conditional value="${config}" match="internal"> - <Import file="../../../src/device/compiler/xpj/flexDevice.xpj" /> - <Import file="../../../src/compiler/xpj/flexCUDA.xpj" /> - </Conditional> - - <Import file="../../../extensions/compiler/xpj/flexExtCUDA.xpj" /> - - <Export platforms="Win32 Win64">../${xpj:TOOL}${xpj:PLATFORM}</Export> - <Export platform="android{x}" tool="make">../makeandroid</Export> - <Export platform="Linux64" tool="make">../makelinux64</Export> - - <Var name="ProjectRoot" value="../../.."/> - - <Target name="flexDemoCUDA"> - - <!-- Windows --> - - <Config name="default" type="console" platforms="Win32 Win64"> - - <apply-template name="windows-common"/> - - <OutDir platform="Win32">../../../bin/win32/</OutDir> - <OutDir platform="Win64">../../../bin/win64/</OutDir> - <DebugWorkingDir>$(OutputPath)</DebugWorkingDir> - - <Preprocessor type="define"> - _CONSOLE - WIN32 - _CRT_SECURE_NO_WARNINGS - </Preprocessor> - - <WarningLevel>3</WarningLevel> - <GenerateDebugInformation>true</GenerateDebugInformation> - - <CharacterSet>MultiByte</CharacterSet> - - <SearchPaths type="header"> - ..\..\..\..\.. - </SearchPaths> - - <Libraries> - 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 - </Libraries> - - </Config> - - <Config name="debug" type="console" platforms="Win32 Win64"> - <OutFile platform="Win32">NvFlexDemoDebugCUDA_x86.exe</OutFile> - <OutFile platform="Win64">NvFlexDemoDebugCUDA_x64.exe</OutFile> - - <IntDir>./build/${xpj:PLATFORM}/debug/</IntDir> - - <Preprocessor type="define"> - _DEBUG - </Preprocessor> - <Preprocessor type="define"> - _ITERATOR_DEBUG_LEVEL=0 - </Preprocessor> - <RuntimeLibrary>MTd</RuntimeLibrary> - <GenerateDebugInformation>true</GenerateDebugInformation> - <FloatingPointModel>Precise</FloatingPointModel> - - <Libraries platforms="Win32"> - ../../../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 - </Libraries> - <Libraries platforms="Win64"> - ../../../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 - </Libraries> - - </Config> - - <Config name="release" type="console" platforms="Win32 Win64"> - <OutFile platform="Win32">NvFlexDemoReleaseCUDA_x86.exe</OutFile> - <OutFile platform="Win64">NvFlexDemoReleaseCUDA_x64.exe</OutFile> - - <IntDir>./build/${xpj:PLATFORM}/release/</IntDir> - - <Preprocessor type="define"> - NDEBUG - </Preprocessor> - <RuntimeLibrary>MT</RuntimeLibrary> - <WholeProgramOptimization>1</WholeProgramOptimization> - <Optimization>3</Optimization> - <EnableIntrinsicFunctions>true</EnableIntrinsicFunctions> - <BufferSecurityCheck>false</BufferSecurityCheck> - <EnableFunctionLevelLinking>true</EnableFunctionLevelLinking> - <EnableEnhancedInstructionSet>2</EnableEnhancedInstructionSet> - <FloatingPointModel>Fast</FloatingPointModel> - - <Libraries platforms="Win32"> - ../../../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 - </Libraries> - <Libraries platforms="Win64"> - ../../../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 - </Libraries> - - </Config> - - <!-- Linux --> - - <Config name="default" type="console" platforms="linux64"> - - <apply-template name="linux-common"/> - - <Var name="Cub" value="${user:External}/cub-1.3.2"/> - <var name="GCC" value="g++"/> - - <OutDir platforms="linux64" tool="make">${user:ProjectRoot}/bin/linux64</OutDir> - - <SearchPaths type="header" tool="make"> - "${user:ProjectRoot}" - </SearchPaths> - - <CFlags tool="make"> - -Wall -std=c++0x -fPIC -fpermissive -fno-strict-aliasing - </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 -lrt -pthread - </LFlags> - - </Config> - - <Config name="release" type="console" platforms="linux64"> - <Libraries> - :NvFlexReleaseCUDA_x64.a - :NvFlexExtReleaseCUDA_x64.a - :libSDL2.a - :libSDL2main.a - </Libraries> - - <cflags>-O3 -ffast-math -DNDEBUG</cflags> - <OutFile>NvFlexDemoReleaseCUDA_x64</OutFile> - </Config> - - <Config name="debug" type="console" platforms="linux64"> - <Libraries> - :NvFlexDebugCUDA_x64.a - :NvFlexExtDebugCUDA_x64.a - :libSDL2.a - :libSDL2main.a - </Libraries> - - <cflags> -g -O0</cflags> - <OutFile>NvFlexDemoDebugCUDA_x64</OutFile> - </Config> - - <!-- Common Source --> - - <Files name="demo" type="source" root="${user:ProjectRoot}/demo"> - *.cpp *.h - scenes/*.h - </Files> - - <Files name="opengl" type="source" root="${user:ProjectRoot}/demo/opengl"> - *.cpp *.h - </Files> - - <Files name="include" type="source" root="${user:ProjectRoot}/include"> - *.h - </Files> - - <Files name="core" type="source" root="${user:ProjectRoot}/core"> - *.cpp *.h - </Files> - - <!-- Android Source --> - - <Files name="egl_setup" root="${user:ProjectRoot}/external/egl_setup" platform="android{x}"> - *.cpp - *.h - </Files> - - <Files name="android" root="${user:ProjectRoot}/demo/android" platform="android{x}"> - *.cpp - *.c - *.h - </Files> - - <Dependencies> - flexExtCUDA - </Dependencies> - - <Conditional value="${config}" match="internal"> - <Dependencies> - flexCUDA - flexDevice - </Dependencies> - </Conditional> - - </Target> - </Project> - -</XPJ>
\ No newline at end of file diff --git a/demo/compiler/xpj/flexDemoD3D.xpj b/demo/compiler/xpj/flexDemoD3D.xpj deleted file mode 100644 index e957c5b..0000000 --- a/demo/compiler/xpj/flexDemoD3D.xpj +++ /dev/null @@ -1,276 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> - -<XPJ version="4"> - - <template filename="../../../common.xpjt"/> - - <Project name="flexDemoD3D"> - - <Conditional value="${config}" match="internal"> - <Import file="../../../src/device/compiler/xpj/flexDevice.xpj" /> - <Import file="../../../src/compiler/xpj/flexD3D.xpj" /> - </Conditional> - - <Import file="../../../extensions/compiler/xpj/flexExtD3D.xpj" /> - - <Export platforms="Win32 Win64">../${xpj:TOOL}${xpj:PLATFORM}</Export> - - <Var name="ProjectRoot" value="../../.."/> - - <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"> - - <apply-template name="windows-common"/> - - <OutDir platform="Win32">${user:ProjectRoot}/bin/win32/</OutDir> - <OutDir platform="Win64">${user:ProjectRoot}/bin/win64/</OutDir> - <DebugWorkingDir>$(OutputPath)</DebugWorkingDir> - - <Preprocessor type="define"> - _CONSOLE - WIN32 - _CRT_SECURE_NO_WARNINGS - FLEX_DX - FLEX_DX12 - </Preprocessor> - - <WarningLevel>3</WarningLevel> - <GenerateDebugInformation>true</GenerateDebugInformation> - - <CharacterSet>MultiByte</CharacterSet> - - <SearchPaths type="header"> - ${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 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> - - <Config name="debug" type="console" platforms="Win32 Win64"> - <OutFile platform="Win32">NvFlexDemoDebugD3D_x86.exe</OutFile> - <OutFile platform="Win64">NvFlexDemoDebugD3D_x64.exe</OutFile> - - <IntDir>./build/${xpj:PLATFORM}/DX/debug/</IntDir> - - <Preprocessor type="define" platforms="Win32"> - _DEBUG - _ITERATOR_DEBUG_LEVEL=0 - FLEX_DIRECT_COMPUTE - </Preprocessor> - <Preprocessor type="define" platforms="Win64"> - _DEBUG - _ITERATOR_DEBUG_LEVEL=0 - </Preprocessor> - <RuntimeLibrary>MTd</RuntimeLibrary> - <GenerateDebugInformation>true</GenerateDebugInformation> - <FloatingPointModel>Precise</FloatingPointModel> - - <Libraries platforms="Win32"> - ${user:ProjectRoot}/lib/win32/NvFlexDebugD3D_x86.lib - ${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/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/NvToolsExt/lib/x64/nvToolsExt64_1.lib - </Libraries> - - </Config> - - <Config name="release" type="console" platforms="Win32 Win64"> - <OutFile platform="Win32">NvFlexDemoReleaseD3D_x86.exe</OutFile> - <OutFile platform="Win64">NvFlexDemoReleaseD3D_x64.exe</OutFile> - - <IntDir>./build/${xpj:PLATFORM}/D3D/demo/release/</IntDir> - - <Preprocessor type="define" platforms="Win32"> - NDEBUG - </Preprocessor> - <Preprocessor type="define" platforms="Win64"> - NDEBUG - </Preprocessor> - <RuntimeLibrary>MT</RuntimeLibrary> - <WholeProgramOptimization>1</WholeProgramOptimization> - <Optimization>3</Optimization> - <EnableIntrinsicFunctions>true</EnableIntrinsicFunctions> - <BufferSecurityCheck>false</BufferSecurityCheck> - <EnableFunctionLevelLinking>true</EnableFunctionLevelLinking> - <FloatingPointModel>Fast</FloatingPointModel> - - <Libraries platforms="Win32"> - ${user:ProjectRoot}/lib/win32/NvFlexReleaseD3D_x86.lib - ${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/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/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 - </Files> - - <Files name="include" type="source" root="${user:ProjectRoot}/include"> - *.h - </Files> - - <Files name="core" type="source" root="${user:ProjectRoot}/core"> - *.cpp *.h - </Files> - - <Dependencies> - flexD3D - flexExtD3D - </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/d3d/shaders/%(Filename).hlsl.h"> - - <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/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/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/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/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/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> - - <Dependencies> - flexExtD3D - </Dependencies> - - <Conditional value="${config}" match="internal"> - <Dependencies> - flexD3D - flexDevice - </Dependencies> - </Conditional> - - </Target> - </Project> -</XPJ>
\ No newline at end of file |