diff --git a/3rdparty/FlyWrapper b/3rdparty/FlyWrapper index 88fa4dc..354db86 160000 --- a/3rdparty/FlyWrapper +++ b/3rdparty/FlyWrapper @@ -1 +1 @@ -Subproject commit 88fa4dcad6873bfa9275a2a992ad1d4f87a17dee +Subproject commit 354db8633b210b2a4bc259e8b05aaf6460ca033d diff --git a/src/Apps/SponzaPbr/CMakeLists.txt b/src/Apps/SponzaPbr/CMakeLists.txt index 40fd662..c8f7cf8 100644 --- a/src/Apps/SponzaPbr/CMakeLists.txt +++ b/src/Apps/SponzaPbr/CMakeLists.txt @@ -95,25 +95,21 @@ set(lib_shaders ${shaders_path}/RayTracingAO.hlsl ) -set_property(SOURCE ${pixel_shaders} PROPERTY VS_SHADER_ENTRYPOINT main) -set_property(SOURCE ${pixel_shaders} PROPERTY VS_SHADER_TYPE Pixel) -set_property(SOURCE ${pixel_shaders} PROPERTY VS_SHADER_MODEL 6.0) -set_property(SOURCE ${pixel_shaders} PROPERTY VS_SHADER_FLAGS "/Zi /auto-binding-space 0") - -set_property(SOURCE ${vertex_shaders} PROPERTY VS_SHADER_ENTRYPOINT main) -set_property(SOURCE ${vertex_shaders} PROPERTY VS_SHADER_TYPE Vertex) -set_property(SOURCE ${vertex_shaders} PROPERTY VS_SHADER_MODEL 6.0) -set_property(SOURCE ${vertex_shaders} PROPERTY VS_SHADER_FLAGS "/Zi /auto-binding-space 0") - -set_property(SOURCE ${compute_shaders} PROPERTY VS_SHADER_ENTRYPOINT main) -set_property(SOURCE ${compute_shaders} PROPERTY VS_SHADER_TYPE Compute) -set_property(SOURCE ${compute_shaders} PROPERTY VS_SHADER_MODEL 6.0) -set_property(SOURCE ${compute_shaders} PROPERTY VS_SHADER_FLAGS "/Zi /auto-binding-space 0") - -set_property(SOURCE ${lib_shaders} PROPERTY VS_SHADER_ENTRYPOINT " ") -set_property(SOURCE ${lib_shaders} PROPERTY VS_SHADER_TYPE Library) -set_property(SOURCE ${lib_shaders} PROPERTY VS_SHADER_MODEL 6.3) -set_property(SOURCE ${lib_shaders} PROPERTY VS_SHADER_FLAGS "/Zi /auto-binding-space 0") +set_property(SOURCE ${pixel_shaders} PROPERTY SHADER_ENTRYPOINT main) +set_property(SOURCE ${pixel_shaders} PROPERTY SHADER_TYPE Pixel) +set_property(SOURCE ${pixel_shaders} PROPERTY SHADER_MODEL 6.0) + +set_property(SOURCE ${vertex_shaders} PROPERTY SHADER_ENTRYPOINT main) +set_property(SOURCE ${vertex_shaders} PROPERTY SHADER_TYPE Vertex) +set_property(SOURCE ${vertex_shaders} PROPERTY SHADER_MODEL 6.0) + +set_property(SOURCE ${compute_shaders} PROPERTY SHADER_ENTRYPOINT main) +set_property(SOURCE ${compute_shaders} PROPERTY SHADER_TYPE Compute) +set_property(SOURCE ${compute_shaders} PROPERTY SHADER_MODEL 6.0) + +set_property(SOURCE ${lib_shaders} PROPERTY SHADER_ENTRYPOINT " ") +set_property(SOURCE ${lib_shaders} PROPERTY SHADER_TYPE Library) +set_property(SOURCE ${lib_shaders} PROPERTY SHADER_MODEL 6.3) set(shaders_files ${pixel_shaders} ${vertex_shaders} ${compute_shaders} ${lib_shaders})