RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-03-10 23:45:16 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into vulkan

Browse source
This commit is contained in:
Ani 2026-03-09 12:52:03 +00:00 committed by GitHub
parent 247eb8fb55 5f6822042d
commit 7939157574
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/Emu/RSX/GL/glutils/common.h
View file

@ -87,7 +87,7 @@ namespace gl
void set_name(std::string_view name)
{
m_name = name.data();
glObjectLabel(Ns, m_id, name.length(), name.data());
glObjectLabel(Ns, m_id, static_cast<GLsizei>(name.length()), name.data());
}
std::string_view name() const
@ -97,9 +97,9 @@ namespace gl
};
// Very useful util when capturing traces with RenderDoc
static inline void push_debug_label(const char* label)
static inline void push_debug_label(std::string_view label)
{
glInsertEventMarkerEXT(static_cast<GLsizei>(strlen(label)), label);
glInsertEventMarkerEXT(static_cast<GLsizei>(label.size()), label.data());
}
// Checks if GL state is still valid

3
rpcs3/Emu/RSX/Program/FragmentProgramDecompiler.cpp
View file

@ -868,8 +868,11 @@ std::string FragmentProgramDecompiler::BuildCode()
if (!m_is_valid_ucode)
{
// If the code is broken, do not compile. Simply NOP main and write empty outputs
m_parr.params[PF_PARAM_UNIFORM].clear();
insertHeader(OS);
OS << "\n";
insertConstants(OS);
OS << "\n";
OS << "void main()\n";
OS << "{\n";
OS << "#if 0\n";

14
rpcs3/Emu/RSX/VK/VKDraw.cpp
View file

@ -635,9 +635,16 @@ bool VKGSRender::bind_texture_env()
{
if (!(textures_ref & 1))
{
// Unused TIU
continue;
}
if (m_fs_binding_table->ftex_location[i] == umax)
{
// Corrupt shader table
break;
}
vk::image_view* view = nullptr;
auto sampler_state = static_cast<vk::texture_cache::sampled_image_descriptor*>(fs_sampler_state[i].get());
@ -707,9 +714,16 @@ bool VKGSRender::bind_texture_env()
{
if (!(textures_ref & 1))
{
// Unused TIU
continue;
}
if (m_vs_binding_table->vtex_location[i] == umax)
{
// Corrupt shader
break;
}
if (!rsx::method_registers.vertex_textures[i].enabled())
{
const auto view_type = vk::get_view_type(current_vertex_program.get_texture_dimension(i));