Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2022-06-08 22:05:55 +0300
committerClément Foucault <foucault.clem@gmail.com>2022-06-28 19:48:38 +0300
commitfde7d390517b30d4afacc2093ccaa50e9e914b8d (patch)
tree8cd2af6f9944b60da8a0179fc255d5911c9e3992
parentabfa09752f5c4d1fa2ae9df5e4ee0c9d77b50f3e (diff)
Cleanup: DRW: Fix misnamed argument and add more info in a function doc
-rw-r--r--source/blender/draw/intern/DRW_gpu_wrapper.hh1
-rw-r--r--source/blender/draw/intern/DRW_render.h16
2 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/draw/intern/DRW_gpu_wrapper.hh b/source/blender/draw/intern/DRW_gpu_wrapper.hh
index 257f01a5562..8e61c25be71 100644
--- a/source/blender/draw/intern/DRW_gpu_wrapper.hh
+++ b/source/blender/draw/intern/DRW_gpu_wrapper.hh
@@ -558,6 +558,7 @@ class Texture : NonCopyable {
/**
* Ensure the availability of mipmap views.
* Layer views covers all layers of array textures.
+ * Returns true if the views were (re)created.
*/
bool ensure_layer_views(bool cube_as_array = false)
{
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index fa4a1d93d3e..bb913c53500 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -639,10 +639,10 @@ void DRW_shgroup_buffer_texture_ref(DRWShadingGroup *shgroup,
DRW_shgroup_uniform_block_ex(shgroup, name, ubo, __FILE__, __LINE__)
# define DRW_shgroup_uniform_block_ref(shgroup, name, ubo) \
DRW_shgroup_uniform_block_ref_ex(shgroup, name, ubo, __FILE__, __LINE__)
-# define DRW_shgroup_storage_block(shgroup, name, ubo) \
- DRW_shgroup_storage_block_ex(shgroup, name, ubo, __FILE__, __LINE__)
-# define DRW_shgroup_storage_block_ref(shgroup, name, ubo) \
- DRW_shgroup_storage_block_ref_ex(shgroup, name, ubo, __FILE__, __LINE__)
+# define DRW_shgroup_storage_block(shgroup, name, ssbo) \
+ DRW_shgroup_storage_block_ex(shgroup, name, ssbo, __FILE__, __LINE__)
+# define DRW_shgroup_storage_block_ref(shgroup, name, ssbo) \
+ DRW_shgroup_storage_block_ref_ex(shgroup, name, ssbo, __FILE__, __LINE__)
#else
# define DRW_shgroup_vertex_buffer(shgroup, name, vert) \
DRW_shgroup_vertex_buffer_ex(shgroup, name, vert)
@@ -652,10 +652,10 @@ void DRW_shgroup_buffer_texture_ref(DRWShadingGroup *shgroup,
DRW_shgroup_uniform_block_ex(shgroup, name, ubo)
# define DRW_shgroup_uniform_block_ref(shgroup, name, ubo) \
DRW_shgroup_uniform_block_ref_ex(shgroup, name, ubo)
-# define DRW_shgroup_storage_block(shgroup, name, ubo) \
- DRW_shgroup_storage_block_ex(shgroup, name, ubo)
-# define DRW_shgroup_storage_block_ref(shgroup, name, ubo) \
- DRW_shgroup_storage_block_ref_ex(shgroup, name, ubo)
+# define DRW_shgroup_storage_block(shgroup, name, ssbo) \
+ DRW_shgroup_storage_block_ex(shgroup, name, ssbo)
+# define DRW_shgroup_storage_block_ref(shgroup, name, ssbo) \
+ DRW_shgroup_storage_block_ref_ex(shgroup, name, ssbo)
#endif
bool DRW_shgroup_is_empty(DRWShadingGroup *shgroup);