diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-02-14 12:47:20 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-02-15 23:09:29 +0300 |
| commit | 322dc723165a705c34df1e3246e500da1a9927de (patch) | |
| tree | d82e780e36c89b327d58aa2b8ee215ee8a9fd514 /source/blender/gpu/intern/gpu_node_graph.h | |
| parent | 007f1b74a67302fb4c164eb26969419434a98aee (diff) | |
Cleanup: refactor GPU material attribute and texture requests
Diffstat (limited to 'source/blender/gpu/intern/gpu_node_graph.h')
| -rw-r--r-- | source/blender/gpu/intern/gpu_node_graph.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/gpu/intern/gpu_node_graph.h b/source/blender/gpu/intern/gpu_node_graph.h index 51e188e3f5e..2ffde8dba39 100644 --- a/source/blender/gpu/intern/gpu_node_graph.h +++ b/source/blender/gpu/intern/gpu_node_graph.h @@ -83,7 +83,7 @@ struct GPUNodeLink { /* GPU_NODE_LINK_BUILTIN */ eGPUBuiltin builtin; /* GPU_NODE_LINK_COLORBAND */ - struct GPUTexture **coba; + struct GPUTexture **colorband; /* GPU_NODE_LINK_OUTPUT */ struct GPUOutput *output; /* GPU_NODE_LINK_ATTR */ @@ -129,12 +129,12 @@ typedef struct GPUInput { eGPUBuiltin builtin; /* builtin uniform */ /* GPU_SOURCE_TEX */ struct { - struct GPUTexture **coba; /* input texture, only set at runtime */ - struct Image *ima; /* image */ - struct ImageUser *iuser; /* image user */ - bool bindtex; /* input is responsible for binding the texture? */ - int texid; /* number for multitexture, starting from zero */ - eGPUType textype; /* texture type (2D, 1D Array ...) */ + struct GPUTexture **colorband; /* input texture, only set at runtime */ + struct Image *ima; /* image */ + struct ImageUser *iuser; /* image user */ + bool bindtex; /* input is responsible for binding the texture? */ + int texid; /* number for multitexture, starting from zero */ + eGPUType textype; /* texture type (2D, 1D Array ...) */ }; /* GPU_SOURCE_ATTR */ struct { @@ -158,15 +158,15 @@ typedef struct GPUNodeGraph { ListBase inputs; GPUNodeLink *outlink; - /* Needed attributes. */ - GPUVertAttrLayers attrs; - int builtins; + /* Requested attributes and textures. */ + ListBase attributes; + ListBase textures; } GPUNodeGraph; /* Node Graph */ void gpu_node_graph_prune_unused(GPUNodeGraph *graph); -void gpu_node_graph_extract_dynamic_inputs(struct GPUShader *shader, GPUNodeGraph *graph); +void gpu_node_graph_free_nodes(GPUNodeGraph *graph); void gpu_node_graph_free(GPUNodeGraph *graph); /* Material calls */ |