Merge branch 'master' into vulkan

src/xenia/gpu/command_processor.cc

@@ -125,7 +125,6 @@ void CommandProcessor::EndTracing() {
     return;
   }
   assert_true(trace_state_ == TraceState::kStreaming);
-  FinalizeTrace();
   trace_state_ = TraceState::kDisabled;
   trace_writer_.Close();
 }
@@ -751,7 +750,6 @@ bool CommandProcessor::ExecutePacketType3(RingBuffer* reader, uint32_t packet) {
       trace_writer_.WriteEvent(EventCommand::Type::kSwap);
       trace_writer_.Flush();
       if (trace_state_ == TraceState::kSingleFrame) {
-        FinalizeTrace();
         trace_state_ = TraceState::kDisabled;
         trace_writer_.Close();
       }

src/xenia/gpu/command_processor.h

@@ -252,7 +252,6 @@ class CommandProcessor {
   virtual bool IssueCopy() = 0;
 
   virtual void InitializeTrace() = 0;
-  virtual void FinalizeTrace() = 0;
 
   Memory* memory_ = nullptr;
   kernel::KernelState* kernel_state_ = nullptr;

src/xenia/gpu/d3d12/d3d12_command_processor.cc

@@ -2331,8 +2331,6 @@ void D3D12CommandProcessor::InitializeTrace() {
   }
 }
 
-void D3D12CommandProcessor::FinalizeTrace() {}
-
 bool D3D12CommandProcessor::IssueCopy() {
 #if XE_UI_D3D12_FINE_GRAINED_DRAW_SCOPES
   SCOPE_profile_cpu_f("gpu");

src/xenia/gpu/d3d12/d3d12_command_processor.h

@@ -216,7 +216,6 @@ class D3D12CommandProcessor : public CommandProcessor {
   bool IssueCopy() override;
 
   void InitializeTrace() override;
-  void FinalizeTrace() override;
 
  private:
   static constexpr uint32_t kQueueFrames = 3;

src/xenia/gpu/null/null_command_processor.cc

@@ -53,8 +53,6 @@ bool NullCommandProcessor::IssueCopy() { return true; }
 
 void NullCommandProcessor::InitializeTrace() {}
 
-void NullCommandProcessor::FinalizeTrace() {}
-
 }  // namespace null
 }  // namespace gpu
 }  // namespace xe

src/xenia/gpu/null/null_command_processor.h

@@ -46,7 +46,6 @@ class NullCommandProcessor : public CommandProcessor {
   bool IssueCopy() override;
 
   void InitializeTrace() override;
-  void FinalizeTrace() override;
 };
 
 }  // namespace null

src/xenia/gpu/vulkan/vulkan_command_processor.h

@@ -81,7 +81,6 @@ class VulkanCommandProcessor : public CommandProcessor {
   bool IssueCopy() override;
 
   void InitializeTrace() override;
-  void FinalizeTrace() override;
 
  private:
   // BeginSubmission and EndSubmission may be called at any time. If there's an