[Bf-blender-cvs] [a99eb0ca689] blender2.8: GPU: Cleanup: Rename vbo to ibo for index buffers

[Clément Foucault]

Commit: a99eb0ca689c8116964032faf8425cfba16759bc
Author: Clément Foucault
Date:   Sat Dec 8 15:53:23 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBa99eb0ca689c8116964032faf8425cfba16759bc

GPU: Cleanup: Rename vbo to ibo for index buffers

===================================================================

M       source/blender/gpu/GPU_element.h
M       source/blender/gpu/intern/gpu_element.c

===================================================================

diff --git a/source/blender/gpu/GPU_element.h b/source/blender/gpu/GPU_element.h
index 9d2458ef1aa..c16a3d8b4a1 100644
--- a/source/blender/gpu/GPU_element.h
+++ b/source/blender/gpu/GPU_element.h
@@ -53,7 +53,7 @@ typedef struct GPUIndexBuf {
        uint max_index;
        uint base_index;
 #endif
-       uint32_t vbo_id; /* 0 indicates not yet sent to VRAM */
+       uint32_t ibo_id; /* 0 indicates not yet sent to VRAM */
        bool use_prim_restart;
 } GPUIndexBuf;
 
diff --git a/source/blender/gpu/intern/gpu_element.c 
b/source/blender/gpu/intern/gpu_element.c
index b8ce4faabea..5efb193c3ad 100644
--- a/source/blender/gpu/intern/gpu_element.c
+++ b/source/blender/gpu/intern/gpu_element.c
@@ -284,14 +284,14 @@ void GPU_indexbuf_build_in_place(GPUIndexBufBuilder 
*builder, GPUIndexBuf *elem)
        elem->gl_index_type = convert_index_type_to_gl(elem->index_type);
 #endif
 
-       if (elem->vbo_id == 0) {
-               elem->vbo_id = GPU_buf_alloc();
+       if (elem->ibo_id == 0) {
+               elem->ibo_id = GPU_buf_alloc();
        }
        /* send data to GPU */
        /* GL_ELEMENT_ARRAY_BUFFER changes the state of the last VAO bound,
         * so we use the GL_ARRAY_BUFFER here to create a buffer without
         * interfering in the VAO state. */
-       glBindBuffer(GL_ARRAY_BUFFER, elem->vbo_id);
+       glBindBuffer(GL_ARRAY_BUFFER, elem->ibo_id);
        glBufferData(GL_ARRAY_BUFFER, GPU_indexbuf_size_get(elem), 
builder->data, GL_STATIC_DRAW);
 
        /* discard builder (one-time use) */
@@ -302,13 +302,13 @@ void GPU_indexbuf_build_in_place(GPUIndexBufBuilder 
*builder, GPUIndexBuf *elem)
 
 void GPU_indexbuf_use(GPUIndexBuf *elem)
 {
-       glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, elem->vbo_id);
+       glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, elem->ibo_id);
 }
 
 void GPU_indexbuf_discard(GPUIndexBuf *elem)
 {
-       if (elem->vbo_id) {
-               GPU_buf_free(elem->vbo_id);
+       if (elem->ibo_id) {
+               GPU_buf_free(elem->ibo_id);
        }
        MEM_freeN(elem);
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs