asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make RID_Owner<Texture> threadsafe in TextureStorage for gles3

Browse source
This commit is contained in:
ACB 2024-02-11 13:12:21 +01:00
parent 4e990cd7e5
commit 09d2c09434
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/gles3/storage/texture_storage.h
View file

@ -404,8 +404,8 @@ private:
RID_Owner<CanvasTexture, true> canvas_texture_owner; RID_Owner<CanvasTexture, true> canvas_texture_owner;
/* Texture API */ /* Texture API */
// Textures can be created from threads, so this RID_Owner is thread safe.
mutable RID_Owner<Texture> texture_owner; mutable RID_Owner<Texture, true> texture_owner;
Ref<Image> _get_gl_image_and_format(const Ref<Image> &p_image, Image::Format p_format, Image::Format &r_real_format, GLenum &r_gl_format, GLenum &r_gl_internal_format, GLenum &r_gl_type, bool &r_compressed, bool p_force_decompress) const; Ref<Image> _get_gl_image_and_format(const Ref<Image> &p_image, Image::Format p_format, Image::Format &r_real_format, GLenum &r_gl_format, GLenum &r_gl_internal_format, GLenum &r_gl_type, bool &r_compressed, bool p_force_decompress) const;

2
servers/rendering/renderer_rd/storage_rd/texture_storage.h
View file

@ -172,7 +172,7 @@ private:
void cleanup(); void cleanup();
}; };
//textures can be created from threads, so this RID_Owner is thread safe // Textures can be created from threads, so this RID_Owner is thread safe.
mutable RID_Owner<Texture, true> texture_owner; mutable RID_Owner<Texture, true> texture_owner;
Texture *get_texture(RID p_rid) { return texture_owner.get_or_null(p_rid); }; Texture *get_texture(RID p_rid) { return texture_owner.get_or_null(p_rid); };