[Bf-blender-cvs] [0f5d15eddb3] tmp-drw-callbatching: Cleanup: GPUBatch: rename arguments
Clément Foucault
noreply at git.blender.org
Sat Aug 17 14:50:19 CEST 2019
Commit: 0f5d15eddb3c284caab79f07e2443236500cd290
Author: Clément Foucault
Date: Fri Jun 7 16:55:58 2019 +0200
Branches: tmp-drw-callbatching
https://developer.blender.org/rB0f5d15eddb3c284caab79f07e2443236500cd290
Cleanup: GPUBatch: rename arguments
===================================================================
M source/blender/gpu/intern/gpu_batch.c
===================================================================
diff --git a/source/blender/gpu/intern/gpu_batch.c b/source/blender/gpu/intern/gpu_batch.c
index 80df5e5e3ca..9d24fc6b27e 100644
--- a/source/blender/gpu/intern/gpu_batch.c
+++ b/source/blender/gpu/intern/gpu_batch.c
@@ -40,7 +40,7 @@
#include <stdlib.h>
#include <string.h>
-static void batch_update_program_bindings(GPUBatch *batch, uint v_first);
+static void batch_update_program_bindings(GPUBatch *batch, uint i_first);
void GPU_batch_vao_cache_clear(GPUBatch *batch)
{
@@ -446,16 +446,16 @@ static void create_bindings(GPUVertBuf *verts,
}
}
-static void batch_update_program_bindings(GPUBatch *batch, uint v_first)
+static void batch_update_program_bindings(GPUBatch *batch, uint i_first)
{
/* Reverse order so first vbos have more prevalence (in term of attrib override). */
for (int v = GPU_BATCH_VBO_MAX_LEN - 1; v > -1; --v) {
if (batch->verts[v] != NULL) {
- create_bindings(batch->verts[v], batch->interface, (batch->inst) ? 0 : v_first, false);
+ create_bindings(batch->verts[v], batch->interface, 0, false);
}
}
if (batch->inst) {
- create_bindings(batch->inst, batch->interface, v_first, true);
+ create_bindings(batch->inst, batch->interface, i_first, true);
}
if (batch->elem) {
GPU_indexbuf_use(batch->elem);
More information about the Bf-blender-cvs
mailing list