[Bf-blender-cvs] [2d38ff67d33] master: GPU: Fix compilation error

[Clément Foucault]

Commit: 2d38ff67d339ce9847c94fb238b0c876ee90b727
Author: Clément Foucault
Date:   Thu Jul 30 17:01:13 2020 +0200
Branches: master
https://developer.blender.org/rB2d38ff67d339ce9847c94fb238b0c876ee90b727

GPU: Fix compilation error

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

M	source/blender/draw/intern/DRW_render.h
M	source/blender/draw/intern/draw_manager_shader.c
M	source/blender/gpu/GPU_material.h
M	source/blender/gpu/intern/gpu_material.c

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

diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index 3f55cd13a40..3551296cfc3 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -201,12 +201,12 @@ void DRW_uniformbuffer_free(struct GPUUniformBuffer *ubo);
 
 #ifndef __GPU_MATERIAL_H__
 /* FIXME: Meh avoid including all GPUMaterial. */
-typedef void(GPUMaterialEvalCallbackFn)(struct GPUMaterial *mat,
-                                        int options,
-                                        const char **vert_code,
-                                        const char **geom_code,
-                                        const char **frag_lib,
-                                        const char **defines);
+typedef void (*GPUMaterialEvalCallbackFn)(struct GPUMaterial *mat,
+                                          int options,
+                                          const char **vert_code,
+                                          const char **geom_code,
+                                          const char **frag_lib,
+                                          const char **defines);
 #endif
 
 struct GPUShader *DRW_shader_create(const char *vert,
@@ -249,7 +249,7 @@ struct GPUMaterial *DRW_shader_create_from_world(struct Scene *scene,
                                                  const char *frag_lib,
                                                  const char *defines,
                                                  bool deferred,
-                                                 GPUMaterialEvalCallbackFn *callback);
+                                                 GPUMaterialEvalCallbackFn callback);
 struct GPUMaterial *DRW_shader_create_from_material(struct Scene *scene,
                                                     struct Material *ma,
                                                     struct bNodeTree *ntree,
@@ -261,7 +261,7 @@ struct GPUMaterial *DRW_shader_create_from_material(struct Scene *scene,
                                                     const char *frag_lib,
                                                     const char *defines,
                                                     bool deferred,
-                                                    GPUMaterialEvalCallbackFn *callback);
+                                                    GPUMaterialEvalCallbackFn callback);
 void DRW_shader_free(struct GPUShader *shader);
 #define DRW_SHADER_FREE_SAFE(shader) \
   do { \
diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c
index bde08b770b3..fec234c5015 100644
--- a/source/blender/draw/intern/draw_manager_shader.c
+++ b/source/blender/draw/intern/draw_manager_shader.c
@@ -431,7 +431,7 @@ GPUMaterial *DRW_shader_create_from_world(struct Scene *scene,
                                           const char *frag_lib,
                                           const char *defines,
                                           bool deferred,
-                                          GPUMaterialEvalCallbackFn *callback)
+                                          GPUMaterialEvalCallbackFn callback)
 {
   GPUMaterial *mat = NULL;
   if (DRW_state_is_image_render() || !deferred) {
@@ -473,7 +473,7 @@ GPUMaterial *DRW_shader_create_from_material(struct Scene *scene,
                                              const char *frag_lib,
                                              const char *defines,
                                              bool deferred,
-                                             GPUMaterialEvalCallbackFn *callback)
+                                             GPUMaterialEvalCallbackFn callback)
 {
   GPUMaterial *mat = NULL;
   if (DRW_state_is_image_render() || !deferred) {
diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h
index 5adc447e711..7512fac6410 100644
--- a/source/blender/gpu/GPU_material.h
+++ b/source/blender/gpu/GPU_material.h
@@ -138,12 +138,12 @@ typedef enum eGPUMaterialStatus {
   GPU_MAT_SUCCESS,
 } eGPUMaterialStatus;
 
-typedef void(GPUMaterialEvalCallbackFn)(GPUMaterial *mat,
-                                        int options,
-                                        const char **vert_code,
-                                        const char **geom_code,
-                                        const char **frag_lib,
-                                        const char **defines);
+typedef void (*GPUMaterialEvalCallbackFn)(GPUMaterial *mat,
+                                          int options,
+                                          const char **vert_code,
+                                          const char **geom_code,
+                                          const char **frag_lib,
+                                          const char **defines);
 
 GPUNodeLink *GPU_constant(const float *num);
 GPUNodeLink *GPU_uniform(const float *num);
@@ -199,7 +199,7 @@ GPUMaterial *GPU_material_from_nodetree(struct Scene *scene,
                                         const char *frag_lib,
                                         const char *defines,
                                         const char *name,
-                                        GPUMaterialEvalCallbackFn *callback);
+                                        GPUMaterialEvalCallbackFn callback);
 void GPU_material_compile(GPUMaterial *mat);
 void GPU_material_free(struct ListBase *gpumaterial);
 
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c
index 8e98d1934d4..f3477b6f3a4 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -660,7 +660,7 @@ GPUMaterial *GPU_material_from_nodetree(Scene *scene,
                                         const char *frag_lib,
                                         const char *defines,
                                         const char *name,
-                                        GPUMaterialEvalCallbackFn *callback)
+                                        GPUMaterialEvalCallbackFn callback)
 {
   LinkData *link;
   bool has_volume_output, has_surface_output;