diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2021-10-26 23:49:22 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2021-10-26 23:49:22 +0300 |
| commit | e7fedf6dba5fe2ec39260943361915a6b2b8270a (patch) | |
| tree | 1527db695eedb1a92fceee9191a461170e0b67fd /source/blender/gpu/GPU_batch.h | |
| parent | 7d3d09b69c0af677bd363cc009f37fdd1e4a7185 (diff) | |
Revert "Eevee: support accessing custom mesh attributes"
This reverts commit 03013d19d16704672f9db93bc62547651b6a5cb8.
This commit broke the windows build pretty badly and I don't
feel confident landing the fix for this without review.
Will post a possible fix in D12969 and we'll take it from there.
Diffstat (limited to 'source/blender/gpu/GPU_batch.h')
| -rw-r--r-- | source/blender/gpu/GPU_batch.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/gpu/GPU_batch.h b/source/blender/gpu/GPU_batch.h index 911c8cc2e42..018e192bf37 100644 --- a/source/blender/gpu/GPU_batch.h +++ b/source/blender/gpu/GPU_batch.h @@ -32,7 +32,7 @@ #include "GPU_shader.h" #include "GPU_vertex_buffer.h" -#define GPU_BATCH_VBO_MAX_LEN 16 +#define GPU_BATCH_VBO_MAX_LEN 6 #define GPU_BATCH_INST_VBO_MAX_LEN 2 #define GPU_BATCH_VAO_STATIC_LEN 3 #define GPU_BATCH_VAO_DYN_ALLOC_COUNT 16 @@ -54,11 +54,11 @@ typedef enum eGPUBatchFlag { GPU_BATCH_OWNS_INDEX = (GPU_BATCH_OWNS_INST_VBO_MAX << 1), /** Has been initialized. At least one VBO is set. */ - GPU_BATCH_INIT = (1 << 26), + GPU_BATCH_INIT = (1 << 16), /** Batch is initialized but its VBOs are still being populated. (optional) */ - GPU_BATCH_BUILDING = (1 << 26), + GPU_BATCH_BUILDING = (1 << 16), /** Cached data need to be rebuild. (VAO, PSO, ...) */ - GPU_BATCH_DIRTY = (1 << 27), + GPU_BATCH_DIRTY = (1 << 17), } eGPUBatchFlag; #define GPU_BATCH_OWNS_NONE GPU_BATCH_INVALID |