summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2018-08-09 13:28:14 -0400
committerGravatar GitHub2018-08-09 13:28:14 -0400
commitb125137493668052b0fef8707f3517186a7dfed8 (patch)
tree5b3295d6be7c76f0f4f552b908f65e4427276d45 /src
parentMerge pull request #984 from bunnei/rt-none (diff)
parentmaxwell_to_gl: Implement VertexAttribute::Size::Size_16_16_16_16. (diff)
downloadyuzu-b125137493668052b0fef8707f3517186a7dfed8.tar.gz
yuzu-b125137493668052b0fef8707f3517186a7dfed8.tar.xz
yuzu-b125137493668052b0fef8707f3517186a7dfed8.zip
Merge pull request #993 from bunnei/smo-vtx-pts
Implement VertexAttribute::Size::Size_16_16_16_16 and PrimitiveTopology::Points.
Diffstat (limited to 'src')
-rw-r--r--src/video_core/renderer_opengl/maxwell_to_gl.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/video_core/renderer_opengl/maxwell_to_gl.h b/src/video_core/renderer_opengl/maxwell_to_gl.h
index 500d4d4b1..43be69dd1 100644
--- a/src/video_core/renderer_opengl/maxwell_to_gl.h
+++ b/src/video_core/renderer_opengl/maxwell_to_gl.h
@@ -31,6 +31,7 @@ inline GLenum VertexType(Maxwell::VertexAttribute attrib) {
31 case Maxwell::VertexAttribute::Size::Size_8_8_8_8: 31 case Maxwell::VertexAttribute::Size::Size_8_8_8_8:
32 return GL_UNSIGNED_BYTE; 32 return GL_UNSIGNED_BYTE;
33 case Maxwell::VertexAttribute::Size::Size_16_16: 33 case Maxwell::VertexAttribute::Size::Size_16_16:
34 case Maxwell::VertexAttribute::Size::Size_16_16_16_16:
34 return GL_UNSIGNED_SHORT; 35 return GL_UNSIGNED_SHORT;
35 case Maxwell::VertexAttribute::Size::Size_10_10_10_2: 36 case Maxwell::VertexAttribute::Size::Size_10_10_10_2:
36 return GL_UNSIGNED_INT_2_10_10_10_REV; 37 return GL_UNSIGNED_INT_2_10_10_10_REV;
@@ -85,6 +86,8 @@ inline GLenum IndexFormat(Maxwell::IndexFormat index_format) {
85 86
86inline GLenum PrimitiveTopology(Maxwell::PrimitiveTopology topology) { 87inline GLenum PrimitiveTopology(Maxwell::PrimitiveTopology topology) {
87 switch (topology) { 88 switch (topology) {
89 case Maxwell::PrimitiveTopology::Points:
90 return GL_POINTS;
88 case Maxwell::PrimitiveTopology::Triangles: 91 case Maxwell::PrimitiveTopology::Triangles:
89 return GL_TRIANGLES; 92 return GL_TRIANGLES;
90 case Maxwell::PrimitiveTopology::TriangleStrip: 93 case Maxwell::PrimitiveTopology::TriangleStrip: