diff options
| author | 2018-08-19 13:59:41 -0400 | |
|---|---|---|
| committer | 2018-08-19 13:59:41 -0400 | |
| commit | b0eb580931f9d7bf22d36cefc6aaea82b25236f8 (patch) | |
| tree | 677716069940936f7102608628f6b43de5c9c1df /src | |
| parent | Merge pull request #1101 from Subv/ssy_stack (diff) | |
| parent | Added check to see if ARB_texture_mirror_clamp_to_edge is supported (diff) | |
| download | yuzu-b0eb580931f9d7bf22d36cefc6aaea82b25236f8.tar.gz yuzu-b0eb580931f9d7bf22d36cefc6aaea82b25236f8.tar.xz yuzu-b0eb580931f9d7bf22d36cefc6aaea82b25236f8.zip | |
Merge pull request #1102 from ogniK5377/mirror-clamp-edge
Added WrapMode MirrorOnceClampToEdge
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/maxwell_to_gl.h | 2 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | 2 |
3 files changed, 6 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 8f719fdd8..5d91a0c2f 100644 --- a/src/video_core/renderer_opengl/maxwell_to_gl.h +++ b/src/video_core/renderer_opengl/maxwell_to_gl.h | |||
| @@ -147,6 +147,8 @@ inline GLenum WrapMode(Tegra::Texture::WrapMode wrap_mode) { | |||
| 147 | // GL_CLAMP_TO_BORDER to get the border color of the texture, and then sample the edge to | 147 | // GL_CLAMP_TO_BORDER to get the border color of the texture, and then sample the edge to |
| 148 | // manually mix them. However the shader part of this is not yet implemented. | 148 | // manually mix them. However the shader part of this is not yet implemented. |
| 149 | return GL_CLAMP_TO_BORDER; | 149 | return GL_CLAMP_TO_BORDER; |
| 150 | case Tegra::Texture::WrapMode::MirrorOnceClampToEdge: | ||
| 151 | return GL_MIRROR_CLAMP_TO_EDGE; | ||
| 150 | } | 152 | } |
| 151 | LOG_CRITICAL(Render_OpenGL, "Unimplemented texture wrap mode={}", static_cast<u32>(wrap_mode)); | 153 | LOG_CRITICAL(Render_OpenGL, "Unimplemented texture wrap mode={}", static_cast<u32>(wrap_mode)); |
| 152 | UNREACHABLE(); | 154 | UNREACHABLE(); |
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 2df65023a..11d2331df 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -377,6 +377,8 @@ bool GMainWindow::SupportsRequiredGLExtensions() { | |||
| 377 | unsupported_ext.append("ARB_vertex_attrib_binding"); | 377 | unsupported_ext.append("ARB_vertex_attrib_binding"); |
| 378 | if (!GLAD_GL_ARB_vertex_type_10f_11f_11f_rev) | 378 | if (!GLAD_GL_ARB_vertex_type_10f_11f_11f_rev) |
| 379 | unsupported_ext.append("ARB_vertex_type_10f_11f_11f_rev"); | 379 | unsupported_ext.append("ARB_vertex_type_10f_11f_11f_rev"); |
| 380 | if (!GLAD_GL_ARB_texture_mirror_clamp_to_edge) | ||
| 381 | unsupported_ext.append("ARB_texture_mirror_clamp_to_edge"); | ||
| 380 | 382 | ||
| 381 | // Extensions required to support some texture formats. | 383 | // Extensions required to support some texture formats. |
| 382 | if (!GLAD_GL_EXT_texture_compression_s3tc) | 384 | if (!GLAD_GL_EXT_texture_compression_s3tc) |
diff --git a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp index e2945b6cf..351dd9225 100644 --- a/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp +++ b/src/yuzu_cmd/emu_window/emu_window_sdl2.cpp | |||
| @@ -89,6 +89,8 @@ bool EmuWindow_SDL2::SupportsRequiredGLExtensions() { | |||
| 89 | unsupported_ext.push_back("ARB_vertex_attrib_binding"); | 89 | unsupported_ext.push_back("ARB_vertex_attrib_binding"); |
| 90 | if (!GLAD_GL_ARB_vertex_type_10f_11f_11f_rev) | 90 | if (!GLAD_GL_ARB_vertex_type_10f_11f_11f_rev) |
| 91 | unsupported_ext.push_back("ARB_vertex_type_10f_11f_11f_rev"); | 91 | unsupported_ext.push_back("ARB_vertex_type_10f_11f_11f_rev"); |
| 92 | if (!GLAD_GL_ARB_texture_mirror_clamp_to_edge) | ||
| 93 | unsupported_ext.push_back("ARB_texture_mirror_clamp_to_edge"); | ||
| 92 | 94 | ||
| 93 | // Extensions required to support some texture formats. | 95 | // Extensions required to support some texture formats. |
| 94 | if (!GLAD_GL_EXT_texture_compression_s3tc) | 96 | if (!GLAD_GL_EXT_texture_compression_s3tc) |