diff options
| author | bunnei <bunneidev@gmail.com> | 2020-01-29 17:23:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-29 17:23:50 +0100 |
| commit | 91f79225e78082df5aee28727e63b0e4882beadc (patch) | |
| tree | 9443ca8c55126d3103eddb874045de743db064ca /src/video_core | |
| parent | Merge pull request #3359 from ReinUsesLisp/assert-point-size (diff) | |
| parent | gl_texture_cache: Silence implicit sign cast warnings (diff) | |
| download | yuzu-91f79225e78082df5aee28727e63b0e4882beadc.tar yuzu-91f79225e78082df5aee28727e63b0e4882beadc.tar.gz yuzu-91f79225e78082df5aee28727e63b0e4882beadc.tar.bz2 yuzu-91f79225e78082df5aee28727e63b0e4882beadc.tar.lz yuzu-91f79225e78082df5aee28727e63b0e4882beadc.tar.xz yuzu-91f79225e78082df5aee28727e63b0e4882beadc.tar.zst yuzu-91f79225e78082df5aee28727e63b0e4882beadc.zip | |
Diffstat (limited to 'src/video_core')
| -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 d9aae6dff..d4b81cd87 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.cpp +++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp @@ -197,7 +197,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); } @@ -552,8 +552,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); } |