[Bf-blender-cvs] [960ab2ab580] blender2.8: Cleanup: Remove "_new" from GPU_generate_pass_new
Clément Foucault
noreply at git.blender.org
Wed Sep 19 20:02:18 CEST 2018
Commit: 960ab2ab580b58bd12cedd0052773f7bbed4b62f
Author: Clément Foucault
Date: Wed Sep 19 19:34:00 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB960ab2ab580b58bd12cedd0052773f7bbed4b62f
Cleanup: Remove "_new" from GPU_generate_pass_new
Not needed anymore since old one has been deleted.
===================================================================
M source/blender/gpu/intern/gpu_codegen.c
M source/blender/gpu/intern/gpu_codegen.h
M source/blender/gpu/intern/gpu_material.c
===================================================================
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,
More information about the Bf-blender-cvs
mailing list