From 578d30d3aeda52cee945f6564422539052eff0cb Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sun, 11 Jan 2026 23:23:36 +0300 Subject: [PATCH] rsx: Fix context_dma enum naming --- rpcs3/Emu/RSX/NV47/HW/common.cpp | 13 +------------ rpcs3/Emu/RSX/gcm_enums.cpp | 2 +- rpcs3/Emu/RSX/gcm_enums.h | 2 +- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/rpcs3/Emu/RSX/NV47/HW/common.cpp b/rpcs3/Emu/RSX/NV47/HW/common.cpp index 45e7b001a1..e66e1703e2 100644 --- a/rpcs3/Emu/RSX/NV47/HW/common.cpp +++ b/rpcs3/Emu/RSX/NV47/HW/common.cpp @@ -58,19 +58,8 @@ namespace rsx u32 get_report_data_impl([[maybe_unused]] rsx::context* ctx, u32 offset) { - u32 location = 0; blit_engine::context_dma report_dma = REGS(ctx)->context_dma_report(); - - switch (report_dma) - { - case blit_engine::context_dma::to_memory_get_report: location = CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_LOCAL; break; - case blit_engine::context_dma::report_location_main: location = CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN; break; - case blit_engine::context_dma::memory_host_buffer: location = CELL_GCM_CONTEXT_DMA_MEMORY_HOST_BUFFER; break; - default: - return vm::addr_t(0); - } - - return vm::cast(get_address(offset, location)); + return vm::cast(get_address(offset, static_cast(report_dma))); } void set_fragment_texture_dirty_bit(rsx::context* ctx, u32 arg, u32 index) diff --git a/rpcs3/Emu/RSX/gcm_enums.cpp b/rpcs3/Emu/RSX/gcm_enums.cpp index 5c7d88c875..1357627fb2 100644 --- a/rpcs3/Emu/RSX/gcm_enums.cpp +++ b/rpcs3/Emu/RSX/gcm_enums.cpp @@ -501,7 +501,7 @@ void fmt_class_string::format(std::string& out, u64 ar switch (value) { case blit_engine::context_dma::report_location_main: return "report location main"; - case blit_engine::context_dma::to_memory_get_report: return "to memory get report"; + case blit_engine::context_dma::report_location_local: return "report location local"; case blit_engine::context_dma::memory_host_buffer: return "memory host buffer"; } diff --git a/rpcs3/Emu/RSX/gcm_enums.h b/rpcs3/Emu/RSX/gcm_enums.h index 539796a531..07901aa78c 100644 --- a/rpcs3/Emu/RSX/gcm_enums.h +++ b/rpcs3/Emu/RSX/gcm_enums.h @@ -1820,7 +1820,7 @@ namespace rsx enum class context_dma : u32 { - to_memory_get_report = CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_LOCAL, + report_location_local = CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_LOCAL, report_location_main = CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN, memory_host_buffer = CELL_GCM_CONTEXT_DMA_MEMORY_HOST_BUFFER, };