From 960ab2ab580b58bd12cedd0052773f7bbed4b62f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Wed, 19 Sep 2018 19:34:00 +0200 Subject: Cleanup: Remove "_new" from GPU_generate_pass_new Not needed anymore since old one has been deleted. --- source/blender/gpu/intern/gpu_codegen.c | 2 +- source/blender/gpu/intern/gpu_codegen.h | 2 +- source/blender/gpu/intern/gpu_material.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender') diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index a7166d4a3ac..2b2bba435b8 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -1670,7 +1670,7 @@ static bool gpu_pass_is_valid(GPUPass *pass) return (pass->compiled == false || pass->shader != NULL); } -GPUPass *GPU_generate_pass_new( +GPUPass *GPU_generate_pass( GPUMaterial *material, GPUNodeLink *frag_outlink, struct GPUVertexAttribs *attribs, diff --git a/source/blender/gpu/intern/gpu_codegen.h b/source/blender/gpu/intern/gpu_codegen.h index a6cb2468f2f..39d946d89a0 100644 --- a/source/blender/gpu/intern/gpu_codegen.h +++ b/source/blender/gpu/intern/gpu_codegen.h @@ -176,7 +176,7 @@ struct GPUPass { typedef struct GPUPass GPUPass; -GPUPass *GPU_generate_pass_new( +GPUPass *GPU_generate_pass( GPUMaterial *material, GPUNodeLink *frag_outlink, struct GPUVertexAttribs *attribs, ListBase *nodes, diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index 0d37dff3f9e..a7eb533d9ef 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -683,7 +683,7 @@ GPUMaterial *GPU_material_from_nodetree( GPU_nodes_prune(&mat->nodes, mat->outlink); GPU_nodes_get_vertex_attributes(&mat->nodes, &mat->attribs); /* Create source code and search pass cache for an already compiled version. */ - mat->pass = GPU_generate_pass_new( + mat->pass = GPU_generate_pass( mat, mat->outlink, &mat->attribs, -- cgit v1.2.3