diff --git a/rpcs3/Emu/RSX/Program/GLSLInterpreter/FragmentInterpreter.glsl b/rpcs3/Emu/RSX/Program/GLSLInterpreter/FragmentInterpreter.glsl index 34a03343b3..928fc00b6b 100644 --- a/rpcs3/Emu/RSX/Program/GLSLInterpreter/FragmentInterpreter.glsl +++ b/rpcs3/Emu/RSX/Program/GLSLInterpreter/FragmentInterpreter.glsl @@ -529,7 +529,7 @@ void initialize() // WPOS vr0 = vec4(abs(wpos_scale), wpos_scale, 1., 1.); - vr1 = vec4(0., wpos_bias, 0., 0.); + vr1 = vec4(wpos_bias, 0., 0.); wpos = gl_FragCoord * vr0 + vr1; // Other diff --git a/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp b/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp index 96f45ae7a2..02d0f0f407 100644 --- a/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp +++ b/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp @@ -501,8 +501,11 @@ namespace vk if (auto ptr = std::get_if(&slot)) { + // We need to convert the VkDescriptorImageInfoEx entries back to the native vulkan variants since we're going to be flushing an array with no stride check + auto vk_data = ptr->map(FN(static_cast(x))); + writer.descriptorCount = ptr->size(); - m_descriptor_set.push(ptr->data(), ptr->size(), type, idx); + m_descriptor_set.push(vk_data.data(), vk_data.size(), type, idx); return; } @@ -552,8 +555,9 @@ namespace vk if (auto ptr = std::get_if(&slot)) { + auto vk_data = ptr->map(FN(static_cast(x))); // This can be optimized to update only changed ids but this is an interpreter-only feature for now ensure(m_descriptor_template[idx].descriptorCount == ptr->size()); - m_descriptor_template[idx].pImageInfo = m_descriptor_set.store(*ptr); + m_descriptor_template[idx].pImageInfo = m_descriptor_set.store(vk_data); return; }