[Bf-blender-cvs] [9905db5557e] master: GPU: Move gpu_extensions.c to C++

[Clément Foucault]

Commit: 9905db5557e960547144d62f6eac1b993af9ef25
Author: Clément Foucault
Date:   Sat Jul 25 18:39:54 2020 +0200
Branches: master
https://developer.blender.org/rB9905db5557e960547144d62f6eac1b993af9ef25

GPU: Move gpu_extensions.c to C++

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

M	source/blender/gpu/CMakeLists.txt
R098	source/blender/gpu/intern/gpu_extensions.c	source/blender/gpu/intern/gpu_extensions.cc

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

diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index f200ead81a6..9fa4a3d9551 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_extensions.c
   intern/gpu_framebuffer.c
   intern/gpu_immediate.c
   intern/gpu_context.cc
   intern/gpu_debug.cc
   intern/gpu_element.cc
+  intern/gpu_extensions.cc
   intern/gpu_immediate_util.c
   intern/gpu_init_exit.c
   intern/gpu_material.c
diff --git a/source/blender/gpu/intern/gpu_extensions.c b/source/blender/gpu/intern/gpu_extensions.cc
similarity index 98%
rename from source/blender/gpu/intern/gpu_extensions.c
rename to source/blender/gpu/intern/gpu_extensions.cc
index 9aa3becef1d..e35ab93d370 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.cc
@@ -104,7 +104,8 @@ static struct GPUGlobal {
 static void gpu_detect_mip_render_workaround(void)
 {
   int cube_size = 2;
-  float *source_pix = MEM_callocN(sizeof(float) * 4 * 6 * cube_size * cube_size, __func__);
+  float *source_pix = (float *)MEM_callocN(sizeof(float) * 4 * 6 * cube_size * cube_size,
+                                           __func__);
   float clear_color[4] = {1.0f, 0.5f, 0.0f, 0.0f};
 
   GPUTexture *tex = GPU_texture_create_cube(cube_size, GPU_RGBA16F, source_pix, NULL);
@@ -123,7 +124,7 @@ static void gpu_detect_mip_render_workaround(void)
   GPU_framebuffer_restore();
   GPU_framebuffer_free(fb);
 
-  float *data = GPU_texture_read(tex, GPU_DATA_FLOAT, 1);
+  float *data = (float *)GPU_texture_read(tex, GPU_DATA_FLOAT, 1);
   GG.mip_render_workaround = !equals_v4v4(clear_color, data);
 
   MEM_freeN(data);