[Bf-blender-cvs] [84d67bd0a93] master: Cleanup: GPU: Rename GPU_element to GPU_index_buffer

Clément Foucault noreply at git.blender.org
Sun Sep 6 22:15:36 CEST 2020


Commit: 84d67bd0a937e842618ee7843958f3147ba6af58
Author: Clément Foucault
Date:   Sat Sep 5 20:15:56 2020 +0200
Branches: master
https://developer.blender.org/rB84d67bd0a937e842618ee7843958f3147ba6af58

Cleanup: GPU: Rename GPU_element to GPU_index_buffer

Makes it follow the functions names.

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

M	source/blender/gpu/CMakeLists.txt
M	source/blender/gpu/GPU_batch.h
R099	source/blender/gpu/GPU_element.h	source/blender/gpu/GPU_index_buffer.h
R099	source/blender/gpu/intern/gpu_element.cc	source/blender/gpu/intern/gpu_index_buffer.cc
M	source/blender/python/gpu/gpu_py_element.c

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

diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 5e126d097b4..c8a827a993d 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -63,11 +63,11 @@ set(SRC
   intern/gpu_context.cc
   intern/gpu_debug.cc
   intern/gpu_drawlist.cc
-  intern/gpu_element.cc
   intern/gpu_extensions.cc
   intern/gpu_framebuffer.cc
   intern/gpu_immediate.cc
   intern/gpu_immediate_util.c
+  intern/gpu_index_buffer.cc
   intern/gpu_init_exit.c
   intern/gpu_material.c
   intern/gpu_material_library.c
@@ -108,12 +108,12 @@ set(SRC
   GPU_context.h
   GPU_debug.h
   GPU_drawlist.h
-  GPU_element.h
   GPU_extensions.h
   GPU_framebuffer.h
   GPU_glew.h
   GPU_immediate.h
   GPU_immediate_util.h
+  GPU_index_buffer.h
   GPU_init_exit.h
   GPU_legacy_stubs.h
   GPU_material.h
diff --git a/source/blender/gpu/GPU_batch.h b/source/blender/gpu/GPU_batch.h
index f26f706d058..23a004c3ef6 100644
--- a/source/blender/gpu/GPU_batch.h
+++ b/source/blender/gpu/GPU_batch.h
@@ -28,7 +28,7 @@
 
 #include "BLI_utildefines.h"
 
-#include "GPU_element.h"
+#include "GPU_index_buffer.h"
 #include "GPU_shader.h"
 #include "GPU_vertex_buffer.h"
 
diff --git a/source/blender/gpu/GPU_element.h b/source/blender/gpu/GPU_index_buffer.h
similarity index 99%
rename from source/blender/gpu/GPU_element.h
rename to source/blender/gpu/GPU_index_buffer.h
index 8872080003c..b966eabefae 100644
--- a/source/blender/gpu/GPU_element.h
+++ b/source/blender/gpu/GPU_index_buffer.h
@@ -20,7 +20,7 @@
 /** \file
  * \ingroup gpu
  *
- * GPU element list (AKA index buffer)
+ * GPU index buffer
  */
 
 #pragma once
diff --git a/source/blender/gpu/intern/gpu_element.cc b/source/blender/gpu/intern/gpu_index_buffer.cc
similarity index 99%
rename from source/blender/gpu/intern/gpu_element.cc
rename to source/blender/gpu/intern/gpu_index_buffer.cc
index 29c95c725fd..832c5dc76b2 100644
--- a/source/blender/gpu/intern/gpu_element.cc
+++ b/source/blender/gpu/intern/gpu_index_buffer.cc
@@ -25,8 +25,8 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "GPU_element.h"
 #include "GPU_glew.h"
+#include "GPU_index_buffer.h"
 
 #include "gpu_context_private.hh"
 
diff --git a/source/blender/python/gpu/gpu_py_element.c b/source/blender/python/gpu/gpu_py_element.c
index b9d87f57e9d..c863c9a586f 100644
--- a/source/blender/python/gpu/gpu_py_element.c
+++ b/source/blender/python/gpu/gpu_py_element.c
@@ -23,7 +23,7 @@
 
 #include <Python.h>
 
-#include "GPU_element.h"
+#include "GPU_index_buffer.h"
 
 #include "BLI_math.h"



More information about the Bf-blender-cvs mailing list