From c38d9b8adc4007dfc05bd48ab643896d7fff9560 Mon Sep 17 00:00:00 2001 From: assiduous Date: Tue, 15 Dec 2020 15:35:55 -0800 Subject: Fixed Win SDK 17763 build issues --- Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.hpp | 7 +++++++ Graphics/GraphicsEngineD3D12/src/BottomLevelASD3D12Impl.cpp | 7 +++++++ Graphics/GraphicsEngineD3D12/src/TopLevelASD3D12Impl.cpp | 4 ++++ 3 files changed, 18 insertions(+) (limited to 'Graphics/GraphicsEngineD3D12') diff --git a/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.hpp index bf44fbb6..7af858db 100644 --- a/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.hpp +++ b/Graphics/GraphicsEngineD3D12/include/RenderDeviceD3D12Impl.hpp @@ -42,6 +42,13 @@ #include "QueryManagerD3D12.hpp" #include "DXCompiler.hpp" +#ifndef D3D12_RAYTRACING_MAX_RAY_GENERATION_SHADER_THREADS // Defined in Win SDK 19041+ +# define D3D12_RAYTRACING_MAX_RAY_GENERATION_SHADER_THREADS (1073741824) +#endif +#ifndef D3D12_RAYTRACING_MAX_SHADER_RECORD_STRIDE // Defined in Win SDK 19041+ +# define D3D12_RAYTRACING_MAX_SHADER_RECORD_STRIDE (4096) +#endif + namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/src/BottomLevelASD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/BottomLevelASD3D12Impl.cpp index d2e119b3..bb1e9ccd 100644 --- a/Graphics/GraphicsEngineD3D12/src/BottomLevelASD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/BottomLevelASD3D12Impl.cpp @@ -33,6 +33,13 @@ #include "DXGITypeConversions.hpp" #include "StringTools.hpp" +#ifndef D3D12_RAYTRACING_MAX_PRIMITIVES_PER_BOTTOM_LEVEL_ACCELERATION_STRUCTURE // Defined in Win SDK 19041+ +# define D3D12_RAYTRACING_MAX_PRIMITIVES_PER_BOTTOM_LEVEL_ACCELERATION_STRUCTURE (536870912) +#endif +#ifndef D3D12_RAYTRACING_MAX_GEOMETRIES_PER_BOTTOM_LEVEL_ACCELERATION_STRUCTURE // Defined in Win SDK 19041+ +# define D3D12_RAYTRACING_MAX_GEOMETRIES_PER_BOTTOM_LEVEL_ACCELERATION_STRUCTURE (16777216) +#endif + namespace Diligent { diff --git a/Graphics/GraphicsEngineD3D12/src/TopLevelASD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/TopLevelASD3D12Impl.cpp index dff2dcfb..84b45527 100644 --- a/Graphics/GraphicsEngineD3D12/src/TopLevelASD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/TopLevelASD3D12Impl.cpp @@ -33,6 +33,10 @@ #include "DXGITypeConversions.hpp" #include "StringTools.hpp" +#ifndef D3D12_RAYTRACING_MAX_INSTANCES_PER_TOP_LEVEL_ACCELERATION_STRUCTURE // Defined in Win SDK 19041+ +# define D3D12_RAYTRACING_MAX_INSTANCES_PER_TOP_LEVEL_ACCELERATION_STRUCTURE (16777216) +#endif + namespace Diligent { -- cgit v1.2.3