diff options
Diffstat (limited to 'source/blender/draw/intern/DRW_render.h')
| -rw-r--r-- | source/blender/draw/intern/DRW_render.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index 07105757b2c..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); @@ -837,7 +837,7 @@ void DRW_render_viewport_size_set(const int size[2]); /** * Assume a valid GL context is bound (and that the gl_context_mutex has been acquired). * This function only setup DST and execute the given function. - * \warning similar to DRW_render_to_image you cannot use default lists (dfbl & dtxl). + * \warning similar to DRW_render_to_image you cannot use default lists (`dfbl` & `dtxl`). */ void DRW_custom_pipeline(DrawEngineType *draw_engine_type, struct Depsgraph *depsgraph, @@ -850,6 +850,7 @@ void DRW_custom_pipeline(DrawEngineType *draw_engine_type, void DRW_cache_restart(void); /* ViewLayers */ + void *DRW_view_layer_engine_data_get(DrawEngineType *engine_type); void **DRW_view_layer_engine_data_ensure_ex(struct ViewLayer *view_layer, DrawEngineType *engine_type, @@ -858,6 +859,7 @@ void **DRW_view_layer_engine_data_ensure(DrawEngineType *engine_type, void (*callback)(void *storage)); /* DrawData */ + DrawData *DRW_drawdata_get(ID *id, DrawEngineType *engine_type); DrawData *DRW_drawdata_ensure(ID *id, DrawEngineType *engine_type, |