From 51e89f00beea3cde3c6c9390c19a11df519c142c Mon Sep 17 00:00:00 2001
From: Philip Rebohle <philip.rebohle@tu-dortmund.de>
Date: Sun, 21 Jan 2018 02:21:38 +0100
Subject: [PATCH] [d3d11] Fixed flush order

---
 src/d3d11/d3d11_context_imm.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/d3d11/d3d11_context_imm.cpp b/src/d3d11/d3d11_context_imm.cpp
index 4f4617af..c29e6862 100644
--- a/src/d3d11/d3d11_context_imm.cpp
+++ b/src/d3d11/d3d11_context_imm.cpp
@@ -41,11 +41,11 @@ namespace dxvk {
   
   
   void STDMETHODCALLTYPE D3D11ImmediateContext::Flush() {
-    EmitCsChunk();
-    
     m_parent->FlushInitContext();
     m_drawCount = 0;
     
+    // Add commands to flush the threaded
+    // context, then flush the command list
     EmitCs([dev = m_device] (DxvkContext* ctx) {
       dev->submitCommandList(
         ctx->endRecording(),
@@ -54,6 +54,8 @@ namespace dxvk {
       ctx->beginRecording(
         dev->createCommandList());
     });
+    
+    EmitCsChunk();
   }