FF7: Enable cached animated textures

Load them once per cycle and re-use them in the same scene, until the engine decides to unload the entire texture and all its animated states.
Additionally bump vcpkg ffmpeg port version.

Author: julianxhokaxhiu

src/common.cpp

@@ -1047,10 +1047,22 @@ void common_unload_texture(struct texture_set *texture_set)
 	if(!VREF(texture_set, ogl.gl_set)) return;
 
 	for (uint32_t idx = 0; idx < VREF(texture_set, ogl.gl_set->textures); idx++)
+	{
+		if (VREF(texture_set, ogl.gl_set->is_animated))
+		{
+			// Destroy animated textures
+			for(std::map<uint64_t,uint32_t>::iterator it = VREF(texture_set, ogl.gl_set->animated_textures).begin(); it != VREF(texture_set, ogl.gl_set->animated_textures).end(); ++it) {
+				newRenderer.deleteTexture(it->second);
+			}
+			VREF(texture_set, ogl.gl_set->animated_textures).clear();
+		}
+
+		// Destroy original static texture
 		newRenderer.deleteTexture(VREF(texture_set, texturehandle[idx]));
+	}
 
 	external_free(VREF(texture_set, texturehandle));
-	external_free(VREF(texture_set, ogl.gl_set));
+	delete VREF(texture_set, ogl.gl_set);
 
 	VRASS(texture_set, texturehandle, 0);
 	VRASS(texture_set, ogl.gl_set, 0);
@@ -1111,7 +1123,7 @@ uint32_t load_external_texture(void* image_data, uint32_t dataSize, struct textu
 	{
 		if(trace_all || trace_loaders) ffnx_trace("texture file name: %s\n", VREF(tex_header, file.pc_name));
 
-		texture = load_texture(image_data, dataSize, VREF(tex_header, file.pc_name), VREF(tex_header, palette_index), VREFP(texture_set, ogl.width), VREFP(texture_set, ogl.height), gl_set->is_animated);
+		texture = load_texture(image_data, dataSize, VREF(tex_header, file.pc_name), VREF(tex_header, palette_index), VREFP(texture_set, ogl.width), VREFP(texture_set, ogl.height), gl_set);
 
 		if(!_strnicmp(VREF(tex_header, file.pc_name), "world", strlen("world") - 1)) gl_set->force_filter = true;
 
@@ -1139,10 +1151,13 @@ uint32_t load_external_texture(void* image_data, uint32_t dataSize, struct textu
 
 	if(texture)
 	{
-		gl_replace_texture(texture_set, VREF(tex_header, palette_index), texture);
+		if (!gl_set->is_animated)
+		{
+			gl_replace_texture(texture_set, VREF(tex_header, palette_index), texture);
 
-		if(!VREF(texture_set, ogl.external)) stats.external_textures++;
-		VRASS(texture_set, ogl.external, true);
+			if(!VREF(texture_set, ogl.external)) stats.external_textures++;
+			VRASS(texture_set, ogl.external, true);
+		}
 
 		return true;
 	}
@@ -1276,7 +1291,7 @@ struct texture_set *common_load_texture(struct texture_set *_texture_set, struct
 	}
 
 	// allocate space for our private data
-	if(!VREF(texture_set, ogl.gl_set)) VRASS(texture_set, ogl.gl_set, (gl_texture_set*)external_calloc(sizeof(struct gl_texture_set), 1));
+	if(!VREF(texture_set, ogl.gl_set)) VRASS(texture_set, ogl.gl_set, new gl_texture_set());
 
 	// texture handle array may not have been initialized
 	if(!VREF(texture_set, texturehandle))

src/gl.h

@@ -87,6 +87,8 @@ struct gl_texture_set
 	uint32_t force_filter;
 	uint32_t force_zsort;
 	uint32_t is_animated;
+	std::map<uint64_t, uint32_t> animated_textures;
+	uint64_t current_animated_texture;
 	uint32_t is_aspect_ratio_changed;
 };
 

src/gl/texture.cpp

@@ -98,7 +98,14 @@ void gl_bind_texture_set(struct texture_set *_texture_set)
 	{
 		VOBJ(tex_header, tex_header, VREF(texture_set, tex_header));
 
-		gl_set_texture(VREF(texture_set, texturehandle[VREF(tex_header, palette_index)]));
+		struct gl_texture_set* gl_set = VREF(texture_set, ogl.gl_set);
+
+		if (gl_set->is_animated && VREF(texture_set, ogl.external))
+		{
+			gl_set_texture(gl_set->animated_textures[gl_set->current_animated_texture]);
+		}
+		else
+			gl_set_texture(VREF(texture_set, texturehandle[VREF(tex_header, palette_index)]));
 
 		if(VREF(tex_header, version) == FB_TEX_VERSION) current_state.fb_texture = true;
 		else current_state.fb_texture = false;

src/saveload.cpp

@@ -106,11 +106,12 @@ uint32_t load_texture_helper(char* name, uint32_t* width, uint32_t* height, bool
 	return ret;
 }
 
-uint32_t load_texture(void* data, uint32_t dataSize, char* name, uint32_t palette_index, uint32_t* width, uint32_t* height, bool is_animated)
+uint32_t load_texture(void* data, uint32_t dataSize, char* name, uint32_t palette_index, uint32_t* width, uint32_t* height, struct gl_texture_set* gl_set)
 {
 	uint32_t ret = 0;
 	char filename[sizeof(basedir) + 1024]{ 0 };
 	uint64_t hash;
+	bool is_animated = gl_set->is_animated;
 
 	struct stat dummy;
 
@@ -120,6 +121,13 @@ uint32_t load_texture(void* data, uint32_t dataSize, char* name, uint32_t palett
 	{
 		if (is_animated)
 		{
+			if (gl_set->animated_textures.count(hash))
+			{
+				// We already know the texture, return its handler and move on
+				ret = gl_set->animated_textures[hash];
+				break;
+			}
+
 			_snprintf(filename, sizeof(filename), "%s/%s/%s_%02i_%llx.%s", basedir, mod_path.c_str(), name, palette_index, hash, mod_ext[idx].c_str());
 
 			if (stat(filename, &dummy) != 0)
@@ -138,6 +146,8 @@ uint32_t load_texture(void* data, uint32_t dataSize, char* name, uint32_t palett
 
 			if (!ret && trace_all) ffnx_warning("External texture [%s] found but not loaded due to memory limitations.\n", filename);
 
+			if (ret && is_animated ) gl_set->animated_textures[hash] = ret;
+
 			break;
 		}
 		else if (trace_all || show_missing_textures)
@@ -151,7 +161,7 @@ uint32_t load_texture(void* data, uint32_t dataSize, char* name, uint32_t palett
 		if(palette_index != 0)
 		{
 			if(trace_all || show_missing_textures) ffnx_info("No external texture found, falling back to palette 0\n", basedir, mod_path.c_str(), name, palette_index);
-			return load_texture(data, dataSize, name, 0, width, height, false);
+			return load_texture(data, dataSize, name, 0, width, height, gl_set);
 		}
 		else
 		{
@@ -164,5 +174,7 @@ uint32_t load_texture(void* data, uint32_t dataSize, char* name, uint32_t palett
 		if (trace_all) ffnx_trace("Created external texture: %u from %s\n", ret, filename);
 	}
 
+	if (is_animated) gl_set->current_animated_texture = hash;
+
 	return ret;
 }

src/saveload.h

@@ -22,4 +22,4 @@
 #pragma once
 
 void save_texture(void *data, uint32_t dataSize, uint32_t width, uint32_t height, uint32_t palette_index, char *name, bool is_animated);
-uint32_t load_texture(void *data, uint32_t dataSize, char *name, uint32_t palette_index, uint32_t *width, uint32_t *height, bool is_animated);
+uint32_t load_texture(void *data, uint32_t dataSize, char *name, uint32_t palette_index, uint32_t *width, uint32_t *height, struct gl_texture_set* gl_set);

vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "ffnx",
   "version": "1.9.0",
-  "builtin-baseline": "b361c2eefa3966cb7cec45275aff32e90430aaa6",
+  "builtin-baseline": "111220b3cf3311744369425d5c323a0f17941076",
   "dependencies": [
     "bgfx",
     {
@@ -46,7 +46,7 @@
     {
       "name": "ffmpeg",
       "version": "4.4",
-      "port-version": 6
+      "port-version": 9
     },
     {
       "name": "imgui",