D3D11Renderer: Fixed some crashes.

DragonJoker · Nov 8, 2021 · cd8bd72 · cd8bd72
1 parent d75d242
commit cd8bd72
Show file tree

Hide file tree

Showing 36 changed files with 990 additions and 454 deletions.
diff --git a/CMake b/CMake
diff --git a/source/ashes/renderer/D3D11Renderer/CMakeLists.txt b/source/ashes/renderer/D3D11Renderer/CMakeLists.txt
@@ -175,6 +175,7 @@ source_group( "Source Files\\Command\\Commands" FILES ${${PROJECT_NAME}_FOLDER_S
 set( ${PROJECT_NAME}_FOLDER_SRC_FILES
 	Core/D3D11DebugReportCallback.cpp
 	Core/D3D11Device.cpp
+	Core/D3D11DeviceContextLock.cpp
 	Core/D3D11Display.cpp
 	Core/D3D11DisplayMode.cpp
 	Core/D3D11Instance.cpp
@@ -186,6 +187,7 @@ set( ${PROJECT_NAME}_FOLDER_SRC_FILES
 set( ${PROJECT_NAME}_FOLDER_HDR_FILES
 	Core/D3D11DebugReportCallback.hpp
 	Core/D3D11Device.hpp
+	Core/D3D11DeviceContextLock.hpp
 	Core/D3D11Display.hpp
 	Core/D3D11DisplayMode.hpp
 	Core/D3D11DummyIndexBuffer.hpp

diff --git a/source/ashes/renderer/D3D11Renderer/Command/Commands/D3D11BeginSubpassCommand.cpp b/source/ashes/renderer/D3D11Renderer/Command/Commands/D3D11BeginSubpassCommand.cpp
@@ -74,22 +74,29 @@ namespace ashes::d3d11
 
 	void BeginSubpassCommand::apply( Context const & context )const
 	{
-		if ( context.uavs.empty() )
-		{
-			context.context->OMSetRenderTargets( UINT( m_attaches.size() )
-				, m_attaches.data()
-				, m_depthAttach );
-		}
-		else
+		auto uavStart = UINT( m_attaches.size() );
+		context.context->OMSetRenderTargetsAndUnorderedAccessViews( UINT( m_attaches.size() )
+			, m_attaches.data()
+			, m_depthAttach
+			, uavStart
+			, D3D11_KEEP_UNORDERED_ACCESS_VIEWS
+			, nullptr
+			, nullptr );
+
+		if ( context.uavStart != uavStart )
 		{
-			auto uavs = doListUavs( context.uavs );
-			context.context->OMSetRenderTargetsAndUnorderedAccessViews( UINT( m_attaches.size() )
-				, m_attaches.data()
-				, m_depthAttach
-				, UINT( m_attaches.size() )
-				, UINT( uavs.size() )
-				, uavs.data()
-				, nullptr );
+			context.uavStart = uavStart;
+
+			if ( !context.rawUavs.empty() )
+			{
+				context.context->OMSetRenderTargetsAndUnorderedAccessViews( D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL
+					, nullptr
+					, nullptr
+					, context.uavStart
+					, UINT( context.rawUavs.size() )
+					, context.rawUavs.data()
+					, nullptr );
+			}
 		}
 	}
+1 −0		CompilationFlags.cmake
+2 −2		FileUtils.cmake
+17 −9		Project.cmake