RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-12-06 07:12:28 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

rsx: Prepend namespace for simple_array uses

Browse source 
- Simplifies migration later on with find+replace in case we promote this useful class to utils namespace
This commit is contained in:
kd-11 2025-08-03 16:07:48 +03:00 committed by kd-11
parent 75f759079a
commit 97620c4e17
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/RSX/Common/surface_store.cpp
View file

@ -7,7 +7,7 @@ namespace rsx
{ {
namespace utility namespace utility
{ {
simple_array<u8> get_rtt_indexes(surface_target color_target) rsx::simple_array<u8> get_rtt_indexes(surface_target color_target)
{ {
switch (color_target) switch (color_target)
{ {

8
rpcs3/Emu/RSX/Common/surface_store.h
View file

@ -14,7 +14,7 @@ namespace rsx
{ {
namespace utility namespace utility
{ {
simple_array<u8> get_rtt_indexes(surface_target color_target); rsx::simple_array<u8> get_rtt_indexes(surface_target color_target);
u8 get_mrt_buffers_count(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_aligned_pitch(surface_color_format format, u32 width);
usz get_packed_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<std::pair<u32, surface_type>> surface_info; rsx::simple_array<std::pair<u32, surface_type>> surface_info;
if (list1.empty()) if (list1.empty())
{ {
surface_info = std::move(list2); surface_info = std::move(list2);
@ -866,10 +866,10 @@ namespace rsx
std::forward<Args>(extra_params)...); std::forward<Args>(extra_params)...);
} }
std::tuple<simple_array<surface_type>, simple_array<surface_type>> std::tuple<rsx::simple_array<surface_type>, rsx::simple_array<surface_type>>
find_overlapping_set(const utils::address_range32& range) const find_overlapping_set(const utils::address_range32& range) const
{ {
simple_array<surface_type> color_result, depth_result; rsx::simple_array<surface_type> color_result, depth_result;
utils::address_range32 result_range; utils::address_range32 result_range;
if (m_render_targets_memory_range.valid() && if (m_render_targets_memory_range.valid() &&

8
rpcs3/Emu/RSX/Common/texture_cache.h
View file

@ -1187,9 +1187,9 @@ namespace rsx
} }
template <bool check_unlocked = false> template <bool check_unlocked = false>
simple_array<section_storage_type*> find_texture_from_range(const address_range32 &test_range, u32 required_pitch = 0, u32 context_mask = 0xFF) rsx::simple_array<section_storage_type*> find_texture_from_range(const address_range32 &test_range, u32 required_pitch = 0, u32 context_mask = 0xFF)
{ {
simple_array<section_storage_type*> results; rsx::simple_array<section_storage_type*> results;
for (auto It = m_storage.range_begin(test_range, full_range, check_unlocked); It != m_storage.range_end(); It++) 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<typename SurfaceStoreType::surface_overlap_info> overlapping_fbos; rsx::simple_array<typename SurfaceStoreType::surface_overlap_info> overlapping_fbos;
simple_array<section_storage_type*> overlapping_locals; rsx::simple_array<section_storage_type*> overlapping_locals;
auto fast_fbo_check = [&]() -> sampled_image_descriptor auto fast_fbo_check = [&]() -> sampled_image_descriptor
{ {

2
rpcs3/Emu/RSX/NV47/FW/draw_call.cpp
View file

@ -138,7 +138,7 @@ namespace rsx
is_disjoint_primitive = is_primitive_disjointed(primitive); is_disjoint_primitive = is_primitive_disjointed(primitive);
} }
const simple_array<draw_range_t>& draw_clause::get_subranges() const const rsx::simple_array<draw_range_t>& draw_clause::get_subranges() const
{ {
ensure(!is_single_draw()); ensure(!is_single_draw());

10
rpcs3/Emu/RSX/NV47/FW/draw_call.hpp
View file

@ -18,10 +18,10 @@ namespace rsx
class draw_clause class draw_clause
{ {
// Stores the first and count argument from draw/draw indexed parameters between begin/end clauses. // Stores the first and count argument from draw/draw indexed parameters between begin/end clauses.
simple_array<draw_range_t> draw_command_ranges{}; rsx::simple_array<draw_range_t> draw_command_ranges{};
// Stores rasterization barriers for primitive types sensitive to adjacency // Stores rasterization barriers for primitive types sensitive to adjacency
simple_array<barrier_t> draw_command_barriers{}; rsx::simple_array<barrier_t> draw_command_barriers{};
// Counter used to parse the commands in order // Counter used to parse the commands in order
u32 current_range_index{}; u32 current_range_index{};
@ -33,7 +33,7 @@ namespace rsx
u32 draw_command_barrier_mask = 0; u32 draw_command_barrier_mask = 0;
// Draw-time iterator to the draw_command_barriers struct // Draw-time iterator to the draw_command_barriers struct
mutable simple_array<barrier_t>::iterator current_barrier_it; mutable rsx::simple_array<barrier_t>::iterator current_barrier_it;
// Subranges memory cache // Subranges memory cache
mutable rsx::simple_array<draw_range_t> subranges_store; mutable rsx::simple_array<draw_range_t> 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_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. bool is_trivial_instanced_draw{}; // Set if the draw call can be executed on the host GPU as a single instanced draw.
simple_array<u32> inline_vertex_array{}; rsx::simple_array<u32> inline_vertex_array{};
void operator()(utils::serial& ar); void operator()(utils::serial& ar);
@ -307,6 +307,6 @@ namespace rsx
* Returns a compiled list of all subdraws. * Returns a compiled list of all subdraws.
* NOTE: This is a non-trivial operation as it takes disjoint primitive boundaries into account. * NOTE: This is a non-trivial operation as it takes disjoint primitive boundaries into account.
*/ */
const simple_array<draw_range_t>& get_subranges() const; const rsx::simple_array<draw_range_t>& get_subranges() const;
}; };
} }