mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-04-22 12:35:21 +00:00
Merge pull request #1982 from vlj/rsx-refactor
rsx: Use bitfield template to decode values.
This commit is contained in:
vlj
GitHub
commit
e297984e59
8 changed files with 3523 additions and 1663 deletions
|
|
@ -854,7 +854,7 @@ std::string print_boolean(bool b)
|
|||
}
|
||||
}
|
||||
|
||||
std::string print_comparison_function(comparison_function f)
|
||||
std::string to_string(comparison_function f)
|
||||
{
|
||||
switch (f)
|
||||
{
|
||||
|
|
@ -870,7 +870,7 @@ std::string print_comparison_function(comparison_function f)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_stencil_op(stencil_op op)
|
||||
std::string to_string(stencil_op op)
|
||||
{
|
||||
switch (op)
|
||||
{
|
||||
|
|
@ -885,7 +885,7 @@ std::string print_stencil_op(stencil_op op)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_fog_mode(fog_mode op)
|
||||
std::string to_string(fog_mode op)
|
||||
{
|
||||
switch (op)
|
||||
{
|
||||
|
|
@ -899,7 +899,7 @@ std::string print_fog_mode(fog_mode op)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_logic_op(logic_op op)
|
||||
std::string to_string(logic_op op)
|
||||
{
|
||||
switch (op)
|
||||
{
|
||||
|
|
@ -922,7 +922,7 @@ std::string print_logic_op(logic_op op)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_front_face(front_face op)
|
||||
std::string to_string(front_face op)
|
||||
{
|
||||
switch (op)
|
||||
{
|
||||
|
|
@ -932,7 +932,7 @@ std::string print_front_face(front_face op)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_cull_face(cull_face op)
|
||||
std::string to_string(cull_face op)
|
||||
{
|
||||
switch (op)
|
||||
{
|
||||
|
|
@ -943,7 +943,7 @@ std::string print_cull_face(cull_face op)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_surface_target(surface_target target)
|
||||
std::string to_string(surface_target target)
|
||||
{
|
||||
switch (target)
|
||||
{
|
||||
|
|
@ -957,7 +957,7 @@ std::string print_surface_target(surface_target target)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_primitive_mode(primitive_type draw_mode)
|
||||
std::string to_string(primitive_type draw_mode)
|
||||
{
|
||||
switch (draw_mode)
|
||||
{
|
||||
|
|
@ -976,7 +976,7 @@ std::string print_primitive_mode(primitive_type draw_mode)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_transfer_operation(blit_engine::transfer_operation op)
|
||||
std::string to_string(blit_engine::transfer_operation op)
|
||||
{
|
||||
switch (op)
|
||||
{
|
||||
|
|
@ -990,7 +990,7 @@ std::string print_transfer_operation(blit_engine::transfer_operation op)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_transfer_source_format(blit_engine::transfer_source_format op)
|
||||
std::string to_string(blit_engine::transfer_source_format op)
|
||||
{
|
||||
switch (op)
|
||||
{
|
||||
|
|
@ -1011,7 +1011,7 @@ std::string print_transfer_source_format(blit_engine::transfer_source_format op)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_context_surface(blit_engine::context_surface op)
|
||||
std::string to_string(blit_engine::context_surface op)
|
||||
{
|
||||
switch (op)
|
||||
{
|
||||
|
|
@ -1021,7 +1021,7 @@ std::string print_context_surface(blit_engine::context_surface op)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_transfer_destination_format(blit_engine::transfer_destination_format op)
|
||||
std::string to_string(blit_engine::transfer_destination_format op)
|
||||
{
|
||||
switch (op)
|
||||
{
|
||||
|
|
@ -1033,7 +1033,7 @@ std::string print_transfer_destination_format(blit_engine::transfer_destination_
|
|||
}
|
||||
|
||||
|
||||
std::string print_blend_op(blend_equation op)
|
||||
std::string to_string(blend_equation op)
|
||||
{
|
||||
switch (op)
|
||||
{
|
||||
|
|
@ -1049,7 +1049,7 @@ std::string print_blend_op(blend_equation op)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_blend_factor(blend_factor factor)
|
||||
std::string to_string(blend_factor factor)
|
||||
{
|
||||
switch (factor)
|
||||
{
|
||||
|
|
@ -1072,7 +1072,7 @@ std::string print_blend_factor(blend_factor factor)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_origin_mode(window_origin origin)
|
||||
std::string to_string(window_origin origin)
|
||||
{
|
||||
switch (origin)
|
||||
{
|
||||
|
|
@ -1082,7 +1082,7 @@ std::string print_origin_mode(window_origin origin)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_pixel_center_mode(window_pixel_center in)
|
||||
std::string to_string(window_pixel_center in)
|
||||
{
|
||||
switch (in)
|
||||
{
|
||||
|
|
@ -1092,7 +1092,7 @@ std::string print_pixel_center_mode(window_pixel_center in)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_user_clip_plane_op(user_clip_plane_op op)
|
||||
std::string to_string(user_clip_plane_op op)
|
||||
{
|
||||
switch (op)
|
||||
{
|
||||
|
|
@ -1105,7 +1105,7 @@ std::string print_user_clip_plane_op(user_clip_plane_op op)
|
|||
|
||||
|
||||
|
||||
std::string print_depth_stencil_surface_format(surface_depth_format format)
|
||||
std::string to_string(surface_depth_format format)
|
||||
{
|
||||
switch (format)
|
||||
{
|
||||
|
|
@ -1115,7 +1115,7 @@ std::string print_depth_stencil_surface_format(surface_depth_format format)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_surface_antialiasing(surface_antialiasing format)
|
||||
std::string to_string(surface_antialiasing format)
|
||||
{
|
||||
switch (format)
|
||||
{
|
||||
|
|
@ -1127,7 +1127,7 @@ std::string print_surface_antialiasing(surface_antialiasing format)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_surface_color_format(surface_color_format format)
|
||||
std::string to_string(surface_color_format format)
|
||||
{
|
||||
switch (format)
|
||||
{
|
||||
|
|
@ -1149,7 +1149,7 @@ std::string print_surface_color_format(surface_color_format format)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_index_type(index_array_type arg)
|
||||
std::string to_string(index_array_type arg)
|
||||
{
|
||||
switch (arg)
|
||||
{
|
||||
|
|
@ -1159,7 +1159,7 @@ std::string print_index_type(index_array_type arg)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_context_dma(blit_engine::context_dma op)
|
||||
std::string to_string(blit_engine::context_dma op)
|
||||
{
|
||||
switch (op)
|
||||
{
|
||||
|
|
@ -1169,7 +1169,7 @@ std::string print_context_dma(blit_engine::context_dma op)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_transfer_origin(blit_engine::transfer_origin op)
|
||||
std::string to_string(blit_engine::transfer_origin op)
|
||||
{
|
||||
switch (op)
|
||||
{
|
||||
|
|
@ -1179,7 +1179,7 @@ std::string print_transfer_origin(blit_engine::transfer_origin op)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_transfer_interpolator(blit_engine::transfer_interpolator op)
|
||||
std::string to_string(blit_engine::transfer_interpolator op)
|
||||
{
|
||||
switch (op)
|
||||
{
|
||||
|
|
@ -1189,7 +1189,7 @@ std::string print_transfer_interpolator(blit_engine::transfer_interpolator op)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_shading_mode(shading_mode op)
|
||||
std::string to_string(shading_mode op)
|
||||
{
|
||||
switch (op)
|
||||
{
|
||||
|
|
@ -1199,7 +1199,7 @@ std::string print_shading_mode(shading_mode op)
|
|||
throw;
|
||||
}
|
||||
|
||||
std::string print_polygon_mode(polygon_mode op)
|
||||
std::string to_string(polygon_mode op)
|
||||
{
|
||||
switch (op)
|
||||
{
|
||||
|
|
@ -1999,10 +1999,17 @@ namespace
|
|||
|
||||
namespace
|
||||
{
|
||||
template<u32 opcode>
|
||||
auto register_pretty_printing(u32 arg)
|
||||
{
|
||||
typename rsx::registers_decoder<opcode>::decoded_type decoded_value(arg);
|
||||
return rsx::registers_decoder<opcode>::dump(std::move(arg));
|
||||
}
|
||||
|
||||
template<u32... opcode>
|
||||
auto create_printing_table(const std::integer_sequence<u32, opcode...> &)
|
||||
{
|
||||
return std::unordered_map<uint32_t, std::string(*)(u32)>{ {opcode, rsx::print_register_value<opcode>}... };
|
||||
return std::unordered_map<uint32_t, std::string(*)(u32)>{ {opcode, register_pretty_printing<opcode>}... };
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,10 +11,8 @@ namespace rsx
|
|||
|
||||
}
|
||||
|
||||
void texture::init(u8 index)
|
||||
void texture::init()
|
||||
{
|
||||
m_index = index;
|
||||
|
||||
// Offset
|
||||
registers[NV4097_SET_TEXTURE_OFFSET + (m_index * 8)] = 0;
|
||||
|
||||
|
|
@ -255,10 +253,8 @@ namespace rsx
|
|||
|
||||
}
|
||||
|
||||
void vertex_texture::init(u8 index)
|
||||
void vertex_texture::init()
|
||||
{
|
||||
m_index = index;
|
||||
|
||||
// Offset
|
||||
registers[NV4097_SET_VERTEX_TEXTURE_OFFSET + (m_index * 8)] = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ namespace rsx
|
|||
class texture
|
||||
{
|
||||
protected:
|
||||
u8 m_index;
|
||||
const u8 m_index;
|
||||
std::array<u32, 0x10000 / 4> ®isters;
|
||||
|
||||
public:
|
||||
|
|
@ -25,7 +25,7 @@ namespace rsx
|
|||
texture() = delete;
|
||||
|
||||
//initialize texture registers with default values
|
||||
void init(u8 index);
|
||||
void init();
|
||||
|
||||
// Offset
|
||||
u32 offset() const;
|
||||
|
|
@ -93,7 +93,7 @@ namespace rsx
|
|||
class vertex_texture
|
||||
{
|
||||
protected:
|
||||
u8 m_index;
|
||||
const u8 m_index;
|
||||
std::array<u32, 0x10000 / 4> ®isters;
|
||||
|
||||
public:
|
||||
|
|
@ -101,7 +101,7 @@ namespace rsx
|
|||
vertex_texture() = delete;
|
||||
|
||||
//initialize texture registers with default values
|
||||
void init(u8 index);
|
||||
void init();
|
||||
|
||||
// Offset
|
||||
u32 offset() const;
|
||||
|
|
|
|||
|
|
@ -477,9 +477,10 @@ namespace rsx
|
|||
frame_debug.command_queue.push_back(std::make_pair(reg, value));
|
||||
}
|
||||
|
||||
if (auto method = methods[reg])
|
||||
const auto& It = methods.find(reg);
|
||||
if (It != methods.end())
|
||||
{
|
||||
method(this, value);
|
||||
It->second(this, value);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -10,6 +10,7 @@
|
|||
|
||||
#include <thread>
|
||||
#include <cassert>
|
||||
#include <algorithm>
|
||||
|
||||
cfg::map_entry<double> g_cfg_rsx_frame_limit(cfg::root.video, "Frame limit",
|
||||
{
|
||||
|
|
@ -24,7 +25,14 @@ cfg::map_entry<double> g_cfg_rsx_frame_limit(cfg::root.video, "Frame limit",
|
|||
namespace rsx
|
||||
{
|
||||
rsx_state method_registers;
|
||||
rsx_method_t methods[0x10000 >> 2]{};
|
||||
using rsx_method_t = void(*)(class thread*, u32);
|
||||
std::unordered_map<u32, rsx_method_t> methods{};
|
||||
|
||||
template<typename Type> struct vertex_data_type_from_element_type;
|
||||
template<> struct vertex_data_type_from_element_type<float> { static const vertex_base_type type = vertex_base_type::f; };
|
||||
template<> struct vertex_data_type_from_element_type<f16> { static const vertex_base_type type = vertex_base_type::sf; };
|
||||
template<> struct vertex_data_type_from_element_type<u8> { static const vertex_base_type type = vertex_base_type::ub; };
|
||||
template<> struct vertex_data_type_from_element_type<u16> { static const vertex_base_type type = vertex_base_type::s1; };
|
||||
|
||||
namespace nv406e
|
||||
{
|
||||
|
|
@ -67,6 +75,99 @@ namespace rsx
|
|||
(arg & 0xff00ff00) | ((arg & 0xff) << 16) | ((arg >> 16) & 0xff));
|
||||
}
|
||||
|
||||
template<u32 id, u32 index, int count, typename type>
|
||||
force_inline void set_vertex_data_impl(thread* rsx, u32 arg)
|
||||
{
|
||||
static const size_t increment_per_array_index = (count * sizeof(type)) / sizeof(u32);
|
||||
|
||||
static const size_t attribute_index = index / increment_per_array_index;
|
||||
static const size_t vertex_subreg = index % increment_per_array_index;
|
||||
|
||||
auto& info = rsx::method_registers.register_vertex_info[attribute_index];
|
||||
|
||||
info.type = vertex_data_type_from_element_type<type>::type;
|
||||
info.size = count;
|
||||
info.frequency = 0;
|
||||
info.stride = 0;
|
||||
rsx::method_registers.register_vertex_info[attribute_index].data[vertex_subreg] = arg;
|
||||
}
|
||||
|
||||
template<u32 index>
|
||||
struct set_vertex_data4ub_m
|
||||
{
|
||||
force_inline static void impl(thread* rsx, u32 arg)
|
||||
{
|
||||
set_vertex_data_impl<NV4097_SET_VERTEX_DATA4UB_M, index, 4, u8>(rsx, arg);
|
||||
}
|
||||
};
|
||||
|
||||
template<u32 index>
|
||||
struct set_vertex_data1f_m
|
||||
{
|
||||
force_inline static void impl(thread* rsx, u32 arg)
|
||||
{
|
||||
set_vertex_data_impl<NV4097_SET_VERTEX_DATA1F_M, index, 1, f32>(rsx, arg);
|
||||
}
|
||||
};
|
||||
|
||||
template<u32 index>
|
||||
struct set_vertex_data2f_m
|
||||
{
|
||||
force_inline static void impl(thread* rsx, u32 arg)
|
||||
{
|
||||
set_vertex_data_impl<NV4097_SET_VERTEX_DATA2F_M, index, 2, f32>(rsx, arg);
|
||||
}
|
||||
};
|
||||
|
||||
template<u32 index>
|
||||
struct set_vertex_data3f_m
|
||||
{
|
||||
force_inline static void impl(thread* rsx, u32 arg)
|
||||
{
|
||||
set_vertex_data_impl<NV4097_SET_VERTEX_DATA3F_M, index, 3, f32>(rsx, arg);
|
||||
}
|
||||
};
|
||||
|
||||
template<u32 index>
|
||||
struct set_vertex_data4f_m
|
||||
{
|
||||
force_inline static void impl(thread* rsx, u32 arg)
|
||||
{
|
||||
set_vertex_data_impl<NV4097_SET_VERTEX_DATA4F_M, index, 4, f32>(rsx, arg);
|
||||
}
|
||||
};
|
||||
|
||||
template<u32 index>
|
||||
struct set_vertex_data2s_m
|
||||
{
|
||||
force_inline static void impl(thread* rsx, u32 arg)
|
||||
{
|
||||
set_vertex_data_impl<NV4097_SET_VERTEX_DATA2S_M, index, 2, u16>(rsx, arg);
|
||||
}
|
||||
};
|
||||
|
||||
template<u32 index>
|
||||
struct set_vertex_data4s_m
|
||||
{
|
||||
force_inline static void impl(thread* rsx, u32 arg)
|
||||
{
|
||||
set_vertex_data_impl<NV4097_SET_VERTEX_DATA4S_M, index, 4, u16>(rsx, arg);
|
||||
}
|
||||
};
|
||||
|
||||
template<u32 index>
|
||||
struct set_vertex_data_array_format
|
||||
{
|
||||
force_inline static void impl(thread* rsx, u32 arg)
|
||||
{
|
||||
const typename rsx::registers_decoder<NV4097_SET_VERTEX_DATA_ARRAY_FORMAT + index>::decoded_type decoded_value(arg);
|
||||
rsx::method_registers.vertex_arrays_info[index].frequency = decoded_value.frequency();
|
||||
rsx::method_registers.vertex_arrays_info[index].stride = decoded_value.stride();
|
||||
rsx::method_registers.vertex_arrays_info[index].size = decoded_value.size();
|
||||
rsx::method_registers.vertex_arrays_info[index].type = decoded_value.type();
|
||||
}
|
||||
};
|
||||
|
||||
force_inline void draw_arrays(thread* rsx, u32 arg)
|
||||
{
|
||||
rsx->draw_command = rsx::draw_command::array;
|
||||
|
|
@ -97,10 +198,24 @@ namespace rsx
|
|||
{
|
||||
force_inline static void impl(thread* rsxthr, u32 arg)
|
||||
{
|
||||
static constexpr u32 reg = index / 4;
|
||||
static constexpr u8 subreg = index % 4;
|
||||
|
||||
u32 load = rsx::method_registers.transform_constant_load();
|
||||
rsx::method_registers.transform_constants[load + reg].rgba[subreg] = (f32&)arg;
|
||||
rsxthr->m_transform_constants_dirty = true;
|
||||
}
|
||||
};
|
||||
|
||||
template<u32 index>
|
||||
struct set_transform_program
|
||||
{
|
||||
force_inline static void impl(thread* rsx, u32 arg)
|
||||
{
|
||||
method_registers.commit_4_transform_program_instructions(index);
|
||||
}
|
||||
};
|
||||
|
||||
force_inline void set_begin_end(thread* rsxthr, u32 arg)
|
||||
{
|
||||
if (arg)
|
||||
|
|
@ -657,7 +772,8 @@ namespace rsx
|
|||
|
||||
rsx_state::rsx_state() :
|
||||
fragment_textures(fill_array<texture>(registers, std::make_index_sequence<16>())),
|
||||
vertex_textures(fill_array<vertex_texture>(registers, std::make_index_sequence<4>()))
|
||||
vertex_textures(fill_array<vertex_texture>(registers, std::make_index_sequence<4>())),
|
||||
vertex_arrays_info(fill_array<data_array_format_info>(registers, std::make_index_sequence<16>()))
|
||||
{
|
||||
|
||||
}
|
||||
|
|
@ -672,140 +788,77 @@ namespace rsx
|
|||
//setup method registers
|
||||
std::memset(registers.data(), 0, registers.size() * sizeof(u32));
|
||||
|
||||
m_primitive_type = primitive_type::triangles;
|
||||
m_transform_program_pointer = 0;
|
||||
registers[NV4097_SET_COLOR_MASK] = CELL_GCM_COLOR_MASK_R | CELL_GCM_COLOR_MASK_G | CELL_GCM_COLOR_MASK_B | CELL_GCM_COLOR_MASK_A;
|
||||
registers[NV4097_SET_SCISSOR_HORIZONTAL] = (4096 << 16) | 0;
|
||||
registers[NV4097_SET_SCISSOR_VERTICAL] = (4096 << 16) | 0;
|
||||
|
||||
m_color_mask_r = true;
|
||||
m_color_mask_g = true;
|
||||
m_color_mask_b = true;
|
||||
m_color_mask_a = true;
|
||||
registers[NV4097_SET_ALPHA_FUNC] = CELL_GCM_ALWAYS;
|
||||
registers[NV4097_SET_ALPHA_REF] = 0;
|
||||
|
||||
m_scissor_width = 4096;
|
||||
m_scissor_height = 4096;
|
||||
m_scissor_origin_x = 0;
|
||||
m_scissor_origin_y = 0;
|
||||
registers[NV4097_SET_BLEND_FUNC_SFACTOR] = (CELL_GCM_ONE << 16) | CELL_GCM_ONE;
|
||||
registers[NV4097_SET_BLEND_FUNC_DFACTOR] = (CELL_GCM_ZERO << 16) | CELL_GCM_ZERO;
|
||||
registers[NV4097_SET_BLEND_COLOR] = 0;
|
||||
registers[NV4097_SET_BLEND_COLOR2] = 0;
|
||||
registers[NV4097_SET_BLEND_EQUATION] = (0x8006 << 16) | 0x8006; // (add)
|
||||
|
||||
m_alpha_test_enabled = false;
|
||||
m_alpha_func = rsx::comparison_function::always;
|
||||
m_alpha_ref = 0;
|
||||
registers[NV4097_SET_STENCIL_MASK] = 0xff;
|
||||
registers[NV4097_SET_STENCIL_FUNC] = CELL_GCM_ALWAYS;
|
||||
registers[NV4097_SET_STENCIL_FUNC_REF] = 0x00;
|
||||
registers[NV4097_SET_STENCIL_FUNC_MASK] = 0xff;
|
||||
/* registers[NV4097_SET_STENCIL_OP_FAIL] = CELL_GCM_KEEP;
|
||||
registers[NV4097_SET_STENCIL_OP_ZFAIL] = CELL_GCM_KEEP;
|
||||
registers[NV4097_SET_STENCIL_OP_ZPASS] = CELL_GCM_KEEP;*/
|
||||
|
||||
m_blend_enabled = false;
|
||||
m_blend_enabled_surface_1 = false;
|
||||
m_blend_enabled_surface_2 = false;
|
||||
m_blend_enabled_surface_3 = false;
|
||||
m_blend_func_sfactor_rgb = rsx::blend_factor::one;
|
||||
m_blend_func_sfactor_a = rsx::blend_factor::one;
|
||||
m_blend_func_dfactor_rgb = rsx::blend_factor::one;
|
||||
m_blend_func_dfactor_a = rsx::blend_factor::one;
|
||||
registers[NV4097_SET_BACK_STENCIL_MASK] = 0xff;
|
||||
registers[NV4097_SET_BACK_STENCIL_FUNC] = CELL_GCM_ALWAYS;
|
||||
registers[NV4097_SET_BACK_STENCIL_FUNC_REF] = 0x00;
|
||||
registers[NV4097_SET_BACK_STENCIL_FUNC_MASK] = 0xff;
|
||||
/* registers[NV4097_SET_BACK_STENCIL_OP_FAIL] = CELL_GCM_KEEP;
|
||||
registers[NV4097_SET_BACK_STENCIL_OP_ZFAIL] = CELL_GCM_KEEP;
|
||||
registers[NV4097_SET_BACK_STENCIL_OP_ZPASS] = CELL_GCM_KEEP;*/
|
||||
|
||||
m_blend_color_16b_a = 0;
|
||||
m_blend_color_16b_b = 0;
|
||||
m_blend_color = 0;
|
||||
// registers[NV4097_SET_SHADE_MODE] = CELL_GCM_SMOOTH;
|
||||
|
||||
m_blend_equation_rgb = rsx::blend_equation::add;
|
||||
m_blend_equation_a = rsx::blend_equation::add;
|
||||
// registers[NV4097_SET_LOGIC_OP] = CELL_GCM_COPY;
|
||||
|
||||
m_stencil_test_enabled = false;
|
||||
m_two_sided_stencil_test_enabled = false;
|
||||
m_stencil_mask = 0xff;
|
||||
m_stencil_func = rsx::comparison_function::always;
|
||||
m_stencil_func_ref = 0;
|
||||
m_stencil_func_mask = 0xff;
|
||||
m_stencil_op_fail = rsx::stencil_op::keep;
|
||||
m_stencil_op_zfail = rsx::stencil_op::keep;
|
||||
m_stencil_op_zpass = rsx::stencil_op::keep;
|
||||
(f32&)registers[NV4097_SET_DEPTH_BOUNDS_MIN] = 0.f;
|
||||
(f32&)registers[NV4097_SET_DEPTH_BOUNDS_MAX] = 1.f;
|
||||
|
||||
m_back_stencil_mask = 0xff;
|
||||
m_back_stencil_func = rsx::comparison_function::always;
|
||||
m_back_stencil_func_ref = 0;
|
||||
m_back_stencil_func_mask = 0xff;
|
||||
m_back_stencil_op_fail = rsx::stencil_op::keep;
|
||||
m_back_stencil_op_zfail = rsx::stencil_op::keep;
|
||||
m_back_stencil_op_zpass = rsx::stencil_op::keep;
|
||||
(f32&)registers[NV4097_SET_CLIP_MIN] = 0.f;
|
||||
(f32&)registers[NV4097_SET_CLIP_MAX] = 1.f;
|
||||
|
||||
m_shading_mode = rsx::shading_mode::smooth;
|
||||
|
||||
m_logic_op_enabled = false;
|
||||
m_logic_operation = rsx::logic_op::logic_copy;
|
||||
|
||||
m_depth_bounds_test_enabled = false;
|
||||
m_depth_bounds_min = 0.f;
|
||||
m_depth_bounds_max = 1.f;
|
||||
|
||||
m_clip_min = 0.f;
|
||||
m_clip_max = 1.f;
|
||||
|
||||
m_line_width = 1.f;
|
||||
registers[NV4097_SET_LINE_WIDTH] = 1 << 3;
|
||||
|
||||
// These defaults were found using After Burner Climax (which never set fog mode despite using fog input)
|
||||
m_fog_equation = rsx::fog_mode::linear;
|
||||
m_fog_params_0 = 1.f;
|
||||
m_fog_params_1 = 1.f;
|
||||
registers[NV4097_SET_FOG_MODE] = 0x2601; // rsx::fog_mode::linear;
|
||||
(f32&)registers[NV4097_SET_FOG_PARAMS] = 1.;
|
||||
(f32&)registers[NV4097_SET_FOG_PARAMS + 1] = 1.;
|
||||
|
||||
m_depth_test_enabled = false;
|
||||
m_depth_func = rsx::comparison_function::less;
|
||||
m_depth_write_enabled = true;
|
||||
registers[NV4097_SET_DEPTH_FUNC] = CELL_GCM_LESS;
|
||||
registers[NV4097_SET_DEPTH_MASK] = CELL_GCM_TRUE;
|
||||
(f32&)registers[NV4097_SET_POLYGON_OFFSET_SCALE_FACTOR] = 0.f;
|
||||
(f32&)registers[NV4097_SET_POLYGON_OFFSET_BIAS] = 0.f;
|
||||
// registers[NV4097_SET_FRONT_POLYGON_MODE] = CELL_GCM_POLYGON_MODE_FILL;
|
||||
// registers[NV4097_SET_BACK_POLYGON_MODE] = CELL_GCM_POLYGON_MODE_FILL;
|
||||
registers[NV4097_SET_CULL_FACE] = CELL_GCM_BACK;
|
||||
registers[NV4097_SET_FRONT_FACE] = CELL_GCM_CCW;
|
||||
registers[NV4097_SET_RESTART_INDEX] = -1;
|
||||
registers[NV4097_SET_CONTEXT_DMA_REPORT] = CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_REPORT;
|
||||
|
||||
m_poly_offset_scale = 0.f;
|
||||
m_poly_offset_bias = 0.f;
|
||||
|
||||
m_front_polygon_mode = rsx::polygon_mode::fill;
|
||||
m_back_polygon_mode = rsx::polygon_mode::fill;
|
||||
registers[NV4097_SET_CLEAR_RECT_HORIZONTAL] = (4096 << 16) | 0;
|
||||
registers[NV4097_SET_CLEAR_RECT_VERTICAL] = (4096 << 16) | 0;
|
||||
|
||||
m_cull_face_enabled = false;
|
||||
m_cull_face_mode = rsx::cull_face::back;
|
||||
m_front_face_mode = rsx::front_face::ccw;
|
||||
m_restart_index_enabled = false;
|
||||
m_restart_index = -1;
|
||||
registers[NV4097_SET_ZSTENCIL_CLEAR_VALUE] = 0xffffffff;
|
||||
|
||||
m_clear_rect_origin_x = 0;
|
||||
m_clear_rect_origin_y = 0;
|
||||
m_clear_rect_width = 4096;
|
||||
m_clear_rect_height = 4096;
|
||||
|
||||
m_z_clear_value = -1;
|
||||
m_stencil_clear_value = -1;
|
||||
|
||||
m_context_dma_report = rsx::blit_engine::context_dma::to_memory_get_report;
|
||||
m_two_side_light_enabled = true;
|
||||
m_alpha_func = rsx::comparison_function::always;
|
||||
|
||||
// Reset vertex attrib array
|
||||
for (int i = 0; i < 16; i++)
|
||||
{
|
||||
vertex_arrays_info[i].size = 0;
|
||||
}
|
||||
|
||||
// Construct Textures
|
||||
for (int i = 0; i < 16; i++)
|
||||
{
|
||||
fragment_textures[i].init(i);
|
||||
}
|
||||
|
||||
for (int i = 0; i < 4; i++)
|
||||
{
|
||||
vertex_textures[i].init(i);
|
||||
}
|
||||
std::for_each(vertex_arrays_info.begin(), vertex_arrays_info.end(), [](auto &info) { info.size = 0; });
|
||||
std::for_each(fragment_textures.begin(), fragment_textures.end(), [](auto &tex) { tex.init(); });
|
||||
std::for_each(vertex_textures.begin(), vertex_textures.end(), [](auto &tex) { tex.init(); });
|
||||
}
|
||||
|
||||
namespace
|
||||
{
|
||||
template<u32... opcode>
|
||||
auto create_commit_functions_table(const std::integer_sequence<u32, opcode...> &)
|
||||
{
|
||||
return std::unordered_map<uint32_t, void(*)(rsx_state&, u32)>{ {opcode, commit<opcode>}... };
|
||||
}
|
||||
|
||||
auto reg_decoder = create_commit_functions_table(opcode_list);
|
||||
}
|
||||
|
||||
void rsx_state::decode(u32 reg, u32 value)
|
||||
{
|
||||
const auto &It = reg_decoder.find(reg);
|
||||
if (It != reg_decoder.end())
|
||||
(It->second)(*this, value);
|
||||
else
|
||||
registers[reg] = value;
|
||||
registers[reg] = value;
|
||||
}
|
||||
|
||||
struct __rsx_methods_t
|
||||
|
|
@ -925,7 +978,16 @@ namespace
|
|||
bind<NV4097_DRAW_ARRAYS, nv4097::draw_arrays>();
|
||||
bind<NV4097_DRAW_INDEX_ARRAY, nv4097::draw_index_array>();
|
||||
bind<NV4097_INLINE_ARRAY, nv4097::draw_inline_array>();
|
||||
bind_range<NV4097_SET_VERTEX_DATA_ARRAY_FORMAT, 1, 16, nv4097::set_vertex_data_array_format>();
|
||||
bind_range<NV4097_SET_VERTEX_DATA4UB_M, 1, 16, nv4097::set_vertex_data4ub_m>();
|
||||
bind_range<NV4097_SET_VERTEX_DATA1F_M, 1, 16, nv4097::set_vertex_data1f_m>();
|
||||
bind_range<NV4097_SET_VERTEX_DATA2F_M, 1, 32, nv4097::set_vertex_data2f_m>();
|
||||
bind_range<NV4097_SET_VERTEX_DATA3F_M, 1, 48, nv4097::set_vertex_data3f_m>();
|
||||
bind_range<NV4097_SET_VERTEX_DATA4F_M, 1, 64, nv4097::set_vertex_data4f_m>();
|
||||
bind_range<NV4097_SET_VERTEX_DATA2S_M, 1, 16, nv4097::set_vertex_data2s_m>();
|
||||
bind_range<NV4097_SET_VERTEX_DATA4S_M, 1, 32, nv4097::set_vertex_data4s_m>();
|
||||
bind_range<NV4097_SET_TRANSFORM_CONSTANT, 1, 32, nv4097::set_transform_constant>();
|
||||
bind_range<NV4097_SET_TRANSFORM_PROGRAM + 3, 4, 128, nv4097::set_transform_program>();
|
||||
bind_cpu_only<NV4097_GET_REPORT, nv4097::get_report>();
|
||||
bind_cpu_only<NV4097_CLEAR_REPORT_VALUE, nv4097::clear_report_value>();
|
||||
bind<NV4097_SET_SURFACE_CLIP_HORIZONTAL, nv4097::set_surface_dirty_bit>();
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -8,17 +8,20 @@ namespace rsx
|
|||
|
||||
struct data_array_format_info
|
||||
{
|
||||
private:
|
||||
u32& m_offset_register;
|
||||
public:
|
||||
u16 frequency = 0;
|
||||
u8 stride = 0;
|
||||
u8 size = 0;
|
||||
vertex_base_type type = vertex_base_type::f;
|
||||
u32 m_offset;
|
||||
|
||||
data_array_format_info() {}
|
||||
data_array_format_info(int id, std::array<u32, 0x10000 / 4> ®isters)
|
||||
: m_offset_register(registers[NV4097_SET_VERTEX_DATA_ARRAY_OFFSET + id]) {}
|
||||
|
||||
u32 offset() const
|
||||
{
|
||||
return m_offset;
|
||||
return m_offset_register;
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue