Rendering: Don't cache image in editor build

Author: beicause

drivers/gles3/storage/texture_storage.cpp

@@ -1004,10 +1004,6 @@ void TextureStorage::texture_2d_update(RID p_texture, const Ref<Image> &p_image,
 	Texture *tex = texture_owner.get_or_null(p_texture);
 	ERR_FAIL_NULL(tex);
 	GLES3::Utilities::get_singleton()->texture_resize_data(tex->tex_id, tex->total_data_size);
-
-#ifdef TOOLS_ENABLED
-	tex->image_cache_2d.unref();
-#endif
 }
 
 void TextureStorage::texture_3d_update(RID p_texture, const Vector<Ref<Image>> &p_data) {
@@ -1084,12 +1080,6 @@ Ref<Image> TextureStorage::texture_2d_get(RID p_texture) const {
 	Texture *texture = texture_owner.get_or_null(p_texture);
 	ERR_FAIL_NULL_V(texture, Ref<Image>());
 
-#ifdef TOOLS_ENABLED
-	if (texture->image_cache_2d.is_valid() && !texture->is_render_target) {
-		return texture->image_cache_2d;
-	}
-#endif
-
 	Ref<Image> image;
 #ifdef GL_API_ENABLED
 	if (RasterizerGLES3::is_gles_over_gl()) {
@@ -1199,12 +1189,6 @@ Ref<Image> TextureStorage::texture_2d_get(RID p_texture) const {
 	}
 #endif // GLES_API_ENABLED
 
-#ifdef TOOLS_ENABLED
-	if (Engine::get_singleton()->is_editor_hint() && !texture->is_render_target) {
-		texture->image_cache_2d = image;
-	}
-#endif
-
 	return image;
 }
 
@@ -1325,12 +1309,6 @@ Vector<Ref<Image>> TextureStorage::texture_3d_get(RID p_texture) const {
 	ERR_FAIL_NULL_V(texture, Vector<Ref<Image>>());
 	ERR_FAIL_COND_V(texture->type != Texture::TYPE_3D, Vector<Ref<Image>>());
 
-#ifdef TOOLS_ENABLED
-	if (!texture->image_cache_3d.is_empty() && !texture->is_render_target) {
-		return texture->image_cache_3d;
-	}
-#endif
-
 	GLuint temp_framebuffer;
 	glGenFramebuffers(1, &temp_framebuffer);
 
@@ -1361,12 +1339,6 @@ Vector<Ref<Image>> TextureStorage::texture_3d_get(RID p_texture) const {
 	glDeleteTextures(1, &temp_color_texture);
 	glDeleteFramebuffers(1, &temp_framebuffer);
 
-#ifdef TOOLS_ENABLED
-	if (Engine::get_singleton()->is_editor_hint() && !texture->is_render_target) {
-		texture->image_cache_3d = ret;
-	}
-#endif
-
 	return ret;
 }
 
@@ -1719,12 +1691,6 @@ void TextureStorage::_texture_set_3d_data(RID p_texture, const Vector<Ref<Image>
 
 	texture->total_data_size = all_data_size;
 	texture->mipmaps = mipmap_level + 1;
-
-#ifdef TOOLS_ENABLED
-	if (Engine::get_singleton()->is_editor_hint() && !texture->is_render_target) {
-		texture->image_cache_3d = images;
-	}
-#endif
 }
 
 void TextureStorage::_texture_set_swizzle(GLES3::Texture *p_texture, Image::Format p_real_format) {

drivers/gles3/storage/texture_storage.h

@@ -191,9 +191,6 @@ struct Texture {
 
 	RenderTarget *render_target = nullptr;
 
-	Ref<Image> image_cache_2d;
-	Vector<Ref<Image>> image_cache_3d;
-
 	bool redraw_if_visible = false;
 
 	RS::TextureDetectCallback detect_3d_callback = nullptr;

servers/rendering/renderer_rd/storage_rd/texture_storage.cpp

@@ -1319,9 +1319,6 @@ void TextureStorage::_texture_2d_update(RID p_texture, const Ref<Image> &p_image
 		ERR_FAIL_INDEX(p_layer, tex->layers);
 	}
 
-#ifdef TOOLS_ENABLED
-	tex->image_cache_2d.unref();
-#endif
 	TextureToRDFormat f;
 	Ref<Image> validated = _validate_texture_format(p_image, f);
 
@@ -1437,11 +1434,6 @@ Ref<Image> TextureStorage::texture_2d_get(RID p_texture) const {
 	Texture *tex = texture_owner.get_or_null(p_texture);
 	ERR_FAIL_NULL_V(tex, Ref<Image>());
 
-#ifdef TOOLS_ENABLED
-	if (tex->image_cache_2d.is_valid() && !tex->is_render_target) {
-		return tex->image_cache_2d;
-	}
-#endif
 	Vector<uint8_t> data = RD::get_singleton()->texture_get_data(tex->rd_texture, 0);
 	ERR_FAIL_COND_V(data.is_empty(), Ref<Image>());
 	Ref<Image> image;
@@ -1482,12 +1474,6 @@ Ref<Image> TextureStorage::texture_2d_get(RID p_texture) const {
 		image->convert(tex->format);
 	}
 
-#ifdef TOOLS_ENABLED
-	if (Engine::get_singleton()->is_editor_hint() && !tex->is_render_target) {
-		tex->image_cache_2d = image;
-	}
-#endif
-
 	return image;
 }
 

servers/rendering/renderer_rd/storage_rd/texture_storage.h

@@ -173,7 +173,6 @@ class TextureStorage : public RendererTextureStorage {
 		bool is_render_target;
 		bool is_proxy;
 
-		Ref<Image> image_cache_2d;
 		String path;
 
 		RID proxy_to;