diff options
author | Jeroen Bakker <jeroen@blender.org> | 2021-05-26 21:32:05 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2021-05-26 21:32:05 +0300 |
commit | 2c607ec2f6b9df98da5150ca49e4405385dd4e27 (patch) | |
tree | ced69bddf1e755419aed95a4d2e9833616c079ae /source/blender/draw/intern/draw_manager_data.c | |
parent | 7438f0c6c0513dec73c0b91e62c5fc52bbcde3dd (diff) |
Revert "DrawManager: Use Compute Shader to Update Hair."
This reverts commit 8f9599d17e80254928d2d72081a4c7e0dee64038.
Mac seems to have an error with this change.
```
ERROR: /Users/blender/git/blender-vdev/blender.git/source/blender/draw/intern/draw_hair.c:115:44: error: use of undeclared identifier 'shader_src'
ERROR: /Users/blender/git/blender-vdev/blender.git/source/blender/draw/intern/draw_hair.c:123:13: error: use of undeclared identifier 'shader_src'
ERROR: make[2]: *** [source/blender/draw/CMakeFiles/bf_draw.dir/intern/draw_hair.c.o] Error 1
ERROR: make[1]: *** [source/blender/draw/CMakeFiles/bf_draw.dir/all] Error 2
ERROR: make: *** [all] Error 2
```
Diffstat (limited to 'source/blender/draw/intern/draw_manager_data.c')
-rw-r--r-- | source/blender/draw/intern/draw_manager_data.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c index 3b852e7f8c8..6bdc5305fed 100644 --- a/source/blender/draw/intern/draw_manager_data.c +++ b/source/blender/draw/intern/draw_manager_data.c @@ -47,7 +47,6 @@ #endif #include "GPU_buffers.h" -#include "GPU_capabilities.h" #include "GPU_material.h" #include "GPU_uniform_buffer.h" @@ -447,19 +446,6 @@ void DRW_shgroup_uniform_vec4_array_copy(DRWShadingGroup *shgroup, } } -void DRW_shgroup_vertex_buffer(DRWShadingGroup *shgroup, - const char *name, - GPUVertBuf *vertex_buffer) -{ - int location = GPU_shader_get_ssbo(shgroup->shader, name); - if (location == -1) { - BLI_assert(false && "Unable to locate binding of shader storage buffer objects."); - return; - } - drw_shgroup_uniform_create_ex( - shgroup, location, DRW_UNIFORM_VERTEX_BUFFER_AS_STORAGE, vertex_buffer, 0, 0, 1); -} - /** \} */ /* -------------------------------------------------------------------- */ @@ -714,17 +700,6 @@ static void drw_command_draw_intance_range( cmd->inst_count = count; } -static void drw_command_compute(DRWShadingGroup *shgroup, - int groups_x_len, - int groups_y_len, - int groups_z_len) -{ - DRWCommandCompute *cmd = drw_command_create(shgroup, DRW_CMD_COMPUTE); - cmd->groups_x_len = groups_x_len; - cmd->groups_y_len = groups_y_len; - cmd->groups_z_len = groups_z_len; -} - static void drw_command_draw_procedural(DRWShadingGroup *shgroup, GPUBatch *batch, DRWResourceHandle handle, @@ -840,17 +815,6 @@ void DRW_shgroup_call_instance_range( drw_command_draw_intance_range(shgroup, geom, handle, i_sta, i_ct); } -void DRW_shgroup_call_compute(DRWShadingGroup *shgroup, - int groups_x_len, - int groups_y_len, - int groups_z_len) -{ - BLI_assert(groups_x_len > 0 && groups_y_len > 0 && groups_z_len > 0); - BLI_assert(GPU_compute_shader_support()); - - drw_command_compute(shgroup, groups_x_len, groups_y_len, groups_z_len); -} - static void drw_shgroup_call_procedural_add_ex(DRWShadingGroup *shgroup, GPUBatch *geom, Object *ob, |