From 0e59291310b324264c311e7b7e7e309f080bd232 Mon Sep 17 00:00:00 2001 From: bunnei Date: Mon, 15 Oct 2018 21:24:34 -0400 Subject: [PATCH] gl_rasterizer_cache: Refactor to only call GetRegionEnd on surface creation. --- .../renderer_opengl/gl_rasterizer_cache.cpp | 32 +++++++++++-------- .../renderer_opengl/gl_rasterizer_cache.h | 7 ++-- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp index 4ba34ebc4..a1f541e75 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp @@ -62,12 +62,12 @@ static std::pair GetASTCBlockSize(PixelFormat format) { } } -void SurfaceParams::InitCacheParameters(Tegra::GPUVAddr gpu_addr) { +void SurfaceParams::InitCacheParameters(Tegra::GPUVAddr gpu_addr_) { auto& memory_manager{Core::System::GetInstance().GPU().MemoryManager()}; - const auto cpu_addr{memory_manager.GpuToCpuAddress(gpu_addr)}; - const auto max_size{memory_manager.GetRegionEnd(gpu_addr) - gpu_addr}; + const auto cpu_addr{memory_manager.GpuToCpuAddress(gpu_addr_)}; addr = cpu_addr ? *cpu_addr : 0; + gpu_addr = gpu_addr_; size_in_bytes = SizeInBytesRaw(); if (IsPixelFormatASTC(pixel_format)) { @@ -76,15 +76,6 @@ void SurfaceParams::InitCacheParameters(Tegra::GPUVAddr gpu_addr) { } else { size_in_bytes_gl = SizeInBytesGL(); } - - // Clamp size to mapped GPU memory region - // TODO(bunnei): Super Mario Odyssey maps a 0x40000 byte region and then uses it for a 0x80000 - // R32F render buffer. We do not yet know if this is a game bug or something else, but this - // check is necessary to prevent flushing from overwriting unmapped memory. - if (size_in_bytes > max_size) { - LOG_ERROR(HW_GPU, "Surface size {} exceeds region size {}", size_in_bytes, max_size); - size_in_bytes = max_size; - } } /*static*/ SurfaceParams SurfaceParams::CreateForTexture( @@ -719,7 +710,8 @@ static void CopySurface(const Surface& src_surface, const Surface& dst_surface, } CachedSurface::CachedSurface(const SurfaceParams& params) - : params(params), gl_target(SurfaceTargetToGL(params.target)) { + : params(params), gl_target(SurfaceTargetToGL(params.target)), + cached_size_in_bytes(params.size_in_bytes) { texture.Create(); const auto& rect{params.GetRect()}; @@ -769,6 +761,18 @@ CachedSurface::CachedSurface(const SurfaceParams& params) VideoCore::LabelGLObject(GL_TEXTURE, texture.handle, params.addr, SurfaceParams::SurfaceTargetName(params.target)); + + // Clamp size to mapped GPU memory region + // TODO(bunnei): Super Mario Odyssey maps a 0x40000 byte region and then uses it for a 0x80000 + // R32F render buffer. We do not yet know if this is a game bug or something else, but this + // check is necessary to prevent flushing from overwriting unmapped memory. + + auto& memory_manager{Core::System::GetInstance().GPU().MemoryManager()}; + const u64 max_size{memory_manager.GetRegionEnd(params.gpu_addr) - params.gpu_addr}; + if (cached_size_in_bytes > max_size) { + LOG_ERROR(HW_GPU, "Surface size {} exceeds region size {}", params.size_in_bytes, max_size); + cached_size_in_bytes = max_size; + } } static void ConvertS8Z24ToZ24S8(std::vector& data, u32 width, u32 height, bool reverse) { @@ -912,7 +916,7 @@ void CachedSurface::FlushGLBuffer() { ASSERT_MSG(!IsPixelFormatASTC(params.pixel_format), "Unimplemented"); // OpenGL temporary buffer needs to be big enough to store raw texture size - gl_buffer.resize(params.size_in_bytes); + gl_buffer.resize(GetSizeInBytes()); const FormatTuple& tuple = GetFormatTuple(params.pixel_format, params.component_type); // Ensure no bad interactions with GL_UNPACK_ALIGNMENT diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.h b/src/video_core/renderer_opengl/gl_rasterizer_cache.h index 843f18cea..39fd7cd75 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer_cache.h +++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.h @@ -783,6 +783,7 @@ struct SurfaceParams { // Parameters used for caching VAddr addr; + Tegra::GPUVAddr gpu_addr; std::size_t size_in_bytes; std::size_t size_in_bytes_gl; @@ -802,7 +803,8 @@ struct SurfaceReserveKey : Common::HashableStruct { static SurfaceReserveKey Create(const OpenGL::SurfaceParams& params) { SurfaceReserveKey res; res.state = params; - res.state.rt = {}; // Ignore rt config in caching + res.state.gpu_addr = {}; // Ignore GPU vaddr in caching + res.state.rt = {}; // Ignore rt config in caching return res; } }; @@ -826,7 +828,7 @@ public: } std::size_t GetSizeInBytes() const { - return params.size_in_bytes; + return cached_size_in_bytes; } void Flush() { @@ -865,6 +867,7 @@ private: std::vector gl_buffer; SurfaceParams params; GLenum gl_target; + std::size_t cached_size_in_bytes; bool dirty = false; };