Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

RasterizerGL: Ignore invalid/unset vertex attributes.

Browse source 
This should make the es2gears example not crash anymore.
This commit is contained in:
Subv 2018-08-11 20:36:40 -05:00
parent 403dfd68fc
commit 2dad1204e8
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/video_core/engines/maxwell_3d.h
View file

@ -93,6 +93,7 @@ public:
struct VertexAttribute { struct VertexAttribute {
enum class Size : u32 { enum class Size : u32 {
Invalid = 0x0,
Size_32_32_32_32 = 0x01, Size_32_32_32_32 = 0x01,
Size_32_32_32 = 0x02, Size_32_32_32 = 0x02,
Size_16_16_16_16 = 0x03, Size_16_16_16_16 = 0x03,
@ -257,6 +258,10 @@ public:
bool IsNormalized() const { bool IsNormalized() const {
return (type == Type::SignedNorm) || (type == Type::UnsignedNorm); return (type == Type::SignedNorm) || (type == Type::UnsignedNorm);
} }
bool IsValid() const {
return size != Size::Invalid;
}
}; };
enum class PrimitiveTopology : u32 { enum class PrimitiveTopology : u32 {

7
src/video_core/renderer_opengl/gl_rasterizer.cpp
View file

@ -161,11 +161,16 @@ std::pair<u8*, GLintptr> RasterizerOpenGL::SetupVertexArrays(u8* array_ptr,
// assume every shader uses them all. // assume every shader uses them all.
for (unsigned index = 0; index < 16; ++index) { for (unsigned index = 0; index < 16; ++index) {
auto& attrib = regs.vertex_attrib_format[index]; auto& attrib = regs.vertex_attrib_format[index];
// Ignore invalid attributes.
if (!attrib.IsValid())
continue;
auto& buffer = regs.vertex_array[attrib.buffer];
LOG_TRACE(HW_GPU, "vertex attrib {}, count={}, size={}, type={}, offset={}, normalize={}", LOG_TRACE(HW_GPU, "vertex attrib {}, count={}, size={}, type={}, offset={}, normalize={}",
index, attrib.ComponentCount(), attrib.SizeString(), attrib.TypeString(), index, attrib.ComponentCount(), attrib.SizeString(), attrib.TypeString(),
attrib.offset.Value(), attrib.IsNormalized()); attrib.offset.Value(), attrib.IsNormalized());
auto& buffer = regs.vertex_array[attrib.buffer];
ASSERT(buffer.IsEnabled()); ASSERT(buffer.IsEnabled());
glEnableVertexAttribArray(index); glEnableVertexAttribArray(index);