summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-01-02 02:33:33 +0100
committerGitHub <noreply@github.com>2020-01-02 02:33:33 +0100
commitae0e48167771710980def376bb26ed270a0d7c2d (patch)
treeff6956b8036cc180cacaad150d2658da7035f77d
parentMerge pull request #3239 from ReinUsesLisp/p2r (diff)
parentmaxwell_to_gl: Implement missing primitive topologies (diff)
downloadyuzu-ae0e48167771710980def376bb26ed270a0d7c2d.tar
yuzu-ae0e48167771710980def376bb26ed270a0d7c2d.tar.gz
yuzu-ae0e48167771710980def376bb26ed270a0d7c2d.tar.bz2
yuzu-ae0e48167771710980def376bb26ed270a0d7c2d.tar.lz
yuzu-ae0e48167771710980def376bb26ed270a0d7c2d.tar.xz
yuzu-ae0e48167771710980def376bb26ed270a0d7c2d.tar.zst
yuzu-ae0e48167771710980def376bb26ed270a0d7c2d.zip
-rw-r--r--src/video_core/renderer_opengl/maxwell_to_gl.h22
1 files changed, 18 insertions, 4 deletions
diff --git a/src/video_core/renderer_opengl/maxwell_to_gl.h b/src/video_core/renderer_opengl/maxwell_to_gl.h
index 9ed738171..ea4f35663 100644
--- a/src/video_core/renderer_opengl/maxwell_to_gl.h
+++ b/src/video_core/renderer_opengl/maxwell_to_gl.h
@@ -120,6 +120,8 @@ inline GLenum PrimitiveTopology(Maxwell::PrimitiveTopology topology) {
return GL_POINTS;
case Maxwell::PrimitiveTopology::Lines:
return GL_LINES;
+ case Maxwell::PrimitiveTopology::LineLoop:
+ return GL_LINE_LOOP;
case Maxwell::PrimitiveTopology::LineStrip:
return GL_LINE_STRIP;
case Maxwell::PrimitiveTopology::Triangles:
@@ -130,11 +132,23 @@ inline GLenum PrimitiveTopology(Maxwell::PrimitiveTopology topology) {
return GL_TRIANGLE_FAN;
case Maxwell::PrimitiveTopology::Quads:
return GL_QUADS;
- default:
- LOG_CRITICAL(Render_OpenGL, "Unimplemented topology={}", static_cast<u32>(topology));
- UNREACHABLE();
- return {};
+ case Maxwell::PrimitiveTopology::QuadStrip:
+ return GL_QUAD_STRIP;
+ case Maxwell::PrimitiveTopology::Polygon:
+ return GL_POLYGON;
+ case Maxwell::PrimitiveTopology::LinesAdjacency:
+ return GL_LINES_ADJACENCY;
+ case Maxwell::PrimitiveTopology::LineStripAdjacency:
+ return GL_LINE_STRIP_ADJACENCY;
+ case Maxwell::PrimitiveTopology::TrianglesAdjacency:
+ return GL_TRIANGLES_ADJACENCY;
+ case Maxwell::PrimitiveTopology::TriangleStripAdjacency:
+ return GL_TRIANGLE_STRIP_ADJACENCY;
+ case Maxwell::PrimitiveTopology::Patches:
+ return GL_PATCHES;
}
+ UNREACHABLE_MSG("Invalid topology={}", static_cast<int>(topology));
+ return GL_POINTS;
}
inline GLenum TextureFilterMode(Tegra::Texture::TextureFilter filter_mode,