diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-12-23 02:14:37 +0100 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2019-12-23 02:33:01 +0100 |
commit | 91d35559e55777bcd39dc666b0a0ef0279f4bfb8 (patch) | |
tree | 45a8389acbe972733306f05a5153eabc41711728 | |
parent | Merge pull request #3238 from ReinUsesLisp/vk-resource-manager (diff) | |
download | yuzu-91d35559e55777bcd39dc666b0a0ef0279f4bfb8.tar yuzu-91d35559e55777bcd39dc666b0a0ef0279f4bfb8.tar.gz yuzu-91d35559e55777bcd39dc666b0a0ef0279f4bfb8.tar.bz2 yuzu-91d35559e55777bcd39dc666b0a0ef0279f4bfb8.tar.lz yuzu-91d35559e55777bcd39dc666b0a0ef0279f4bfb8.tar.xz yuzu-91d35559e55777bcd39dc666b0a0ef0279f4bfb8.tar.zst yuzu-91d35559e55777bcd39dc666b0a0ef0279f4bfb8.zip |
-rw-r--r-- | src/video_core/renderer_opengl/maxwell_to_gl.h | 22 |
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, |