From 0b6b6a41896af84f21a1ee6335d034faff2a21f1 Mon Sep 17 00:00:00 2001
From: Ben Vanik <ben.vanik@gmail.com>
Date: Sun, 4 Jan 2015 16:52:29 -0800
Subject: [PATCH] Fixing buffer flushes.

---
 src/xenia/gpu/gl4/command_processor.cc | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/xenia/gpu/gl4/command_processor.cc b/src/xenia/gpu/gl4/command_processor.cc
index f499dc1ad..c2717bafe 100644
--- a/src/xenia/gpu/gl4/command_processor.cc
+++ b/src/xenia/gpu/gl4/command_processor.cc
@@ -434,8 +434,8 @@ void CommandProcessor::PrepareForWait() {
   // TODO(benvanik): fences and fancy stuff. We should figure out a way to
   // make interrupt callbacks from the GPU so that we don't have to do a full
   // synchronize here.
-  //glFlush();
-  glFinish();
+  glFlush();
+  // glFinish();
 
   if (FLAGS_thread_safe_gl) {
     context_->ClearCurrent();
@@ -820,6 +820,10 @@ bool CommandProcessor::ExecutePacketType3_XE_SWAP(RingbufferReader* reader,
   reader->TraceData(1);
   uint32_t frontbuffer_ptr = reader->Read();
   reader->Advance(count - 1);
+
+  // Ensure we issue any pending draws.
+  draw_batcher_.Flush(DrawBatcher::FlushMode::kMakeCoherent);
+
   if (swap_handler_) {
     SwapParameters swap_params;
 
@@ -1373,7 +1377,14 @@ bool CommandProcessor::IssueDraw() {
   status = PopulateVertexBuffers();
   CHECK_ISSUE_UPDATE_STATUS(status, mismatch, "Unable to setup vertex buffers");
 
-  return draw_batcher_.CommitDraw();
+  if (!draw_batcher_.CommitDraw()) {
+    return false;
+  }
+  if (!has_bindless_vbos_) {
+    // TODO(benvanik): find a way to get around glVertexArrayVertexBuffer below.
+    draw_batcher_.Flush(DrawBatcher::FlushMode::kMakeCoherent);
+  }
+  return true;
 }
 
 bool CommandProcessor::SetShadowRegister(uint32_t& dest,
@@ -2053,11 +2064,6 @@ CommandProcessor::UpdateStatus CommandProcessor::PopulateVertexBuffers() {
   auto& regs = *register_file_;
   assert_not_null(active_vertex_shader_);
 
-  if (!has_bindless_vbos_) {
-    // TODO(benvanik): find a way to get around glVertexArrayVertexBuffer below.
-    draw_batcher_.Flush(DrawBatcher::FlushMode::kMakeCoherent);
-  }
-
   uint32_t el_index = 0;
   const auto& buffer_inputs = active_vertex_shader_->buffer_inputs();
   for (uint32_t buffer_index = 0; buffer_index < buffer_inputs.count;