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_exec.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_exec.c')
| -rw-r--r-- | source/blender/draw/intern/draw_manager_exec.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c index f29caebeb84..4c8fcb0e016 100644 --- a/source/blender/draw/intern/draw_manager_exec.c +++ b/source/blender/draw/intern/draw_manager_exec.c @@ -29,7 +29,6 @@ #include "BKE_global.h" -#include "GPU_compute.h" #include "GPU_platform.h" #include "GPU_shader.h" #include "GPU_state.h" @@ -673,9 +672,6 @@ static void draw_update_uniforms(DRWShadingGroup *shgroup, *use_tfeedback = GPU_shader_transform_feedback_enable(shgroup->shader, ((GPUVertBuf *)uni->pvalue)); break; - case DRW_UNIFORM_VERTEX_BUFFER_AS_STORAGE: - GPU_vertbuf_bind_as_ssbo((GPUVertBuf *)uni->pvalue, uni->location); - break; /* Legacy/Fallback support. */ case DRW_UNIFORM_BASE_INSTANCE: state->baseinst_loc = uni->location; @@ -1054,12 +1050,6 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state) cmd->instance_range.inst_count, false); break; - case DRW_CMD_COMPUTE: - GPU_compute_dispatch(shgroup->shader, - cmd->compute.groups_x_len, - cmd->compute.groups_y_len, - cmd->compute.groups_z_len); - break; } } |