diff options
| author |  bunnei | 2018-10-27 21:09:06 -0400 |
|---|---|---|
| committer |  GitHub | 2018-10-27 21:09:06 -0400 |
| commit | d63f5acb15f21763b83d839628100269cea72216 (patch) | |
| tree | e09358ae8f798aceea74e4018ef8a20d496d6797 /src | |
| parent | Merge pull request #1596 from FearlessTobi/port-4367 (diff) | |
| parent | gl_rasterizer_cache: Fix compiler warning (diff) | |
| download | yuzu-d63f5acb15f21763b83d839628100269cea72216.tar.gz yuzu-d63f5acb15f21763b83d839628100269cea72216.tar.xz yuzu-d63f5acb15f21763b83d839628100269cea72216.zip | |
Merge pull request #1594 from FreddyFunk/static-cast
gl_rasterizer_cache: Fix compiler warning
Diffstat (limited to 'src')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index 591ec7998..04a024137 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | |||
| @@ -960,8 +960,8 @@ void CachedSurface::FlushGLBuffer() { | |||
| 960 | glPixelStorei(GL_PACK_ROW_LENGTH, static_cast<GLint>(params.width)); | 960 | glPixelStorei(GL_PACK_ROW_LENGTH, static_cast<GLint>(params.width)); |
| 961 | ASSERT(!tuple.compressed); | 961 | ASSERT(!tuple.compressed); |
| 962 | glBindBuffer(GL_PIXEL_PACK_BUFFER, 0); | 962 | glBindBuffer(GL_PIXEL_PACK_BUFFER, 0); |
| 963 | glGetTextureImage(texture.handle, 0, tuple.format, tuple.type, gl_buffer.size(), | 963 | glGetTextureImage(texture.handle, 0, tuple.format, tuple.type, |
| 964 | gl_buffer.data()); | 964 | static_cast<GLsizei>(gl_buffer.size()), gl_buffer.data()); |
| 965 | glPixelStorei(GL_PACK_ROW_LENGTH, 0); | 965 | glPixelStorei(GL_PACK_ROW_LENGTH, 0); |
| 966 | ConvertFormatAsNeeded_FlushGLBuffer(gl_buffer, params.pixel_format, params.width, | 966 | ConvertFormatAsNeeded_FlushGLBuffer(gl_buffer, params.pixel_format, params.width, |
| 967 | params.height); | 967 | params.height); |