diff options
| author | 2020-06-29 11:48:38 -0400 | |
|---|---|---|
| committer | 2020-06-29 11:48:38 -0400 | |
| commit | 10eca7f651d0dc407c7c4076d11e0b960d9dedd4 (patch) | |
| tree | 9fd6821a2d6215c98d549ccb0d76eb9fbc07b057 | |
| parent | maxwell_to_vk: Reorder vertex formats and add A2B10G10R10 for all types excep... (diff) | |
| download | yuzu-10eca7f651d0dc407c7c4076d11e0b960d9dedd4.tar.gz yuzu-10eca7f651d0dc407c7c4076d11e0b960d9dedd4.tar.xz yuzu-10eca7f651d0dc407c7c4076d11e0b960d9dedd4.zip | |
maxwell_to_gl: Rename VertexType() to VertexFormat()
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer.cpp | 5 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/maxwell_to_gl.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index 362457ffe..e960a0ef1 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp | |||
| @@ -213,9 +213,10 @@ void RasterizerOpenGL::SetupVertexFormat() { | |||
| 213 | if (attrib.type == Maxwell::VertexAttribute::Type::SignedInt || | 213 | if (attrib.type == Maxwell::VertexAttribute::Type::SignedInt || |
| 214 | attrib.type == Maxwell::VertexAttribute::Type::UnsignedInt) { | 214 | attrib.type == Maxwell::VertexAttribute::Type::UnsignedInt) { |
| 215 | glVertexAttribIFormat(gl_index, attrib.ComponentCount(), | 215 | glVertexAttribIFormat(gl_index, attrib.ComponentCount(), |
| 216 | MaxwellToGL::VertexType(attrib), attrib.offset); | 216 | MaxwellToGL::VertexFormat(attrib), attrib.offset); |
| 217 | } else { | 217 | } else { |
| 218 | glVertexAttribFormat(gl_index, attrib.ComponentCount(), MaxwellToGL::VertexType(attrib), | 218 | glVertexAttribFormat(gl_index, attrib.ComponentCount(), |
| 219 | MaxwellToGL::VertexFormat(attrib), | ||
| 219 | attrib.IsNormalized() ? GL_TRUE : GL_FALSE, attrib.offset); | 220 | attrib.IsNormalized() ? GL_TRUE : GL_FALSE, attrib.offset); |
| 220 | } | 221 | } |
| 221 | glVertexAttribBinding(gl_index, attrib.buffer); | 222 | glVertexAttribBinding(gl_index, attrib.buffer); |
diff --git a/src/video_core/renderer_opengl/maxwell_to_gl.h b/src/video_core/renderer_opengl/maxwell_to_gl.h index 8f3871e90..774e70a5b 100644 --- a/src/video_core/renderer_opengl/maxwell_to_gl.h +++ b/src/video_core/renderer_opengl/maxwell_to_gl.h | |||
| @@ -24,7 +24,7 @@ namespace MaxwellToGL { | |||
| 24 | 24 | ||
| 25 | using Maxwell = Tegra::Engines::Maxwell3D::Regs; | 25 | using Maxwell = Tegra::Engines::Maxwell3D::Regs; |
| 26 | 26 | ||
| 27 | inline GLenum VertexType(Maxwell::VertexAttribute attrib) { | 27 | inline GLenum VertexFormat(Maxwell::VertexAttribute attrib) { |
| 28 | switch (attrib.type) { | 28 | switch (attrib.type) { |
| 29 | case Maxwell::VertexAttribute::Type::UnsignedNorm: | 29 | case Maxwell::VertexAttribute::Type::UnsignedNorm: |
| 30 | case Maxwell::VertexAttribute::Type::UnsignedScaled: | 30 | case Maxwell::VertexAttribute::Type::UnsignedScaled: |
| @@ -87,7 +87,7 @@ inline GLenum VertexType(Maxwell::VertexAttribute attrib) { | |||
| 87 | } | 87 | } |
| 88 | break; | 88 | break; |
| 89 | } | 89 | } |
| 90 | UNIMPLEMENTED_MSG("Unimplemented vertex type={} and size={}", attrib.TypeString(), | 90 | UNIMPLEMENTED_MSG("Unimplemented vertex format of type={} and size={}", attrib.TypeString(), |
| 91 | attrib.SizeString()); | 91 | attrib.SizeString()); |
| 92 | return {}; | 92 | return {}; |
| 93 | } | 93 | } |