From 762fe33a3db823685aa5636bfe5ca372b46f9df7 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Sun, 7 Feb 2021 12:32:45 -0800 Subject: [PATCH] Rename BPMEM_EFB_BR to BPMEM_EFB_WH --- Source/Core/VideoCommon/BPMemory.h | 2 +- Source/Core/VideoCommon/BPStructs.cpp | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Source/Core/VideoCommon/BPMemory.h b/Source/Core/VideoCommon/BPMemory.h index ad107382e4..86cc11f7d8 100644 --- a/Source/Core/VideoCommon/BPMemory.h +++ b/Source/Core/VideoCommon/BPMemory.h @@ -45,7 +45,7 @@ enum BPMEM_PE_TOKEN_ID = 0x47, BPMEM_PE_TOKEN_INT_ID = 0x48, BPMEM_EFB_TL = 0x49, - BPMEM_EFB_BR = 0x4A, + BPMEM_EFB_WH = 0x4A, BPMEM_EFB_ADDR = 0x4B, BPMEM_MIPMAP_STRIDE = 0x4D, BPMEM_COPYYSCALE = 0x4E, diff --git a/Source/Core/VideoCommon/BPStructs.cpp b/Source/Core/VideoCommon/BPStructs.cpp index 2376fd0840..896aafca30 100644 --- a/Source/Core/VideoCommon/BPStructs.cpp +++ b/Source/Core/VideoCommon/BPStructs.cpp @@ -432,7 +432,7 @@ static void BPWritten(const BPCmd& bp) // EFB Copy config // ---------------- case BPMEM_EFB_TL: // EFB Source Rect. Top, Left - case BPMEM_EFB_BR: // EFB Source Rect. Bottom, Right (w, h - 1) + case BPMEM_EFB_WH: // EFB Source Rect. Width, Height - 1 case BPMEM_EFB_ADDR: // EFB Target Address return; // -------------- @@ -995,10 +995,9 @@ void GetBPRegInfo(const u8* data, std::string* name, std::string* desc) } break; - case BPMEM_EFB_BR: // 0x4A + case BPMEM_EFB_WH: // 0x4A { - // TODO: Misleading name, should be BPMEM_EFB_WH instead - SetRegName(BPMEM_EFB_BR); + SetRegName(BPMEM_EFB_WH); X10Y10 width_height; width_height.hex = cmddata; *desc = fmt::format("Width: {}\nHeight: {}", width_height.x + 1, width_height.y + 1);