summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2020-02-16 04:10:32 +0100
committerReinUsesLisp <reinuseslisp@airmail.cc>2020-02-16 08:13:27 +0100
commitfd62bdf37745bbddd3fe2824d312c9da7c49a3ca (patch)
tree796fbc3e4e283c7933fcfd7dfd495132da95b351
parentMerge pull request #3401 from FernandoS27/synchronization (diff)
downloadyuzu-fd62bdf37745bbddd3fe2824d312c9da7c49a3ca.tar
yuzu-fd62bdf37745bbddd3fe2824d312c9da7c49a3ca.tar.gz
yuzu-fd62bdf37745bbddd3fe2824d312c9da7c49a3ca.tar.bz2
yuzu-fd62bdf37745bbddd3fe2824d312c9da7c49a3ca.tar.lz
yuzu-fd62bdf37745bbddd3fe2824d312c9da7c49a3ca.tar.xz
yuzu-fd62bdf37745bbddd3fe2824d312c9da7c49a3ca.tar.zst
yuzu-fd62bdf37745bbddd3fe2824d312c9da7c49a3ca.zip
-rw-r--r--src/video_core/renderer_opengl/gl_texture_cache.cpp7
-rw-r--r--src/video_core/texture_cache/surface_base.cpp4
2 files changed, 11 insertions, 0 deletions
diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp
index d4b81cd87..5c1ae1418 100644
--- a/src/video_core/renderer_opengl/gl_texture_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp
@@ -260,6 +260,13 @@ CachedSurface::~CachedSurface() = default;
void CachedSurface::DownloadTexture(std::vector<u8>& staging_buffer) {
MICROPROFILE_SCOPE(OpenGL_Texture_Download);
+ if (params.IsBuffer()) {
+ glGetNamedBufferSubData(texture_buffer.handle, 0,
+ static_cast<GLsizeiptr>(params.GetHostSizeInBytes()),
+ staging_buffer.data());
+ return;
+ }
+
SCOPE_EXIT({ glPixelStorei(GL_PACK_ROW_LENGTH, 0); });
for (u32 level = 0; level < params.emulated_levels; ++level) {
diff --git a/src/video_core/texture_cache/surface_base.cpp b/src/video_core/texture_cache/surface_base.cpp
index 84469b7ba..002df414f 100644
--- a/src/video_core/texture_cache/surface_base.cpp
+++ b/src/video_core/texture_cache/surface_base.cpp
@@ -277,6 +277,10 @@ void SurfaceBaseImpl::FlushBuffer(Tegra::MemoryManager& memory_manager,
SwizzleFunc(MortonSwizzleMode::LinearToMorton, host_ptr, params,
staging_buffer.data() + host_offset, level);
}
+ } else if (params.IsBuffer()) {
+ // Buffers don't have pitch or any fancy layout property. We can just memcpy them to guest
+ // memory.
+ std::memcpy(host_ptr, staging_buffer.data(), guest_memory_size);
} else {
ASSERT(params.target == SurfaceTarget::Texture2D);
ASSERT(params.num_levels == 1);