diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2020-09-09 14:40:22 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-09 14:40:22 -0300 |
| commit | 1ce46f2a3f81e2395767a693b773adce7758d048 (patch) | |
| tree | ad133b936eddbe72b263c8dec5b49f25b342e6df /servers/rendering/rendering_server_wrap_mt.h | |
| parent | 62d4fe60c10d3057ef9f4cd9e8d8f1190b29770c (diff) | |
| parent | a674da4eecd25694ff71d30370e64a6a2d8799d8 (diff) | |
Merge pull request #41918 from reduz/implement-3d-textures
Implement 3D textures as import and resource format.
Diffstat (limited to 'servers/rendering/rendering_server_wrap_mt.h')
| -rw-r--r-- | servers/rendering/rendering_server_wrap_mt.h | 6 |
1 files changed, 3 insertions, 3 deletions
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<Image> &p_image) { return rendering_server->texture_2d_create(p_image); } virtual RID texture_2d_layered_create(const Vector<Ref<Image>> &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<Ref<Image>> &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<Ref<Image>> &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<Image> &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<Image> &, int) - FUNC4(texture_3d_update, RID, const Ref<Image> &, int, int) + FUNC2(texture_3d_update, RID, const Vector<Ref<Image>> &) FUNC2(texture_proxy_update, RID, RID) //these also go pass-through @@ -96,7 +96,7 @@ public: FUNC1RC(Ref<Image>, texture_2d_get, RID) FUNC2RC(Ref<Image>, texture_2d_layer_get, RID, int) - FUNC3RC(Ref<Image>, texture_3d_slice_get, RID, int, int) + FUNC1RC(Vector<Ref<Image>>, texture_3d_get, RID) FUNC2(texture_replace, RID, RID) |