GPUPass: Refactor gpupass caching system to allow fast gpumaterial creation.

This is part of the work needed to refactor the material parameters update.

Now the gpupass cache is polled before adding the gpumaterial to the
deferred compilation queue.

We store gpupasses in a single linked list grouped based on their hashes.
This is not the most efficient way but it can be improved upon later.

1 files changed, 7 insertions, 9 deletions

diff --git a/source/blender/gpu/intern/gpu_codegen.h b/source/blender/gpu/intern/gpu_codegen.h
index 328da36c3de..04bee545a7e 100644
--- a/source/blender/gpu/intern/gpu_codegen.h
+++ b/source/blender/gpu/intern/gpu_codegen.h
@@ -157,33 +157,30 @@ typedef struct GPUInput {
 } GPUInput;
 
 struct GPUPass {
+	struct GPUPass *next;
+
 	struct GPUShader *shader;
 	char *fragmentcode;
 	char *geometrycode;
 	char *vertexcode;
 	char *defines;
-	const char *libcode;
 	unsigned int refcount;       /* Orphaned GPUPasses gets freed by the garbage collector. */
 	uint32_t hash;               /* Identity hash generated from all GLSL code. */
+	bool compiled;               /* Did we already tried to compile the attached GPUShader. */
 };
 
-
 typedef struct GPUPass GPUPass;
 
 GPUPass *GPU_generate_pass_new(
         GPUMaterial *material,
         GPUNodeLink *frag_outlink, struct GPUVertexAttribs *attribs,
-        ListBase *nodes, ListBase *inputs,
+        ListBase *nodes,
         const char *vert_code, const char *geom_code,
         const char *frag_lib, const char *defines);
-GPUPass *GPU_generate_pass(
-        ListBase *nodes, ListBase *inputs, struct GPUNodeLink *outlink,
-        struct GPUVertexAttribs *attribs, int *builtin,
-        const GPUMatType type, const char *name,
-        const bool use_opensubdiv);
 
-struct GPUShader *GPU_pass_shader(GPUPass *pass);
+struct GPUShader *GPU_pass_shader_get(GPUPass *pass);
 
+void GPU_nodes_extract_dynamic_inputs(struct GPUShader *shader, ListBase *inputs, ListBase *nodes);
 void GPU_nodes_get_vertex_attributes(ListBase *nodes, struct GPUVertexAttribs *attribs);
 void GPU_nodes_prune(ListBase *nodes, struct GPUNodeLink *outlink);
 
@@ -191,6 +188,7 @@ void GPU_pass_bind(GPUPass *pass, ListBase *inputs, double time, int mipmap);
 void GPU_pass_update_uniforms(GPUPass *pass, ListBase *inputs);
 void GPU_pass_unbind(GPUPass *pass, ListBase *inputs);
 
+void GPU_pass_compile(GPUPass *pass);
 void GPU_pass_release(GPUPass *pass);
 void GPU_pass_free_nodes(ListBase *nodes);