diff options
author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-01-28 00:59:11 +0100 |
---|---|---|
committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-01-28 00:59:11 +0100 |
commit | abae7959865ec45a1a6bd5d4994d5ef4c6588fef (patch) | |
tree | 0ee2f95659c902d9439ba13255fc05581ecb8a95 /src/video_core/renderer_opengl/gl_texture_cache.cpp | |
parent | Merge pull request #3346 from bunnei/bsd-stub (diff) | |
download | yuzu-abae7959865ec45a1a6bd5d4994d5ef4c6588fef.tar yuzu-abae7959865ec45a1a6bd5d4994d5ef4c6588fef.tar.gz yuzu-abae7959865ec45a1a6bd5d4994d5ef4c6588fef.tar.bz2 yuzu-abae7959865ec45a1a6bd5d4994d5ef4c6588fef.tar.lz yuzu-abae7959865ec45a1a6bd5d4994d5ef4c6588fef.tar.xz yuzu-abae7959865ec45a1a6bd5d4994d5ef4c6588fef.tar.zst yuzu-abae7959865ec45a1a6bd5d4994d5ef4c6588fef.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/renderer_opengl/gl_texture_cache.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp index e95eb069e..5c94dfece 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.cpp +++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp @@ -184,7 +184,7 @@ void ApplyTextureDefaults(const SurfaceParams& params, GLuint texture) { glTextureParameteri(texture, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTextureParameteri(texture, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTextureParameteri(texture, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - glTextureParameteri(texture, GL_TEXTURE_MAX_LEVEL, params.num_levels - 1); + glTextureParameteri(texture, GL_TEXTURE_MAX_LEVEL, static_cast<GLint>(params.num_levels - 1)); if (params.num_levels == 1) { glTextureParameterf(texture, GL_TEXTURE_LOD_BIAS, 1000.0f); } @@ -529,8 +529,11 @@ void TextureCacheOpenGL::ImageBlit(View& src_view, View& dst_view, const Common::Rectangle<u32>& dst_rect = copy_config.dst_rect; const bool is_linear = copy_config.filter == Tegra::Engines::Fermi2D::Filter::Linear; - glBlitFramebuffer(src_rect.left, src_rect.top, src_rect.right, src_rect.bottom, dst_rect.left, - dst_rect.top, dst_rect.right, dst_rect.bottom, buffers, + glBlitFramebuffer(static_cast<GLint>(src_rect.left), static_cast<GLint>(src_rect.top), + static_cast<GLint>(src_rect.right), static_cast<GLint>(src_rect.bottom), + static_cast<GLint>(dst_rect.left), static_cast<GLint>(dst_rect.top), + static_cast<GLint>(dst_rect.right), static_cast<GLint>(dst_rect.bottom), + buffers, is_linear && (buffers == GL_COLOR_BUFFER_BIT) ? GL_LINEAR : GL_NEAREST); } |