N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

video_core: Initialize unrefered attributes to 1.f (#6966)

Browse source
This commit is contained in:
GPUCode 2023-09-17 00:46:44 +03:00 committed by GitHub
parent 8aee625a14
commit 542209c993
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/video_core/renderer_opengl/gl_shader_gen.cpp
View file

@ -1841,7 +1841,7 @@ struct Vertex {
if (attrib < config.gs_output_attributes) { if (attrib < config.gs_output_attributes) {
return fmt::format("vtx.attributes[{}].{}", attrib, "xyzw"[comp]); return fmt::format("vtx.attributes[{}].{}", attrib, "xyzw"[comp]);
} }
return "0.0"; return "1.0";
}; };
out += "const float EPSILON_Z = 0.00000001f;\n\n"; out += "const float EPSILON_Z = 0.00000001f;\n\n";

4
src/video_core/renderer_vulkan/vk_shader_gen.cpp
View file

@ -1810,7 +1810,7 @@ layout (set = 0, binding = 0, std140) uniform vs_config {
if (attrib < config.gs_output_attributes) { if (attrib < config.gs_output_attributes) {
return fmt::format("vs_out_attr{}.{}", attrib, "xyzw"[comp]); return fmt::format("vs_out_attr{}.{}", attrib, "xyzw"[comp]);
} }
return "0.0"; return "1.0";
}; };
out += "const float EPSILON_Z = 0.00000001f;\n\n"; out += "const float EPSILON_Z = 0.00000001f;\n\n";
@ -1900,7 +1900,7 @@ struct Vertex {
if (attrib < config.gs_output_attributes) { if (attrib < config.gs_output_attributes) {
return fmt::format("vtx.attributes[{}].{}", attrib, "xyzw"[comp]); return fmt::format("vtx.attributes[{}].{}", attrib, "xyzw"[comp]);
} }
return "0.0"; return "1.0";
}; };
out += "const float EPSILON_Z = 0.00000001f;\n\n"; out += "const float EPSILON_Z = 0.00000001f;\n\n";

4
src/video_core/shader/shader.cpp
View file

@ -44,6 +44,10 @@ OutputVertex OutputVertex::FromAttributeBuffer(const RasterizerRegs& regs,
std::array<f24, 32> vertex_slots_overflow; std::array<f24, 32> vertex_slots_overflow;
}; };
// Some games use attributes without setting them in GPUREG_SH_OUTMAP_Oi
// Hardware tests have shown that they are initialized to 1.f in this case.
vertex_slots_overflow.fill(f24::One());
// Assert that OutputVertex has enough space for 24 semantic registers // Assert that OutputVertex has enough space for 24 semantic registers
static_assert(sizeof(std::array<f24, 24>) == sizeof(ret), static_assert(sizeof(std::array<f24, 24>) == sizeof(ret),
"Struct and array have different sizes."); "Struct and array have different sizes.");