add function support and fix c++20

LinkClinton · Oct 25, 2023 · 34e9ebc · 34e9ebc
1 parent e36cab9
commit 34e9ebc
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/commands/command_list.cpp b/commands/command_list.cpp
@@ -92,12 +92,22 @@ void wrapper::directx12::graphics_command_list::set_graphics_shader_resource_vie
 	mWrapperInstance->SetGraphicsRootShaderResourceView(index, resource->GetGPUVirtualAddress());
 }
 
+void wrapper::directx12::graphics_command_list::set_compute_shader_resource_view(uint32 index, const resource& resource) const
+{
+	mWrapperInstance->SetComputeRootShaderResourceView(index, resource->GetGPUVirtualAddress());
+}
+
 void wrapper::directx12::graphics_command_list::set_graphics_constant_buffer_view(uint32 index,
                                                                                   const buffer& resource) const
 {
 	mWrapperInstance->SetGraphicsRootConstantBufferView(index, resource->GetGPUVirtualAddress());
 }
 
+void wrapper::directx12::graphics_command_list::set_compute_constant_buffer_view(uint32 index, const buffer& resource) const
+{
+	mWrapperInstance->SetComputeRootConstantBufferView(index, resource->GetGPUVirtualAddress());
+}
+
 void wrapper::directx12::graphics_command_list::set_graphics_constants(uint32 index, const void* data, uint32 count, uint32 offset) const
 {
 	mWrapperInstance->SetGraphicsRoot32BitConstants(index, count, data, offset);

diff --git a/commands/command_list.hpp b/commands/command_list.hpp
@@ -60,9 +60,13 @@ namespace wrapper::directx12
 		void set_compute_descriptor_table(uint32 index, const D3D12_GPU_DESCRIPTOR_HANDLE& base) const;
 
 		void set_graphics_shader_resource_view(uint32 index, const resource& resource) const;
-
+
+		void set_compute_shader_resource_view(uint32 index, const resource& resource) const;
+
 		void set_graphics_constant_buffer_view(uint32 index, const buffer& resource) const;
-
+
+		void set_compute_constant_buffer_view(uint32 index, const buffer& resource) const;
+
 		void set_graphics_constants(uint32 index, const void* data, uint32 count, uint32 offset) const;
 
 		void set_graphics_constants(uint32 index, const std::vector<value32bit>& values) const;

diff --git a/directx12-wrapper.vcxproj b/directx12-wrapper.vcxproj
@@ -153,7 +153,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
@@ -169,7 +169,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
@@ -201,7 +201,7 @@
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <LanguageStandard>stdcpp20</LanguageStandard>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>

diff --git a/raytracings/accleration.cpp b/raytracings/accleration.cpp
@@ -108,7 +108,7 @@ wrapper::directx12::raytracing_acceleration wrapper::directx12::raytracing_accel
 	acceleration.mCpuInstances = buffer::create(device, resource_info::upload(),
 		instances_desc.size() * sizeof(D3D12_RAYTRACING_INSTANCE_DESC));
 
-	acceleration.mGpuInstances = buffer::create(device, resource_info::common(D3D12_RESOURCE_STATE_COPY_DEST), 
+	acceleration.mGpuInstances = buffer::create(device, resource_info::common(), 
 		instances_desc.size() * sizeof(D3D12_RAYTRACING_INSTANCE_DESC));
 
 	acceleration.mCpuInstances.copy_from_cpu(instances_desc.data(), instances_desc.size() * sizeof(D3D12_RAYTRACING_INSTANCE_DESC));
@@ -138,7 +138,7 @@ wrapper::directx12::raytracing_acceleration wrapper::directx12::raytracing_accel
 		build_info.ResultDataMaxSizeInBytes);
 
 	acceleration.mScratch = buffer::create(device, resource_info::common(
-		D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS),
+		D3D12_RESOURCE_STATE_COMMON, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS),
 		build_info.ScratchDataSizeInBytes);
 
 	D3D12_BUILD_RAYTRACING_ACCELERATION_STRUCTURE_DESC desc = {};