From 2f677ecebd33fbf1c02fd321de7dffe1c3447da3 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sat, 26 Apr 2025 21:24:39 +0300 Subject: [PATCH] rsx: Silence compiler warnings --- rpcs3/Emu/RSX/Common/BufferUtils.cpp | 2 +- rpcs3/Emu/RSX/Program/ProgramStateCache.cpp | 8 ++++---- rpcs3/Emu/RSX/VK/VKDraw.cpp | 4 ++-- rpcs3/Emu/RSX/VK/VKGSRender.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rpcs3/Emu/RSX/Common/BufferUtils.cpp b/rpcs3/Emu/RSX/Common/BufferUtils.cpp index 7141ebeb0a..02ccce2d2c 100644 --- a/rpcs3/Emu/RSX/Common/BufferUtils.cpp +++ b/rpcs3/Emu/RSX/Common/BufferUtils.cpp @@ -465,7 +465,7 @@ namespace const unsigned step = 8; // We do 8 entries per step const __m128i vec_step = _mm_set1_epi16(8); // Constant to increment the raw values __m128i values = _mm_set_epi16(7, 6, 5, 4, 3, 2, 1, 0); - __m128i* vec_ptr = reinterpret_cast<__m128i*>(dst); + __m128i* vec_ptr = utils::bless<__m128i>(dst); for (; (i + step) <= count; i += step, vec_ptr++) { diff --git a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp index 4baf47ac4d..67cd710a2c 100644 --- a/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp +++ b/rpcs3/Emu/RSX/Program/ProgramStateCache.cpp @@ -36,8 +36,8 @@ using namespace program_hash_util; AVX512_ICL_FUNC usz get_vertex_program_ucode_hash_512(const RSXVertexProgram &program) { // Load all elements of the instruction_mask bitset - const __m512i* instMask512 = reinterpret_cast(&program.instruction_mask); - const __m128i* instMask128 = reinterpret_cast(&program.instruction_mask); + const __m512i* instMask512 = utils::bless(&program.instruction_mask); + const __m128i* instMask128 = utils::bless(&program.instruction_mask); const __m512i lowerMask = _mm512_loadu_si512(instMask512); const __m128i upper128 = _mm_loadu_si128(instMask128 + 4); @@ -453,8 +453,8 @@ usz vertex_program_storage_hash::operator()(const RSXVertexProgram &program) con AVX512_ICL_FUNC bool vertex_program_compare_512(const RSXVertexProgram &binary1, const RSXVertexProgram &binary2) { // Load all elements of the instruction_mask bitset - const __m512i* instMask512 = reinterpret_cast(&binary1.instruction_mask); - const __m128i* instMask128 = reinterpret_cast(&binary1.instruction_mask); + const __m512i* instMask512 = utils::bless(&binary1.instruction_mask); + const __m128i* instMask128 = utils::bless(&binary1.instruction_mask); const __m512i lowerMask = _mm512_loadu_si512(instMask512); const __m128i upper128 = _mm_loadu_si128(instMask128 + 4); diff --git a/rpcs3/Emu/RSX/VK/VKDraw.cpp b/rpcs3/Emu/RSX/VK/VKDraw.cpp index 5fb1064f60..b8730af2f0 100644 --- a/rpcs3/Emu/RSX/VK/VKDraw.cpp +++ b/rpcs3/Emu/RSX/VK/VKDraw.cpp @@ -939,7 +939,7 @@ void VKGSRender::emit_geometry(u32 sub_index) else if (m_device->get_multidraw_support()) { const auto subranges = draw_call.get_subranges(); - auto ptr = reinterpret_cast(& subranges.front().first); + auto ptr = utils::bless(& subranges.front().first); _vkCmdDrawMultiEXT(*m_current_command_buffer, ::size32(subranges), ptr, 1, 0, sizeof(rsx::draw_range_t)); } else @@ -986,7 +986,7 @@ void VKGSRender::emit_geometry(u32 sub_index) *_ptr++ = count; vertex_offset += count; } - _vkCmdDrawMultiIndexedEXT(*m_current_command_buffer, subranges_count, reinterpret_cast(_ptr), 1, 0, sizeof(u32) * 3, nullptr); + _vkCmdDrawMultiIndexedEXT(*m_current_command_buffer, subranges_count, utils::bless(_ptr), 1, 0, sizeof(u32) * 3, nullptr); } else { diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp index 638a5cc58f..2c7699407e 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp +++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp @@ -2196,7 +2196,7 @@ void VKGSRender::update_vertex_env(u32 id, const vk::vertex_upload_info& vertex_ } const u32 vertex_layout_offset = (id * 16) + (base_offset / 8); - const volatile u32 constant_id_offset = static_cast(m_xform_constants_dynamic_offset) / 16u; + const u32 constant_id_offset = static_cast(m_xform_constants_dynamic_offset) / 16u; u32 push_constants[6]; u32 data_length = 20;