diff --git a/rpcs3/Emu/RSX/Capture/rsx_trace.h b/rpcs3/Emu/RSX/Capture/rsx_trace.h index ad90496ad9..0d005423d7 100644 --- a/rpcs3/Emu/RSX/Capture/rsx_trace.h +++ b/rpcs3/Emu/RSX/Capture/rsx_trace.h @@ -19,7 +19,6 @@ struct frame_trace_data std::array, 2> depth_stencil; std::vector index; u32 vertex_count; - }; std::vector> command_queue; diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index 5ce0522038..b7b4e23dba 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -741,7 +741,7 @@ namespace rsx ar(stereo_mode, format, aspect, resolution_id, scanline_pitch, gamma, resolution_x, resolution_y, state, scan_mode); } - void thread::capture_frame(const std::string &name) + void thread::capture_frame(const std::string& name) { frame_trace_data::draw_state draw_state{}; @@ -2485,7 +2485,7 @@ namespace rsx if (tex.enabled() && sampler_descriptors[i]->format_class != RSX_FORMAT_CLASS_UNDEFINED) { - std::memcpy(current_fragment_program.texture_params[i].scale, sampler_descriptors[i]->texcoord_xform.scale, 6 * sizeof(float)); + std::memcpy(current_fragment_program.texture_params[i].scale, sampler_descriptors[i]->texcoord_xform.scale, 6 * sizeof(f32)); current_fragment_program.texture_params[i].remap = tex.remap(); m_graphics_state |= rsx::pipeline_state::fragment_texture_state_dirty; @@ -2495,7 +2495,7 @@ namespace rsx if (sampler_descriptors[i]->texcoord_xform.clamp) { - std::memcpy(current_fragment_program.texture_params[i].clamp_min, sampler_descriptors[i]->texcoord_xform.clamp_min, 4 * sizeof(float)); + std::memcpy(current_fragment_program.texture_params[i].clamp_min, sampler_descriptors[i]->texcoord_xform.clamp_min, 4 * sizeof(f32)); texture_control |= (1 << rsx::texture_control_bits::CLAMP_TEXCOORDS_BIT); } diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/Emu/RSX/RSXThread.h index a64c92356b..70db28453e 100644 --- a/rpcs3/Emu/RSX/RSXThread.h +++ b/rpcs3/Emu/RSX/RSXThread.h @@ -203,7 +203,7 @@ namespace rsx // Profiler rsx::profiling_timer m_profiler; - frame_statistics_t m_frame_stats; + frame_statistics_t m_frame_stats{}; // Savestates related u32 m_pause_after_x_flips = 0; @@ -262,7 +262,7 @@ namespace rsx atomic_bitmask_t async_flip_requested{}; u8 async_flip_buffer{ 0 }; - void capture_frame(const std::string &name); + void capture_frame(const std::string& name); const backend_configuration& get_backend_config() const { return backend_config; } public: @@ -272,8 +272,8 @@ namespace rsx bool isHLE{ false }; bool serialized = false; - u32 flip_status; - int debug_level; + u32 flip_status = CELL_GCM_DISPLAY_FLIP_STATUS_DONE; + int debug_level = CELL_GCM_DEBUG_LEVEL0; atomic_t requested_vsync{true}; atomic_t enable_second_vhandler{false};