diff options
| author | 2018-10-22 10:58:47 -0400 | |
|---|---|---|
| committer | 2018-10-22 10:58:47 -0400 | |
| commit | 38fa3aae731800d2aaa151015506e7ce5496a893 (patch) | |
| tree | 72446cbbf239846032b9cc18720fb0b6baa1b150 /src | |
| parent | Merge pull request #1544 from DarkLordZach/reinitialize-keys-tools (diff) | |
| parent | Fixed VAOs Float types only returning GL_FLOAT in cases that they had to retu... (diff) | |
| download | yuzu-38fa3aae731800d2aaa151015506e7ce5496a893.tar.gz yuzu-38fa3aae731800d2aaa151015506e7ce5496a893.tar.xz yuzu-38fa3aae731800d2aaa151015506e7ce5496a893.zip | |
Merge pull request #1548 from FernandoS27/fix-vao
Fixed VAOs Float types only returning GL_FLOAT
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/maxwell_to_gl.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/maxwell_to_gl.h b/src/video_core/renderer_opengl/maxwell_to_gl.h index 3c3bcaae4..0f6dcab2b 100644 --- a/src/video_core/renderer_opengl/maxwell_to_gl.h +++ b/src/video_core/renderer_opengl/maxwell_to_gl.h | |||
| @@ -82,8 +82,20 @@ inline GLenum VertexType(Maxwell::VertexAttribute attrib) { | |||
| 82 | return {}; | 82 | return {}; |
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | case Maxwell::VertexAttribute::Type::Float: | 85 | case Maxwell::VertexAttribute::Type::Float: { |
| 86 | return GL_FLOAT; | 86 | switch (attrib.size) { |
| 87 | case Maxwell::VertexAttribute::Size::Size_16: | ||
| 88 | case Maxwell::VertexAttribute::Size::Size_16_16: | ||
| 89 | case Maxwell::VertexAttribute::Size::Size_16_16_16: | ||
| 90 | case Maxwell::VertexAttribute::Size::Size_16_16_16_16: | ||
| 91 | return GL_HALF_FLOAT; | ||
| 92 | case Maxwell::VertexAttribute::Size::Size_32: | ||
| 93 | case Maxwell::VertexAttribute::Size::Size_32_32: | ||
| 94 | case Maxwell::VertexAttribute::Size::Size_32_32_32: | ||
| 95 | case Maxwell::VertexAttribute::Size::Size_32_32_32_32: | ||
| 96 | return GL_FLOAT; | ||
| 97 | } | ||
| 98 | } | ||
| 87 | } | 99 | } |
| 88 | 100 | ||
| 89 | LOG_CRITICAL(Render_OpenGL, "Unimplemented vertex type={}", attrib.TypeString()); | 101 | LOG_CRITICAL(Render_OpenGL, "Unimplemented vertex type={}", attrib.TypeString()); |