[Bf-blender-cvs] [7c3eaffbbdf] master: GPU: Move gpu_element.c to C++
Clément Foucault
noreply at git.blender.org
Sun Jul 26 17:30:03 CEST 2020
Commit: 7c3eaffbbdfdac3308bede9d7036ea5c2ca11851
Author: Clément Foucault
Date: Sat Jul 25 18:39:19 2020 +0200
Branches: master
https://developer.blender.org/rB7c3eaffbbdfdac3308bede9d7036ea5c2ca11851
GPU: Move gpu_element.c to C++
===================================================================
M source/blender/gpu/CMakeLists.txt
R097 source/blender/gpu/intern/gpu_element.c source/blender/gpu/intern/gpu_element.cc
===================================================================
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 8651c299367..f200ead81a6 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -58,12 +58,12 @@ set(SRC
intern/gpu_batch_utils.c
intern/gpu_buffers.c
intern/gpu_codegen.c
- intern/gpu_element.c
intern/gpu_extensions.c
intern/gpu_framebuffer.c
intern/gpu_immediate.c
intern/gpu_context.cc
intern/gpu_debug.cc
+ intern/gpu_element.cc
intern/gpu_immediate_util.c
intern/gpu_init_exit.c
intern/gpu_material.c
diff --git a/source/blender/gpu/intern/gpu_element.c b/source/blender/gpu/intern/gpu_element.cc
similarity index 97%
rename from source/blender/gpu/intern/gpu_element.c
rename to source/blender/gpu/intern/gpu_element.cc
index 036588b4a48..856a9ca515f 100644
--- a/source/blender/gpu/intern/gpu_element.c
+++ b/source/blender/gpu/intern/gpu_element.cc
@@ -86,7 +86,7 @@ void GPU_indexbuf_init_ex(GPUIndexBufBuilder *builder,
builder->max_index_len = index_len;
builder->index_len = 0; // start empty
builder->prim_type = prim_type;
- builder->data = MEM_callocN(builder->max_index_len * sizeof(uint), "GPUIndexBuf data");
+ builder->data = (uint *)MEM_callocN(builder->max_index_len * sizeof(uint), "GPUIndexBuf data");
}
void GPU_indexbuf_init(GPUIndexBufBuilder *builder,
@@ -241,7 +241,7 @@ void GPU_indexbuf_set_tri_restart(GPUIndexBufBuilder *builder, uint elem)
GPUIndexBuf *GPU_indexbuf_create_subrange(GPUIndexBuf *elem_src, uint start, uint length)
{
- GPUIndexBuf *elem = MEM_callocN(sizeof(GPUIndexBuf), "GPUIndexBuf");
+ GPUIndexBuf *elem = (GPUIndexBuf *)MEM_callocN(sizeof(GPUIndexBuf), "GPUIndexBuf");
GPU_indexbuf_create_subrange_in_place(elem, elem_src, start, length);
return elem;
}
@@ -331,7 +331,7 @@ static void squeeze_indices_short(GPUIndexBufBuilder *builder,
GPUIndexBuf *GPU_indexbuf_build(GPUIndexBufBuilder *builder)
{
- GPUIndexBuf *elem = MEM_callocN(sizeof(GPUIndexBuf), "GPUIndexBuf");
+ GPUIndexBuf *elem = (GPUIndexBuf *)MEM_callocN(sizeof(GPUIndexBuf), "GPUIndexBuf");
GPU_indexbuf_build_in_place(builder, elem);
return elem;
}
More information about the Bf-blender-cvs
mailing list