From e342f36e027beee84c572dd2f0fa853441076e63 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 1 May 2020 05:33:45 -0400
Subject: [PATCH 1/2] gl_rasterizer_cache: Flatten LoadCustomTexture()
Makes the control flow much nicer to follow, as we don't store to a
local before returning anymore.
---
.../renderer_opengl/gl_rasterizer_cache.cpp | 46 +++++++++----------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
index 040e6e477..42440587b 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
@@ -693,36 +693,36 @@ void CachedSurface::FlushGLBuffer(PAddr flush_start, PAddr flush_end) {
}
bool CachedSurface::LoadCustomTexture(u64 tex_hash, Core::CustomTexInfo& tex_info) {
- bool result = false;
auto& custom_tex_cache = Core::System::GetInstance().CustomTexCache();
const auto& image_interface = Core::System::GetInstance().GetImageInterface();
if (custom_tex_cache.IsTextureCached(tex_hash)) {
tex_info = custom_tex_cache.LookupTexture(tex_hash);
- result = true;
- } else {
- if (custom_tex_cache.CustomTextureExists(tex_hash)) {
- const auto& path_info = custom_tex_cache.LookupTexturePathInfo(tex_hash);
- if (image_interface->DecodePNG(tex_info.tex, tex_info.width, tex_info.height,
- path_info.path)) {
- std::bitset<32> width_bits(tex_info.width);
- std::bitset<32> height_bits(tex_info.height);
- if (width_bits.count() == 1 && height_bits.count() == 1) {
- LOG_DEBUG(Render_OpenGL, "Loaded custom texture from {}", path_info.path);
- Common::FlipRGBA8Texture(tex_info.tex, tex_info.width, tex_info.height);
- custom_tex_cache.CacheTexture(tex_hash, tex_info.tex, tex_info.width,
- tex_info.height);
- result = true;
- } else {
- LOG_ERROR(Render_OpenGL, "Texture {} size is not a power of 2", path_info.path);
- }
- } else {
- LOG_ERROR(Render_OpenGL, "Failed to load custom texture {}", path_info.path);
- }
- }
+ return true;
}
- return result;
+ if (!custom_tex_cache.CustomTextureExists(tex_hash)) {
+ return false;
+ }
+
+ const auto& path_info = custom_tex_cache.LookupTexturePathInfo(tex_hash);
+ if (!image_interface->DecodePNG(tex_info.tex, tex_info.width, tex_info.height,
+ path_info.path)) {
+ LOG_ERROR(Render_OpenGL, "Failed to load custom texture {}", path_info.path);
+ return false;
+ }
+
+ const std::bitset<32> width_bits(tex_info.width);
+ const std::bitset<32> height_bits(tex_info.height);
+ if (width_bits.count() != 1 || height_bits.count() != 1) {
+ LOG_ERROR(Render_OpenGL, "Texture {} size is not a power of 2", path_info.path);
+ return false;
+ }
+
+ LOG_DEBUG(Render_OpenGL, "Loaded custom texture from {}", path_info.path);
+ Common::FlipRGBA8Texture(tex_info.tex, tex_info.width, tex_info.height);
+ custom_tex_cache.CacheTexture(tex_hash, tex_info.tex, tex_info.width, tex_info.height);
+ return true;
}
void CachedSurface::DumpTexture(GLuint target_tex, u64 tex_hash) {
From 59a614a70fd70e9f9ed3fdada9b5c2a30b91431e Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 1 May 2020 05:42:29 -0400
Subject: [PATCH 2/2] gl_rasterizer_cache: Remove unnecessary reference
parameter in LoadCustomTexture()
This is only ever used in a self-referential manner, so we can make use
of the texture info member directly.
---
.../renderer_opengl/gl_rasterizer_cache.cpp | 25 +++++++++++--------
.../renderer_opengl/gl_rasterizer_cache.h | 2 +-
2 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
index 42440587b..f5a0efc39 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.cpp
@@ -692,12 +692,12 @@ void CachedSurface::FlushGLBuffer(PAddr flush_start, PAddr flush_end) {
}
}
-bool CachedSurface::LoadCustomTexture(u64 tex_hash, Core::CustomTexInfo& tex_info) {
+bool CachedSurface::LoadCustomTexture(u64 tex_hash) {
auto& custom_tex_cache = Core::System::GetInstance().CustomTexCache();
const auto& image_interface = Core::System::GetInstance().GetImageInterface();
if (custom_tex_cache.IsTextureCached(tex_hash)) {
- tex_info = custom_tex_cache.LookupTexture(tex_hash);
+ custom_tex_info = custom_tex_cache.LookupTexture(tex_hash);
return true;
}
@@ -706,22 +706,23 @@ bool CachedSurface::LoadCustomTexture(u64 tex_hash, Core::CustomTexInfo& tex_inf
}
const auto& path_info = custom_tex_cache.LookupTexturePathInfo(tex_hash);
- if (!image_interface->DecodePNG(tex_info.tex, tex_info.width, tex_info.height,
- path_info.path)) {
+ if (!image_interface->DecodePNG(custom_tex_info.tex, custom_tex_info.width,
+ custom_tex_info.height, path_info.path)) {
LOG_ERROR(Render_OpenGL, "Failed to load custom texture {}", path_info.path);
return false;
}
- const std::bitset<32> width_bits(tex_info.width);
- const std::bitset<32> height_bits(tex_info.height);
+ const std::bitset<32> width_bits(custom_tex_info.width);
+ const std::bitset<32> height_bits(custom_tex_info.height);
if (width_bits.count() != 1 || height_bits.count() != 1) {
LOG_ERROR(Render_OpenGL, "Texture {} size is not a power of 2", path_info.path);
return false;
}
LOG_DEBUG(Render_OpenGL, "Loaded custom texture from {}", path_info.path);
- Common::FlipRGBA8Texture(tex_info.tex, tex_info.width, tex_info.height);
- custom_tex_cache.CacheTexture(tex_hash, tex_info.tex, tex_info.width, tex_info.height);
+ Common::FlipRGBA8Texture(custom_tex_info.tex, custom_tex_info.width, custom_tex_info.height);
+ custom_tex_cache.CacheTexture(tex_hash, custom_tex_info.tex, custom_tex_info.width,
+ custom_tex_info.height);
return true;
}
@@ -791,11 +792,13 @@ void CachedSurface::UploadGLTexture(Common::Rectangle<u32> rect, GLuint read_fb_
std::string dump_path; // Has to be declared here for logging later
u64 tex_hash = 0;
- if (Settings::values.dump_textures || Settings::values.custom_textures)
+ if (Settings::values.dump_textures || Settings::values.custom_textures) {
tex_hash = Common::ComputeHash64(gl_buffer.data(), gl_buffer.size());
+ }
- if (Settings::values.custom_textures)
- is_custom = LoadCustomTexture(tex_hash, custom_tex_info);
+ if (Settings::values.custom_textures) {
+ is_custom = LoadCustomTexture(tex_hash);
+ }
// Load data from memory to the surface
GLint x0 = static_cast<GLint>(rect.left);
diff --git a/src/video_core/renderer_opengl/gl_rasterizer_cache.h b/src/video_core/renderer_opengl/gl_rasterizer_cache.h
index 673beb449..d28f0a040 100644
--- a/src/video_core/renderer_opengl/gl_rasterizer_cache.h
+++ b/src/video_core/renderer_opengl/gl_rasterizer_cache.h
@@ -184,7 +184,7 @@ struct CachedSurface : SurfaceParams, std::enable_shared_from_this<CachedSurface
void FlushGLBuffer(PAddr flush_start, PAddr flush_end);
// Custom texture loading and dumping
- bool LoadCustomTexture(u64 tex_hash, Core::CustomTexInfo& tex_info);
+ bool LoadCustomTexture(u64 tex_hash);
void DumpTexture(GLuint target_tex, u64 tex_hash);
// Upload/Download data in gl_buffer in/to this surface's texture