git.s-ol.nu ~forks/DiligentCore / 59be7e5
Fixed Win SDK 17763 build issues assiduous 4 months ago
3 changed file(s) with 20 addition(s) and 0 deletion(s). Raw diff Collapse all Expand all
4040 #include <algorithm>
4141 #include <d3d12.h>
4242
43 #ifndef NTDDI_WIN10_VB // First defined in Win SDK 10.0.19041.0
44 # define D3D12_INDIRECT_ARGUMENT_TYPE_DISPATCH_RAYS static_cast<D3D12_INDIRECT_ARGUMENT_TYPE>(D3D12_INDIRECT_ARGUMENT_TYPE_UNORDERED_ACCESS_VIEW + 1)
45 # define D3D12_RAYTRACING_TIER_1_1 static_cast<D3D12_RAYTRACING_TIER>(11)
46 #endif
47
48
4349 #include "PlatformDefinitions.h"
4450 #include "Errors.hpp"
4551 #include "RefCntAutoPtr.hpp"
11871187 NonUniformIndexingSupported = true;
11881188 NonUniformIndexingIsNative = true;
11891189 break;
1190
1191 default:
1192 UNEXPECTED("Unexpected descriptor type");
11901193 }
11911194
11921195 // TODO: We don't know if this resource is used for non-uniform indexing or not.
4545
4646 #if D3D12_SUPPORTED
4747 # include <d3d12shader.h>
48
49 # ifndef NTDDI_WIN10_VB // First defined in Win SDK 10.0.19041.0
50 # define NO_D3D_SIT_ACCELSTRUCT_FEEDBACK_TEX 1
51
52 # define D3D_SIT_RTACCELERATIONSTRUCTURE static_cast<D3D_SHADER_INPUT_TYPE>(D3D_SIT_UAV_RWSTRUCTURED_WITH_COUNTER + 1)
53 # define D3D_SIT_UAV_FEEDBACKTEXTURE static_cast<D3D_SHADER_INPUT_TYPE>(D3D_SIT_RTACCELERATIONSTRUCTURE + 1)
54 # endif
4855 #endif
4956
5057 #include "HLSLUtils.hpp"
881888 Ext.SrcBindPoint = ResDesc.BindPoint;
882889 Ext.SrcSpace = ResDesc.Space;
883890
891 # ifdef NO_D3D_SIT_ACCELSTRUCT_FEEDBACK_TEX
892 switch (int{ResDesc.Type}) // Prevent "not a valid value for switch of enum '_D3D_SHADER_INPUT_TYPE'" warning
893 # else
884894 switch (ResDesc.Type)
895 # endif
885896 {
886897 case D3D_SIT_CBUFFER:
887898 Ext.Type = RES_TYPE_CBV;