summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2018-08-05 01:38:54 -0400
committerGravatar GitHub2018-08-05 01:38:54 -0400
commitce46fb27ca6d771f0c34b81bde4711c65050274d (patch)
treecc84e9278faa81ec67f760726fe10da85521699d /src
parentMerge pull request #924 from lioncash/arp (diff)
parentadded braces for conditions (diff)
downloadyuzu-ce46fb27ca6d771f0c34b81bde4711c65050274d.tar.gz
yuzu-ce46fb27ca6d771f0c34b81bde4711c65050274d.tar.xz
yuzu-ce46fb27ca6d771f0c34b81bde4711c65050274d.zip
Merge pull request #926 from ogniK5377/vertex-attrib-format
gl_rasterizer: Fix glVertexAttribFormat for integers
Diffstat (limited to 'src')
-rw-r--r--src/video_core/renderer_opengl/gl_rasterizer.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp
index 6555db5bb..c2a931469 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp
@@ -169,8 +169,14 @@ std::pair<u8*, GLintptr> RasterizerOpenGL::SetupVertexArrays(u8* array_ptr,
169 ASSERT(buffer.IsEnabled()); 169 ASSERT(buffer.IsEnabled());
170 170
171 glEnableVertexAttribArray(index); 171 glEnableVertexAttribArray(index);
172 glVertexAttribFormat(index, attrib.ComponentCount(), MaxwellToGL::VertexType(attrib), 172 if (attrib.type == Tegra::Engines::Maxwell3D::Regs::VertexAttribute::Type::SignedInt ||
173 attrib.IsNormalized() ? GL_TRUE : GL_FALSE, attrib.offset); 173 attrib.type == Tegra::Engines::Maxwell3D::Regs::VertexAttribute::Type::UnsignedInt) {
174 glVertexAttribIFormat(index, attrib.ComponentCount(), MaxwellToGL::VertexType(attrib),
175 attrib.offset);
176 } else {
177 glVertexAttribFormat(index, attrib.ComponentCount(), MaxwellToGL::VertexType(attrib),
178 attrib.IsNormalized() ? GL_TRUE : GL_FALSE, attrib.offset);
179 }
174 glVertexAttribBinding(index, attrib.buffer); 180 glVertexAttribBinding(index, attrib.buffer);
175 } 181 }
176 182