Browse Source

Merge pull request #314 from mendsley/resolved3d11rt

Resolve D3D11 render targets before switching.
Branimir Karadžić 10 years ago
parent
commit
ca41b8b774
1 changed files with 8 additions and 8 deletions
  1. 8 8
      src/renderer_d3d11.cpp

+ 8 - 8
src/renderer_d3d11.cpp

@@ -1436,6 +1436,14 @@ namespace bgfx { namespace d3d11
 
 
 		void setFrameBuffer(FrameBufferHandle _fbh, bool _msaa = true)
 		void setFrameBuffer(FrameBufferHandle _fbh, bool _msaa = true)
 		{
 		{
+			if (isValid(m_fbh)
+			&&  m_fbh.idx != _fbh.idx
+			&&  m_rtMsaa)
+			{
+				FrameBufferD3D11& frameBuffer = m_frameBuffers[m_fbh.idx];
+				frameBuffer.resolve();
+			}
+
 			BX_UNUSED(_msaa);
 			BX_UNUSED(_msaa);
 			if (!isValid(_fbh) )
 			if (!isValid(_fbh) )
 			{
 			{
@@ -1455,14 +1463,6 @@ namespace bgfx { namespace d3d11
 				m_currentDepthStencil = frameBuffer.m_dsv;
 				m_currentDepthStencil = frameBuffer.m_dsv;
 			}
 			}
 
 
-			if (isValid(m_fbh)
-			&&  m_fbh.idx != _fbh.idx
-			&&  m_rtMsaa)
-			{
-				FrameBufferD3D11& frameBuffer = m_frameBuffers[m_fbh.idx];
-				frameBuffer.resolve();
-			}
-
 			m_fbh = _fbh;
 			m_fbh = _fbh;
 			m_rtMsaa = _msaa;
 			m_rtMsaa = _msaa;
 		}
 		}