diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2020-08-10 04:17:35 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2020-08-13 15:20:24 +0300 |
| commit | 9443da6166f58403eab07c7bff9eac55af04f981 (patch) | |
| tree | df90e6ae7b606c3a3dd9de74f55f832dc3cd6491 /source/blender/gpu/intern/gpu_immediate.cc | |
| parent | e0f5f95e66999765df05ddf0e4b5452a34875cf6 (diff) | |
GPUBatch: Merge phase and ownership flags and cleanup there usage
Also add new flags to communicate specific behavior to future backend.
Diffstat (limited to 'source/blender/gpu/intern/gpu_immediate.cc')
| -rw-r--r-- | source/blender/gpu/intern/gpu_immediate.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/intern/gpu_immediate.cc b/source/blender/gpu/intern/gpu_immediate.cc index 08adefc9f12..2d137c2f21c 100644 --- a/source/blender/gpu/intern/gpu_immediate.cc +++ b/source/blender/gpu/intern/gpu_immediate.cc @@ -317,7 +317,7 @@ GPUBatch *immBeginBatch(GPUPrimType prim_type, uint vertex_len) imm.vertex_data = verts->data; imm.batch = GPU_batch_create_ex(prim_type, verts, NULL, GPU_BATCH_OWNS_VBO); - imm.batch->phase = GPU_BATCH_BUILDING; + imm.batch->flag |= GPU_BATCH_BUILDING; return imm.batch; } @@ -419,7 +419,7 @@ void immEnd(void) /* TODO: resize only if vertex count is much smaller */ } GPU_batch_set_shader(imm.batch, imm.bound_program); - imm.batch->phase = GPU_BATCH_READY_TO_DRAW; + imm.batch->flag &= ~GPU_BATCH_BUILDING; imm.batch = NULL; /* don't free, batch belongs to caller */ } else { |