From 2d38ff67d339ce9847c94fb238b0c876ee90b727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Thu, 30 Jul 2020 17:01:13 +0200 Subject: GPU: Fix compilation error --- source/blender/draw/intern/DRW_render.h | 16 ++++++++-------- source/blender/draw/intern/draw_manager_shader.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'source/blender/draw/intern') 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) { -- cgit v1.2.3