From a674da4eecd25694ff71d30370e64a6a2d8799d8 Mon Sep 17 00:00:00 2001 From: reduz Date: Wed, 9 Sep 2020 12:40:51 -0300 Subject: Implement 3D textures as import and resource format. --- servers/rendering/rendering_server_wrap_mt.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'servers/rendering/rendering_server_wrap_mt.h') diff --git a/servers/rendering/rendering_server_wrap_mt.h b/servers/rendering/rendering_server_wrap_mt.h index a8a56e7d56..372a7269dc 100644 --- a/servers/rendering/rendering_server_wrap_mt.h +++ b/servers/rendering/rendering_server_wrap_mt.h @@ -79,14 +79,14 @@ public: //these go pass-through, as they can be called from any thread virtual RID texture_2d_create(const Ref &p_image) { return rendering_server->texture_2d_create(p_image); } virtual RID texture_2d_layered_create(const Vector> &p_layers, TextureLayeredType p_layered_type) { return rendering_server->texture_2d_layered_create(p_layers, p_layered_type); } - virtual RID texture_3d_create(const Vector> &p_slices) { return rendering_server->texture_3d_create(p_slices); } + virtual RID texture_3d_create(Image::Format p_format, int p_width, int p_height, int p_depth, bool p_mipmaps, const Vector> &p_data) { return rendering_server->texture_3d_create(p_format, p_width, p_height, p_depth, p_mipmaps, p_data); } virtual RID texture_proxy_create(RID p_base) { return rendering_server->texture_proxy_create(p_base); } //goes pass-through virtual void texture_2d_update_immediate(RID p_texture, const Ref &p_image, int p_layer = 0) { rendering_server->texture_2d_update_immediate(p_texture, p_image, p_layer); } //these go through command queue if they are in another thread FUNC3(texture_2d_update, RID, const Ref &, int) - FUNC4(texture_3d_update, RID, const Ref &, int, int) + FUNC2(texture_3d_update, RID, const Vector> &) FUNC2(texture_proxy_update, RID, RID) //these also go pass-through @@ -96,7 +96,7 @@ public: FUNC1RC(Ref, texture_2d_get, RID) FUNC2RC(Ref, texture_2d_layer_get, RID, int) - FUNC3RC(Ref, texture_3d_slice_get, RID, int, int) + FUNC1RC(Vector>, texture_3d_get, RID) FUNC2(texture_replace, RID, RID) -- cgit v1.2.3