diff options
author | Frederic Laing <frederic.laing@alumni.fh-aachen.de> | 2018-11-08 13:58:53 +0100 |
---|---|---|
committer | Frederic Laing <27208977+FreddyFunk@users.noreply.github.com> | 2018-11-08 16:50:09 +0100 |
commit | e2bf581e3a0caa8af3e6a312bf68e56366ba0fb0 (patch) | |
tree | d873e98ba6b2b9ed4288f40d6f91e7fb29a44388 /src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | |
parent | Merge pull request #1630 from bunnei/fix-mapbufferex (diff) | |
download | yuzu-e2bf581e3a0caa8af3e6a312bf68e56366ba0fb0.tar yuzu-e2bf581e3a0caa8af3e6a312bf68e56366ba0fb0.tar.gz yuzu-e2bf581e3a0caa8af3e6a312bf68e56366ba0fb0.tar.bz2 yuzu-e2bf581e3a0caa8af3e6a312bf68e56366ba0fb0.tar.lz yuzu-e2bf581e3a0caa8af3e6a312bf68e56366ba0fb0.tar.xz yuzu-e2bf581e3a0caa8af3e6a312bf68e56366ba0fb0.tar.zst yuzu-e2bf581e3a0caa8af3e6a312bf68e56366ba0fb0.zip |
Diffstat (limited to '')
-rw-r--r-- | src/video_core/renderer_opengl/gl_rasterizer_cache.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index 49d63e6f3..ada2e3859 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp @@ -708,18 +708,18 @@ static void FastCopySurface(const Surface& src_surface, const Surface& dst_surfa MICROPROFILE_DEFINE(OpenGL_CopySurface, "OpenGL", "CopySurface", MP_RGB(128, 192, 64)); static void CopySurface(const Surface& src_surface, const Surface& dst_surface, - GLuint copy_pbo_handle, GLenum src_attachment = 0, - GLenum dst_attachment = 0, std::size_t cubemap_face = 0) { + const GLuint copy_pbo_handle, const GLenum src_attachment = 0, + const GLenum dst_attachment = 0, const std::size_t cubemap_face = 0) { MICROPROFILE_SCOPE(OpenGL_CopySurface); ASSERT_MSG(dst_attachment == 0, "Unimplemented"); const auto& src_params{src_surface->GetSurfaceParams()}; const auto& dst_params{dst_surface->GetSurfaceParams()}; - auto source_format = GetFormatTuple(src_params.pixel_format, src_params.component_type); - auto dest_format = GetFormatTuple(dst_params.pixel_format, dst_params.component_type); + const auto source_format = GetFormatTuple(src_params.pixel_format, src_params.component_type); + const auto dest_format = GetFormatTuple(dst_params.pixel_format, dst_params.component_type); - std::size_t buffer_size = std::max(src_params.size_in_bytes, dst_params.size_in_bytes); + const std::size_t buffer_size = std::max(src_params.size_in_bytes, dst_params.size_in_bytes); glBindBuffer(GL_PIXEL_PACK_BUFFER, copy_pbo_handle); glBufferData(GL_PIXEL_PACK_BUFFER, buffer_size, nullptr, GL_STREAM_DRAW_ARB); @@ -743,13 +743,10 @@ static void CopySurface(const Surface& src_surface, const Surface& dst_surface, LOG_DEBUG(HW_GPU, "Trying to upload extra texture data from the CPU during " "reinterpretation but the texture is tiled."); } - std::size_t remaining_size = dst_params.size_in_bytes - src_params.size_in_bytes; - std::vector<u8> data(remaining_size); - std::memcpy(data.data(), Memory::GetPointer(dst_params.addr + src_params.size_in_bytes), - data.size()); + const std::size_t remaining_size = dst_params.size_in_bytes - src_params.size_in_bytes; glBufferSubData(GL_PIXEL_PACK_BUFFER, src_params.size_in_bytes, remaining_size, - data.data()); + Memory::GetPointer(dst_params.addr + src_params.size_in_bytes)); } glBindBuffer(GL_PIXEL_PACK_BUFFER, 0); |