archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

GPU: Fix compilation error

Browse Source
This commit is contained in:
Clément Foucault
2020-07-30 17:01:13 +02:00
parent d7a28b3d1a
commit 2d38ff67d3
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/draw/intern/DRW_render.h
View File

@@ -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 { \

4
source/blender/draw/intern/draw_manager_shader.c
View File

@@ -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) {

14
source/blender/gpu/GPU_material.h
View File

@@ -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);

2
source/blender/gpu/intern/gpu_material.c
View File

@@ -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;