Merge pull request #1548 from FernandoS27/fix-vao

Fixed VAOs Float types only returning GL_FLOAT
master
bunnei 2018-10-22 10:58:47 +07:00 committed by GitHub
commit 38fa3aae73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions

@ -82,8 +82,20 @@ inline GLenum VertexType(Maxwell::VertexAttribute attrib) {
return {}; return {};
} }
case Maxwell::VertexAttribute::Type::Float: case Maxwell::VertexAttribute::Type::Float: {
return GL_FLOAT; switch (attrib.size) {
case Maxwell::VertexAttribute::Size::Size_16:
case Maxwell::VertexAttribute::Size::Size_16_16:
case Maxwell::VertexAttribute::Size::Size_16_16_16:
case Maxwell::VertexAttribute::Size::Size_16_16_16_16:
return GL_HALF_FLOAT;
case Maxwell::VertexAttribute::Size::Size_32:
case Maxwell::VertexAttribute::Size::Size_32_32:
case Maxwell::VertexAttribute::Size::Size_32_32_32:
case Maxwell::VertexAttribute::Size::Size_32_32_32_32:
return GL_FLOAT;
}
}
} }
LOG_CRITICAL(Render_OpenGL, "Unimplemented vertex type={}", attrib.TypeString()); LOG_CRITICAL(Render_OpenGL, "Unimplemented vertex type={}", attrib.TypeString());