git.s-ol.nu ~forks/DiligentCore / 3a08ea3
D3D12 backend: more header organizing assiduous 6 months ago
36 changed file(s) with 171 addition(s) and 42 deletion(s). Raw diff Collapse all Expand all
3131
3232 #include "EngineD3D12ImplTraits.hpp"
3333 #include "BottomLevelASD3D12.h"
34 #include "RenderDeviceD3D12.h"
3534 #include "BottomLevelASBase.hpp"
3635 #include "D3D12ResourceBase.hpp"
3736
3131
3232 #include "EngineD3D12ImplTraits.hpp"
3333 #include "BufferD3D12.h"
34 #include "RenderDeviceD3D12.h"
3534 #include "BufferBase.hpp"
35 #include "BufferViewD3D12Impl.hpp" // Required by BufferBase
3636 #include "D3D12ResourceBase.hpp"
3737 #include "D3D12DynamicHeap.hpp"
38 #include "BufferViewD3D12Impl.hpp"
38 #include "DescriptorHeap.hpp"
3939
4040 namespace Diligent
4141 {
3131
3232 #include "EngineD3D12ImplTraits.hpp"
3333 #include "BufferViewD3D12.h"
34 #include "RenderDeviceD3D12.h"
3534 #include "BufferViewBase.hpp"
3635 #include "DescriptorHeap.hpp"
3736
3434
3535 #include "DeviceContextD3D12.h"
3636 #include "DeviceContextNextGenBase.hpp"
37
38 // D3D12 object implementations are required by DeviceContextBase
3739 #include "BufferD3D12Impl.hpp"
3840 #include "TextureD3D12Impl.hpp"
3941 #include "QueryD3D12Impl.hpp"
4042 #include "FramebufferD3D12Impl.hpp"
4143 #include "RenderPassD3D12Impl.hpp"
4244 #include "PipelineStateD3D12Impl.hpp"
43 #include "D3D12DynamicHeap.hpp"
4445 #include "BottomLevelASD3D12Impl.hpp"
4546 #include "TopLevelASD3D12Impl.hpp"
4647
48 #include "D3D12DynamicHeap.hpp"
4749
4850 namespace Diligent
4951 {
3131
3232 #include "EngineD3D12ImplTraits.hpp"
3333 #include "FenceD3D12.h"
34 #include "RenderDeviceD3D12.h"
3534 #include "FenceBase.hpp"
3635
3736 namespace Diligent
3030 /// Declaration of Diligent::FramebufferD3D12Impl class
3131
3232 #include "EngineD3D12ImplTraits.hpp"
33 #include "RenderDeviceD3D12.h"
3433 #include "FramebufferBase.hpp"
3534
3635 namespace Diligent
3232 #include <vector>
3333
3434 #include "EngineD3D12ImplTraits.hpp"
35 #include "RenderDeviceD3D12.h"
3635 #include "PipelineStateD3D12.h"
3736 #include "PipelineStateBase.hpp"
37 #include "PipelineResourceSignatureD3D12Impl.hpp" // Requiured by PipelineStateBase
3838 #include "RootSignature.hpp"
39 #include "PipelineResourceSignatureD3D12Impl.hpp" // Requiured by PipelineStateBase
4039
4140 namespace Diligent
4241 {
3030 /// Declaration of Diligent::RenderPassD3D12Impl class
3131
3232 #include "EngineD3D12ImplTraits.hpp"
33 #include "RenderDeviceD3D12.h"
3433 #include "RenderPassBase.hpp"
3534
3635 namespace Diligent
3131
3232 #include "EngineD3D12ImplTraits.hpp"
3333 #include "SamplerD3D12.h"
34 #include "RenderDeviceD3D12.h"
3534 #include "SamplerBase.hpp"
3635 #include "DescriptorHeap.hpp"
3736
3030 /// Declaration of Diligent::ShaderD3D12Impl class
3131
3232 #include "EngineD3D12ImplTraits.hpp"
33 #include "RenderDeviceD3D12.h"
3433 #include "ShaderD3D12.h"
3534 #include "ShaderBase.hpp"
3635 #include "ShaderD3DBase.hpp"
3333 #include "TopLevelASD3D12.h"
3434 #include "TopLevelASBase.hpp"
3535 #include "D3D12ResourceBase.hpp"
36 #include "BottomLevelASD3D12Impl.hpp" // Required by TopLevelASBase
3637 #include "DescriptorHeap.hpp"
37 #include "BottomLevelASD3D12Impl.hpp" // Required by TopLevelASBase
3838
3939 namespace Diligent
4040 {
2727 #include "pch.h"
2828
2929 #include "BottomLevelASD3D12Impl.hpp"
30
3031 #include "RenderDeviceD3D12Impl.hpp"
3132 #include "D3D12TypeConversions.hpp"
3233 #include "GraphicsAccessories.hpp"
2727 #include "pch.h"
2828
2929 #include "BufferD3D12Impl.hpp"
30
3031 #include "RenderDeviceD3D12Impl.hpp"
3132 #include "DeviceContextD3D12Impl.hpp"
33
3234 #include "D3D12TypeConversions.hpp"
3335 #include "GraphicsAccessories.hpp"
3436 #include "DXGITypeConversions.hpp"
2525 */
2626
2727 #include "pch.h"
28
2829 #include "BufferViewD3D12Impl.hpp"
30
2931 #include "BufferD3D12Impl.hpp"
3032 #include "RenderDeviceD3D12Impl.hpp"
3133
2626
2727 #include "pch.h"
2828
29 #include "CommandContext.hpp"
30
2931 #include "d3dx12_win.h"
3032
31 #include "CommandContext.hpp"
3233 #include "RenderDeviceD3D12Impl.hpp"
3334 #include "TextureD3D12Impl.hpp"
3435 #include "BufferD3D12Impl.hpp"
3536 #include "BottomLevelASD3D12Impl.hpp"
3637 #include "TopLevelASD3D12Impl.hpp"
38
3739 #include "CommandListManager.hpp"
3840 #include "D3D12TypeConversions.hpp"
3941
2626
2727 #include "pch.h"
2828
29 #include "D3D12TypeConversions.hpp"
30
2931 #include <array>
3032
31 #include "D3D12TypeConversions.hpp"
3233 #include "DXGITypeConversions.hpp"
33
3434 #include "D3D12TypeDefinitions.h"
3535 #include "D3DTypeConversionImpl.hpp"
3636 #include "D3DViewDescConversionImpl.hpp"
2525 */
2626
2727 #include "pch.h"
28
2829 #include "D3D12Utils.h"
2930
3031 #include <cstring>
2626
2727 #include "pch.h"
2828
29 #include "DeviceContextD3D12Impl.hpp"
30
2931 #include <sstream>
30 #include <vector>
3132
3233 #include "RenderDeviceD3D12Impl.hpp"
33 #include "DeviceContextD3D12Impl.hpp"
3434 #include "PipelineStateD3D12Impl.hpp"
35 #include "CommandContext.hpp"
3635 #include "TextureD3D12Impl.hpp"
3736 #include "BufferD3D12Impl.hpp"
3837 #include "FenceD3D12Impl.hpp"
38 #include "ShaderBindingTableD3D12Impl.hpp"
39 #include "ShaderResourceBindingD3D12Impl.hpp"
40 #include "CommandListD3D12Impl.hpp"
41
42 #include "CommandContext.hpp"
3943 #include "D3D12TypeConversions.hpp"
4044 #include "d3dx12_win.h"
4145 #include "D3D12DynamicHeap.hpp"
42 #include "CommandListD3D12Impl.hpp"
4346 #include "DXGITypeConversions.hpp"
44 #include "ShaderBindingTableD3D12Impl.hpp"
45 #include "ShaderResourceBindingD3D12Impl.hpp"
4647
4748 namespace Diligent
4849 {
2929
3030 #include "pch.h"
3131
32 #include "EngineFactoryD3D12.h"
33
3234 #include <array>
3335 #include <string>
3436
35 #include "EngineFactoryD3D12.h"
3637 #include "RenderDeviceD3D12Impl.hpp"
3738 #include "DeviceContextD3D12Impl.hpp"
3839 #include "SwapChainD3D12Impl.hpp"
2525 */
2626
2727 #include "pch.h"
28
29 #include "FenceD3D12Impl.hpp"
30
2831 #include <thread>
2932 #include <atlbase.h>
3033
31 #include "FenceD3D12Impl.hpp"
3234 #include "RenderDeviceD3D12Impl.hpp"
3335
3436 namespace Diligent
4242
4343
4444 #include "pch.h"
45
46 #include "GenerateMips.hpp"
47
4548 #include "d3dx12_win.h"
4649
4750 #include "RenderDeviceD3D12Impl.hpp"
48 #include "GenerateMips.hpp"
4951 #include "CommandContext.hpp"
5052 #include "TextureViewD3D12Impl.hpp"
5153 #include "TextureD3D12Impl.hpp"
2626
2727 #include "pch.h"
2828
29 #include "PipelineResourceSignatureD3D12Impl.hpp"
30
2931 #include <unordered_map>
3032
31 #include "PipelineResourceSignatureD3D12Impl.hpp"
32 #include "ShaderResourceCacheD3D12.hpp"
3333 #include "RenderDeviceD3D12Impl.hpp"
34 #include "ShaderResourceBindingD3D12Impl.hpp"
3534 #include "BufferD3D12Impl.hpp"
3635 #include "BufferViewD3D12Impl.hpp"
3736 #include "SamplerD3D12Impl.hpp"
2626
2727 #include "pch.h"
2828
29 #include "PipelineStateD3D12Impl.hpp"
30
2931 #include <array>
3032 #include <sstream>
3133 #include <unordered_map>
3638 # undef FindResource
3739 #endif
3840
39 #include "PipelineStateD3D12Impl.hpp"
41 #include "RenderDeviceD3D12Impl.hpp"
4042 #include "ShaderD3D12Impl.hpp"
41 #include "RenderDeviceD3D12Impl.hpp"
4243 #include "ShaderResourceBindingD3D12Impl.hpp"
44
4345 #include "D3D12TypeConversions.hpp"
4446 #include "DXGITypeConversions.hpp"
4547 #include "CommandContext.hpp"
2525 */
2626
2727 #include "pch.h"
28
29 #include "QueryD3D12Impl.hpp"
30
2831 #include <atlbase.h>
2932
30 #include "QueryD3D12Impl.hpp"
3133 #include "RenderDeviceD3D12Impl.hpp"
3234 #include "GraphicsAccessories.hpp"
3335 #include "DeviceContextD3D12Impl.hpp"
2525 */
2626
2727 #include "pch.h"
28
29 #include "QueryManagerD3D12.hpp"
30
2831 #include <algorithm>
2932
30 #include "QueryManagerD3D12.hpp"
3133 #include "D3D12TypeConversions.hpp"
3234 #include "GraphicsAccessories.hpp"
3335 #include "CommandContext.hpp"
2626
2727 #include "pch.h"
2828
29 #include "RenderDeviceD3D12Impl.hpp"
30
2931 #include <dxgi1_4.h>
3032 #include <vector>
3133
32 #include "RenderDeviceD3D12Impl.hpp"
3334 #include "PipelineStateD3D12Impl.hpp"
3435 #include "ShaderD3D12Impl.hpp"
3536 #include "TextureD3D12Impl.hpp"
36 #include "DXGITypeConversions.hpp"
3737 #include "SamplerD3D12Impl.hpp"
3838 #include "BufferD3D12Impl.hpp"
3939 #include "ShaderResourceBindingD3D12Impl.hpp"
4646 #include "TopLevelASD3D12Impl.hpp"
4747 #include "ShaderBindingTableD3D12Impl.hpp"
4848 #include "PipelineResourceSignatureD3D12Impl.hpp"
49
4950 #include "EngineMemory.h"
51 #include "DXGITypeConversions.hpp"
52
5053
5154 namespace Diligent
5255 {
2727 #include "pch.h"
2828
2929 #include "RootSignature.hpp"
30
31 #include "RenderDeviceD3D12Impl.hpp"
32 #include "PipelineResourceSignatureD3D12Impl.hpp"
3033 #include "CommandContext.hpp"
31 #include "RenderDeviceD3D12Impl.hpp"
3234 #include "D3D12TypeConversions.hpp"
3335 #include "HashUtils.hpp"
34 #include "PipelineResourceSignatureD3D12Impl.hpp"
3536
3637 namespace Diligent
3738 {
2626
2727 #include "pch.h"
2828
29 #include "ShaderD3D12Impl.hpp"
30
2931 #include <D3Dcompiler.h>
3032
31 #include "ShaderD3D12Impl.hpp"
3233 #include "RenderDeviceD3D12Impl.hpp"
3334 #include "DataBlobImpl.hpp"
3435
2727 #include "pch.h"
2828
2929 #include "ShaderResourceBindingD3D12Impl.hpp"
30
3031 #include "RenderDeviceD3D12Impl.hpp"
32 #include "PipelineResourceSignatureD3D12Impl.hpp"
3133 #include "FixedLinearAllocator.hpp"
32 #include "PipelineResourceSignatureD3D12Impl.hpp"
3334
3435 namespace Diligent
3536 {
2727 #include "pch.h"
2828
2929 #include "ShaderResourceCacheD3D12.hpp"
30
3031 #include "RenderDeviceD3D12Impl.hpp"
3132 #include "BufferD3D12Impl.hpp"
3233 #include "BufferViewD3D12Impl.hpp"
3334 #include "TextureD3D12Impl.hpp"
3435 #include "TextureViewD3D12Impl.hpp"
3536 #include "TopLevelASD3D12Impl.hpp"
37
3638 #include "CommandContext.hpp"
3739
3840 namespace Diligent
2626
2727 #include "pch.h"
2828
29 #include "ShaderResourcesD3D12.hpp"
30
2931 #include <d3dcompiler.h>
30 #include "ShaderResourcesD3D12.hpp"
32
3133 #include "ShaderD3DBase.hpp"
3234 #include "ShaderBase.hpp"
3335 #include "DXCompiler.hpp"
2727 #include "pch.h"
2828
2929 #include "ShaderVariableManagerD3D12.hpp"
30
3031 #include "RenderDeviceD3D12Impl.hpp"
32 #include "PipelineResourceSignatureD3D12Impl.hpp"
3133 #include "ShaderResourceCacheD3D12.hpp"
32 #include "PipelineResourceSignatureD3D12Impl.hpp"
3334
3435 namespace Diligent
3536 {
2525 */
2626
2727 #include "pch.h"
28
2829 #include "SwapChainD3D12Impl.hpp"
30
2931 #include "RenderDeviceD3D12Impl.hpp"
3032 #include "DeviceContextD3D12Impl.hpp"
33 #include "TextureD3D12Impl.hpp"
34
3135 #include "DXGITypeConversions.hpp"
32 #include "TextureD3D12Impl.hpp"
3336 #include "EngineMemory.h"
3437
3538 namespace Diligent
2727 #include "pch.h"
2828
2929 #include "TextureD3D12Impl.hpp"
30
3031 #include "RenderDeviceD3D12Impl.hpp"
3132 #include "DeviceContextD3D12Impl.hpp"
33 #include "TextureViewD3D12Impl.hpp"
34
3235 #include "D3D12TypeConversions.hpp"
33 #include "TextureViewD3D12Impl.hpp"
3436 #include "DXGITypeConversions.hpp"
3537 #include "d3dx12_win.h"
3638 #include "EngineMemory.h"
2727 #include "pch.h"
2828
2929 #include "TopLevelASD3D12Impl.hpp"
30
3031 #include "RenderDeviceD3D12Impl.hpp"
3132 #include "D3D12TypeConversions.hpp"
3233 #include "GraphicsAccessories.hpp"
0 # Includes
1
2 ## Header files
3
4 Includes in the source file should go in the following order:
5 1. System includes and standard headers
6 2. Diligent Engine interface headers
7 3. Header for the base object implementation, if any
8 4. Headers of the object implementations
9 5. Other headers required by this header file
10
11 Example:
12
13 ```cpp
14 // DeviceContextD3D12Impl.hpp
15
16 // 1 - System includes and standard headers
17 #include <unordered_map>
18 #include <vector>
19
20 // 2 - System includes and standard headers
21 #include "DeviceContextD3D12.h"
22
23 // 3 - Header for the base object implementation
24 #include "DeviceContextNextGenBase.hpp"
25
26 // 4 - Headers of the object implementations
27 #include "BufferD3D12Impl.hpp"
28 #include "TextureD3D12Impl.hpp"
29 #include "QueryD3D12Impl.hpp"
30 #include "FramebufferD3D12Impl.hpp"
31 #include "RenderPassD3D12Impl.hpp"
32 #include "PipelineStateD3D12Impl.hpp"
33 #include "D3D12DynamicHeap.hpp"
34 #include "BottomLevelASD3D12Impl.hpp"
35 #include "TopLevelASD3D12Impl.hpp"
36
37 // 5 - Other headers
38 #include "D3D12DynamicHeap.hpp"
39 ```
40
41 ## Source files
42
43 Includes in the source file should go in the following order:
44
45 1. Precompiled header (if any)
46 2. The source file's header
47 3. System includes and standard headers
48 4. Diligent Engine interface headers
49 5. Headers of the object implementations
50 6. Other headers required by this source file
51
52 Example:
53
54 ```cpp
55 // DeviceContextD3D12Impl.cpp
56
57
58 // 1 - Precompiled header
59 #include "pch.h"
60
61 // 2 - The source file's header
62 #include "DeviceContextD3D12Impl.hpp"
63
64 // 3 - System includes and standard headers
65 #include <sstream>
66
67 // 4 - Interface headers
68 #include "RenderDeviceD3D12.hpp"
69 #include "DeviceContextD3D12.hpp"
70
71 // 5 - Headers of the object implementations
72 #include "RenderDeviceD3D12Impl.hpp"
73 #include "PipelineStateD3D12Impl.hpp"
74 #include "TextureD3D12Impl.hpp"
75 #include "BufferD3D12Impl.hpp"
76 #include "FenceD3D12Impl.hpp"
77 #include "ShaderBindingTableD3D12Impl.hpp"
78 #include "ShaderResourceBindingD3D12Impl.hpp"
79 #include "CommandListD3D12Impl.hpp"
80
81 // 6 - Other headers required by this source file
82 #include "CommandContext.hpp"
83 #include "D3D12TypeConversions.hpp"
84 #include "d3dx12_win.h"
85 #include "D3D12DynamicHeap.hpp"
86 #include "DXGITypeConversions.hpp"
87 ```
88
89 When there is more than one header in each group, it is recommended to separate the groups with blank lines.
90
91
92 # Exceptions
93
94
95 # Naming conventions
96
97
98 # Debug macros