diff options
author | Zach Hilman <DarkLordZach@users.noreply.github.com> | 2019-06-07 23:23:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-07 23:23:25 +0200 |
commit | de33ad25f52960449a97caa2b25e37e6a35f0710 (patch) | |
tree | 5f70bb84aafac68b6c34c95fec033528bff26d4e /src/video_core/renderer_opengl/maxwell_to_gl.h | |
parent | Merge pull request #2558 from ReinUsesLisp/shader-nodes (diff) | |
parent | gl_buffer_cache: Remove unused ReserveMemory method (diff) | |
download | yuzu-de33ad25f52960449a97caa2b25e37e6a35f0710.tar yuzu-de33ad25f52960449a97caa2b25e37e6a35f0710.tar.gz yuzu-de33ad25f52960449a97caa2b25e37e6a35f0710.tar.bz2 yuzu-de33ad25f52960449a97caa2b25e37e6a35f0710.tar.lz yuzu-de33ad25f52960449a97caa2b25e37e6a35f0710.tar.xz yuzu-de33ad25f52960449a97caa2b25e37e6a35f0710.tar.zst yuzu-de33ad25f52960449a97caa2b25e37e6a35f0710.zip |
Diffstat (limited to 'src/video_core/renderer_opengl/maxwell_to_gl.h')
-rw-r--r-- | src/video_core/renderer_opengl/maxwell_to_gl.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/video_core/renderer_opengl/maxwell_to_gl.h b/src/video_core/renderer_opengl/maxwell_to_gl.h index ed7b5cff0..ea77dd211 100644 --- a/src/video_core/renderer_opengl/maxwell_to_gl.h +++ b/src/video_core/renderer_opengl/maxwell_to_gl.h @@ -128,6 +128,8 @@ inline GLenum PrimitiveTopology(Maxwell::PrimitiveTopology topology) { return GL_TRIANGLE_STRIP; case Maxwell::PrimitiveTopology::TriangleFan: return GL_TRIANGLE_FAN; + case Maxwell::PrimitiveTopology::Quads: + return GL_QUADS; default: LOG_CRITICAL(Render_OpenGL, "Unimplemented topology={}", static_cast<u32>(topology)); UNREACHABLE(); @@ -173,11 +175,8 @@ inline GLenum WrapMode(Tegra::Texture::WrapMode wrap_mode) { return GL_CLAMP_TO_EDGE; case Tegra::Texture::WrapMode::Border: return GL_CLAMP_TO_BORDER; - case Tegra::Texture::WrapMode::ClampOGL: - // TODO(Subv): GL_CLAMP was removed as of OpenGL 3.1, to implement GL_CLAMP, we can use - // GL_CLAMP_TO_BORDER to get the border color of the texture, and then sample the edge to - // manually mix them. However the shader part of this is not yet implemented. - return GL_CLAMP_TO_BORDER; + case Tegra::Texture::WrapMode::Clamp: + return GL_CLAMP; case Tegra::Texture::WrapMode::MirrorOnceClampToEdge: return GL_MIRROR_CLAMP_TO_EDGE; case Tegra::Texture::WrapMode::MirrorOnceBorder: |