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.h | |
| 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.h')
| -rw-r--r-- | source/blender/draw/intern/draw_manager.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/source/blender/draw/intern/draw_manager.h b/source/blender/draw/intern/draw_manager.h index d4e22c83798..84bc0327aa2 100644 --- a/source/blender/draw/intern/draw_manager.h +++ b/source/blender/draw/intern/draw_manager.h @@ -187,10 +187,6 @@ typedef enum { DRW_CMD_DRAW_INSTANCE = 2, DRW_CMD_DRAW_INSTANCE_RANGE = 3, DRW_CMD_DRAW_PROCEDURAL = 4, - - /* Compute Commands. */ - DRW_CMD_COMPUTE = 8, - /* Other Commands */ DRW_CMD_CLEAR = 12, DRW_CMD_DRWSTATE = 13, @@ -228,12 +224,6 @@ typedef struct DRWCommandDrawInstanceRange { uint inst_count; } DRWCommandDrawInstanceRange; -typedef struct DRWCommandCompute { - int groups_x_len; - int groups_y_len; - int groups_z_len; -} DRWCommandCompute; - typedef struct DRWCommandDrawProcedural { GPUBatch *batch; DRWResourceHandle handle; @@ -270,7 +260,6 @@ typedef union DRWCommand { DRWCommandDrawInstance instance; DRWCommandDrawInstanceRange instance_range; DRWCommandDrawProcedural procedural; - DRWCommandCompute compute; DRWCommandSetMutableState state; DRWCommandSetStencil stencil; DRWCommandSetSelectID select_id; @@ -285,7 +274,6 @@ struct DRWCallBuffer { }; /** Used by #DRWUniform.type */ -/* TODO(jbakker): rename to DRW_RESOURCE/DRWResourceType. */ typedef enum { DRW_UNIFORM_INT = 0, DRW_UNIFORM_INT_COPY, @@ -298,7 +286,6 @@ typedef enum { DRW_UNIFORM_BLOCK, DRW_UNIFORM_BLOCK_REF, DRW_UNIFORM_TFEEDBACK_TARGET, - DRW_UNIFORM_VERTEX_BUFFER_AS_STORAGE, /** Per drawcall uniforms/UBO */ DRW_UNIFORM_BLOCK_OBMATS, DRW_UNIFORM_BLOCK_OBINFOS, |