diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-06-28 02:37:44 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-28 02:37:44 +0300 |
commit | dbaa6c2aa26cc9a045f5621c9def8ca7cf5861f0 (patch) | |
tree | 8b966d6d721fba4c1f06d9ddec92a0ecc9fd2761 /source/blender/gpu/intern/gpu_codegen.c | |
parent | 2ed82d2e6bb6d7887e4a07ad9600b7b579a74a38 (diff) |
GPU: GPU_generate_pass_new now takes vertex-attrs
Needed so we can tell which custom-data layers to use from the mesh.
Diffstat (limited to 'source/blender/gpu/intern/gpu_codegen.c')
-rw-r--r-- | source/blender/gpu/intern/gpu_codegen.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index 1f0f5e375ce..8586ee67d5d 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -1846,9 +1846,11 @@ static void gpu_nodes_prune(ListBase *nodes, GPUNodeLink *outlink) } } -GPUPass *GPU_generate_pass_new(ListBase *nodes, struct GPUNodeLink *frag_outlink, - const char *vert_code, const char *geom_code, - const char *frag_lib, const char *defines) +GPUPass *GPU_generate_pass_new( + ListBase *nodes, struct GPUNodeLink *frag_outlink, + GPUVertexAttribs *attribs, + const char *vert_code, const char *geom_code, + const char *frag_lib, const char *defines) { GPUShader *shader; GPUPass *pass; @@ -1858,9 +1860,7 @@ GPUPass *GPU_generate_pass_new(ListBase *nodes, struct GPUNodeLink *frag_outlink /* prune unused nodes */ gpu_nodes_prune(nodes, frag_outlink); - /* Hacky */ - GPUVertexAttribs attribs; - gpu_nodes_get_vertex_attributes(nodes, &attribs); + gpu_nodes_get_vertex_attributes(nodes, attribs); /* generate code and compile with opengl */ fragmentgen = code_generate_fragment(nodes, frag_outlink->output, true); |