[Bf-blender-cvs] [c276ef61d4a] master: GPU: Move gpu_immediate.c to C++

[Clément Foucault]

Commit: c276ef61d4ac52d40bbfc3fc82b84ed31fced49e
Author: Clément Foucault
Date:   Sat Jul 25 18:40:54 2020 +0200
Branches: master
https://developer.blender.org/rBc276ef61d4ac52d40bbfc3fc82b84ed31fced49e

GPU: Move gpu_immediate.c to C++

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

M	source/blender/gpu/CMakeLists.txt
R099	source/blender/gpu/intern/gpu_immediate.c	source/blender/gpu/intern/gpu_immediate.cc

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

diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 15f3c05de1c..dce49392e02 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_immediate.c
   intern/gpu_context.cc
   intern/gpu_debug.cc
   intern/gpu_element.cc
   intern/gpu_extensions.cc
   intern/gpu_framebuffer.cc
+  intern/gpu_immediate.cc
   intern/gpu_immediate_util.c
   intern/gpu_init_exit.c
   intern/gpu_material.c
diff --git a/source/blender/gpu/intern/gpu_immediate.c b/source/blender/gpu/intern/gpu_immediate.cc
similarity index 99%
rename from source/blender/gpu/intern/gpu_immediate.c
rename to source/blender/gpu/intern/gpu_immediate.cc
index 4f5cb3fcc91..4780b2dc7b3 100644
--- a/source/blender/gpu/intern/gpu_immediate.c
+++ b/source/blender/gpu/intern/gpu_immediate.cc
@@ -29,6 +29,7 @@
 
 #include "GPU_attr_binding.h"
 #include "GPU_immediate.h"
+#include "GPU_matrix.h"
 #include "GPU_texture.h"
 
 #include "gpu_attr_binding_private.h"
@@ -40,10 +41,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-/* necessary functions from matrix API */
-extern void GPU_matrix_bind(const GPUShaderInterface *);
-extern bool GPU_matrix_dirty_get(void);
-
 typedef struct ImmediateDrawBuffer {
   GLuint vbo_id;
   GLubyte *buffer_data;
@@ -281,7 +278,7 @@ void immBegin(GPUPrimType prim_type, uint vertex_len)
   }
 #endif
 
-  active_buffer->buffer_data = glMapBufferRange(
+  active_buffer->buffer_data = (GLubyte *)glMapBufferRange(
       GL_ARRAY_BUFFER,
       active_buffer->buffer_offset,
       bytes_needed,