From 325ae443da5f1a29c5c586dba80239309f9c1d5c Mon Sep 17 00:00:00 2001
From: Triang3l <triang3l@yandex.ru>
Date: Sun, 13 Feb 2022 21:21:49 +0300
Subject: [PATCH] [D3D12] Rename current_cached_pipeline_ to
 current_guest_pipeline_

---
 src/xenia/gpu/d3d12/d3d12_command_processor.cc | 8 ++++----
 src/xenia/gpu/d3d12/d3d12_command_processor.h  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/xenia/gpu/d3d12/d3d12_command_processor.cc b/src/xenia/gpu/d3d12/d3d12_command_processor.cc
index bcf5367bb..850581b4d 100644
--- a/src/xenia/gpu/d3d12/d3d12_command_processor.cc
+++ b/src/xenia/gpu/d3d12/d3d12_command_processor.cc
@@ -683,7 +683,7 @@ void D3D12CommandProcessor::ReleaseScratchGPUBuffer(
 void D3D12CommandProcessor::SetExternalPipeline(ID3D12PipelineState* pipeline) {
   if (current_external_pipeline_ != pipeline) {
     current_external_pipeline_ = pipeline;
-    current_cached_pipeline_ = nullptr;
+    current_guest_pipeline_ = nullptr;
     deferred_command_list_.D3DSetPipelineState(pipeline);
   }
 }
@@ -2189,10 +2189,10 @@ bool D3D12CommandProcessor::IssueDraw(xenos::PrimitiveType primitive_type,
 
   // Bind the pipeline after configuring it and doing everything that may bind
   // other pipelines.
-  if (current_cached_pipeline_ != pipeline_handle) {
+  if (current_guest_pipeline_ != pipeline_handle) {
     deferred_command_list_.SetPipelineStateHandle(
         reinterpret_cast<void*>(pipeline_handle));
-    current_cached_pipeline_ = pipeline_handle;
+    current_guest_pipeline_ = pipeline_handle;
     current_external_pipeline_ = nullptr;
   }
 
@@ -2799,7 +2799,7 @@ bool D3D12CommandProcessor::BeginSubmission(bool is_guest_command) {
     ff_scissor_update_needed_ = true;
     ff_blend_factor_update_needed_ = true;
     ff_stencil_ref_update_needed_ = true;
-    current_cached_pipeline_ = nullptr;
+    current_guest_pipeline_ = nullptr;
     current_external_pipeline_ = nullptr;
     current_graphics_root_signature_ = nullptr;
     current_graphics_root_up_to_date_ = 0;
diff --git a/src/xenia/gpu/d3d12/d3d12_command_processor.h b/src/xenia/gpu/d3d12/d3d12_command_processor.h
index 032673704..b906804ef 100644
--- a/src/xenia/gpu/d3d12/d3d12_command_processor.h
+++ b/src/xenia/gpu/d3d12/d3d12_command_processor.h
@@ -583,8 +583,8 @@ class D3D12CommandProcessor : public CommandProcessor {
   // Currently bound pipeline, either a graphics pipeline from the pipeline
   // cache (with potentially deferred creation - current_external_pipeline_ is
   // nullptr in this case) or a non-Xenos graphics or compute pipeline
-  // (current_cached_pipeline_ is nullptr in this case).
-  void* current_cached_pipeline_;
+  // (current_guest_pipeline_ is nullptr in this case).
+  void* current_guest_pipeline_;
   ID3D12PipelineState* current_external_pipeline_;
 
   // Currently bound graphics root signature.