From 97620c4e17c933e76462d2a956731af04517455f Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sun, 3 Aug 2025 16:07:48 +0300 Subject: [PATCH] rsx: Prepend namespace for simple_array uses - Simplifies migration later on with find+replace in case we promote this useful class to utils namespace --- rpcs3/Emu/RSX/Common/surface_store.cpp | 2 +- rpcs3/Emu/RSX/Common/surface_store.h | 8 ++++---- rpcs3/Emu/RSX/Common/texture_cache.h | 8 ++++---- rpcs3/Emu/RSX/NV47/FW/draw_call.cpp | 2 +- rpcs3/Emu/RSX/NV47/FW/draw_call.hpp | 10 +++++----- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/rpcs3/Emu/RSX/Common/surface_store.cpp b/rpcs3/Emu/RSX/Common/surface_store.cpp index 68e8bd9c62..d48fec99a7 100644 --- a/rpcs3/Emu/RSX/Common/surface_store.cpp +++ b/rpcs3/Emu/RSX/Common/surface_store.cpp @@ -7,7 +7,7 @@ namespace rsx { namespace utility { - simple_array get_rtt_indexes(surface_target color_target) + rsx::simple_array get_rtt_indexes(surface_target color_target) { switch (color_target) { diff --git a/rpcs3/Emu/RSX/Common/surface_store.h b/rpcs3/Emu/RSX/Common/surface_store.h index 0bccd9fd32..3a80793f77 100644 --- a/rpcs3/Emu/RSX/Common/surface_store.h +++ b/rpcs3/Emu/RSX/Common/surface_store.h @@ -14,7 +14,7 @@ namespace rsx { namespace utility { - simple_array get_rtt_indexes(surface_target color_target); + rsx::simple_array get_rtt_indexes(surface_target color_target); u8 get_mrt_buffers_count(surface_target color_target); usz get_aligned_pitch(surface_color_format format, u32 width); usz get_packed_pitch(surface_color_format format, u32 width); @@ -314,7 +314,7 @@ namespace rsx } } - simple_array> surface_info; + rsx::simple_array> surface_info; if (list1.empty()) { surface_info = std::move(list2); @@ -866,10 +866,10 @@ namespace rsx std::forward(extra_params)...); } - std::tuple, simple_array> + std::tuple, rsx::simple_array> find_overlapping_set(const utils::address_range32& range) const { - simple_array color_result, depth_result; + rsx::simple_array color_result, depth_result; utils::address_range32 result_range; if (m_render_targets_memory_range.valid() && diff --git a/rpcs3/Emu/RSX/Common/texture_cache.h b/rpcs3/Emu/RSX/Common/texture_cache.h index 877600ac18..606e4716d2 100644 --- a/rpcs3/Emu/RSX/Common/texture_cache.h +++ b/rpcs3/Emu/RSX/Common/texture_cache.h @@ -1187,9 +1187,9 @@ namespace rsx } template - simple_array find_texture_from_range(const address_range32 &test_range, u32 required_pitch = 0, u32 context_mask = 0xFF) + rsx::simple_array find_texture_from_range(const address_range32 &test_range, u32 required_pitch = 0, u32 context_mask = 0xFF) { - simple_array results; + rsx::simple_array results; for (auto It = m_storage.range_begin(test_range, full_range, check_unlocked); It != m_storage.range_end(); It++) { @@ -1894,8 +1894,8 @@ namespace rsx } } - simple_array overlapping_fbos; - simple_array overlapping_locals; + rsx::simple_array overlapping_fbos; + rsx::simple_array overlapping_locals; auto fast_fbo_check = [&]() -> sampled_image_descriptor { diff --git a/rpcs3/Emu/RSX/NV47/FW/draw_call.cpp b/rpcs3/Emu/RSX/NV47/FW/draw_call.cpp index d7533b245d..d8978a78cc 100644 --- a/rpcs3/Emu/RSX/NV47/FW/draw_call.cpp +++ b/rpcs3/Emu/RSX/NV47/FW/draw_call.cpp @@ -138,7 +138,7 @@ namespace rsx is_disjoint_primitive = is_primitive_disjointed(primitive); } - const simple_array& draw_clause::get_subranges() const + const rsx::simple_array& draw_clause::get_subranges() const { ensure(!is_single_draw()); diff --git a/rpcs3/Emu/RSX/NV47/FW/draw_call.hpp b/rpcs3/Emu/RSX/NV47/FW/draw_call.hpp index 7753f7b280..0fe726d417 100644 --- a/rpcs3/Emu/RSX/NV47/FW/draw_call.hpp +++ b/rpcs3/Emu/RSX/NV47/FW/draw_call.hpp @@ -18,10 +18,10 @@ namespace rsx class draw_clause { // Stores the first and count argument from draw/draw indexed parameters between begin/end clauses. - simple_array draw_command_ranges{}; + rsx::simple_array draw_command_ranges{}; // Stores rasterization barriers for primitive types sensitive to adjacency - simple_array draw_command_barriers{}; + rsx::simple_array draw_command_barriers{}; // Counter used to parse the commands in order u32 current_range_index{}; @@ -33,7 +33,7 @@ namespace rsx u32 draw_command_barrier_mask = 0; // Draw-time iterator to the draw_command_barriers struct - mutable simple_array::iterator current_barrier_it; + mutable rsx::simple_array::iterator current_barrier_it; // Subranges memory cache mutable rsx::simple_array subranges_store; @@ -77,7 +77,7 @@ namespace rsx bool is_rendering{}; // Set while we're actually pushing the draw calls to host GPU bool is_trivial_instanced_draw{}; // Set if the draw call can be executed on the host GPU as a single instanced draw. - simple_array inline_vertex_array{}; + rsx::simple_array inline_vertex_array{}; void operator()(utils::serial& ar); @@ -307,6 +307,6 @@ namespace rsx * Returns a compiled list of all subdraws. * NOTE: This is a non-trivial operation as it takes disjoint primitive boundaries into account. */ - const simple_array& get_subranges() const; + const rsx::simple_array& get_subranges() const; }; }