Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClément Foucault <foucault.clem@gmail.com>2020-07-30 18:01:13 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-07-30 18:08:23 +0300
commit2d38ff67d339ce9847c94fb238b0c876ee90b727 (patch)
treecdb9b68bd18a8aba4ec0f1f6352044b354ed94cb
parentd7a28b3d1aeb112fbefc03f77a56ad4bdf47b32f (diff)
GPU: Fix compilation error
-rw-r--r--source/blender/draw/intern/DRW_render.h16
-rw-r--r--source/blender/draw/intern/draw_manager_shader.c4
-rw-r--r--source/blender/gpu/GPU_material.h14
-rw-r--r--source/blender/gpu/intern/gpu_material.c2
4 files changed, 18 insertions, 18 deletions
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;