From 71d58e3a6729f4f42c7f416afe04cb1bcc2d2346 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 29 Apr 2021 20:28:17 +0200 Subject: [PATCH] rsx: remove unused tile functions --- rpcs3/Emu/RSX/RSXThread.cpp | 34 ---------------------------------- rpcs3/Emu/RSX/RSXThread.h | 10 ++-------- 2 files changed, 2 insertions(+), 42 deletions(-) diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index c90bb05466..e7999db853 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -2042,40 +2042,6 @@ namespace rsx m_rsx_thread_exiting = false; } - GcmTileInfo *thread::find_tile(u32 offset, u32 location) - { - for (GcmTileInfo &tile : tiles) - { - if (!tile.bound || (tile.location & 1) != (location & 1)) - { - continue; - } - - if (offset >= tile.offset && offset < tile.offset + tile.size) - { - return &tile; - } - } - - return nullptr; - } - - tiled_region thread::get_tiled_address(u32 offset, u32 location) - { - u32 address = get_address(offset, location); - - GcmTileInfo *tile = find_tile(offset, location); - u32 base = 0; - - if (tile) - { - base = offset - tile->offset; - address = get_address(tile->offset, location); - } - - return{ address, base, tile, vm::_ptr(address) }; - } - std::pair thread::calculate_memory_requirements(const vertex_input_layout& layout, u32 first_vertex, u32 vertex_count) { u32 persistent_memory_size = 0; diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/Emu/RSX/RSXThread.h index a8ac37c164..3b1bb7b88f 100644 --- a/rpcs3/Emu/RSX/RSXThread.h +++ b/rpcs3/Emu/RSX/RSXThread.h @@ -713,8 +713,8 @@ namespace rsx bool m_framebuffer_state_contested = false; rsx::framebuffer_creation_context m_current_framebuffer_context = rsx::framebuffer_creation_context::context_draw; - u32 m_graphics_state = 0; - u64 ROP_sync_timestamp = 0; + u32 m_graphics_state = 0; + u64 ROP_sync_timestamp = 0; program_hash_util::fragment_program_utils::fragment_program_metadata current_fp_metadata = {}; program_hash_util::vertex_program_utils::vertex_program_metadata current_vp_metadata = {}; @@ -882,9 +882,6 @@ namespace rsx void handle_invalidated_memory_range(); public: - //std::future add_internal_task(std::function callback); - //void invoke(std::function callback); - /** * Fill buffer with 4x4 scale offset matrix. * Vertex shader's position is to be multiplied by this matrix. @@ -940,9 +937,6 @@ namespace rsx void reset(); void init(u32 ctrlAddress); - tiled_region get_tiled_address(u32 offset, u32 location); - GcmTileInfo *find_tile(u32 offset, u32 location); - // Emu App/Game flip, only immediately flips when called from rsxthread void request_emu_flip(u32 buffer);