aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/linker.h
diff options
context:
space:
mode:
Diffstat (limited to 'mesalib/src/glsl/linker.h')
-rw-r--r--mesalib/src/glsl/linker.h51
1 files changed, 49 insertions, 2 deletions
diff --git a/mesalib/src/glsl/linker.h b/mesalib/src/glsl/linker.h
index 67c7f3488..14eb9c1cd 100644
--- a/mesalib/src/glsl/linker.h
+++ b/mesalib/src/glsl/linker.h
@@ -49,6 +49,17 @@ link_cross_validate_uniform_block(void *mem_ctx,
void
link_assign_uniform_block_offsets(struct gl_shader *shader);
+extern bool
+link_uniform_blocks_are_compatible(const gl_uniform_block *a,
+ const gl_uniform_block *b);
+
+extern int
+link_uniform_blocks(void *mem_ctx,
+ struct gl_shader_program *prog,
+ struct gl_shader **shader_list,
+ unsigned num_shaders,
+ struct gl_uniform_block **blocks_ret);
+
/**
* Class for processing all of the leaf fields of an uniform
*
@@ -71,24 +82,60 @@ public:
* \param var The uniform variable that is to be processed
*
* Calls \c ::visit_field for each leaf of the uniform.
+ *
+ * \warning
+ * This entry should only be used with uniform blocks in cases where the
+ * row / column ordering of matrices in the block does not matter. For
+ * example, enumerating the names of members of the block, but not for
+ * determining the offsets of members.
*/
void process(ir_variable *var);
+ /**
+ * Begin processing a uniform of a structured type.
+ *
+ * This flavor of \c process should be used to handle structured types
+ * (i.e., structures, interfaces, or arrays there of) that need special
+ * name handling. A common usage is to handle cases where the block name
+ * (instead of the instance name) is used for an interface block.
+ *
+ * \param type Type that is to be processed, associated with \c name
+ * \param name Base name of the structured uniform being processed
+ *
+ * \note
+ * \c type must be \c GLSL_TYPE_RECORD, \c GLSL_TYPE_INTERFACE, or an array
+ * there of.
+ */
+ void process(const glsl_type *type, const char *name);
+
protected:
/**
* Method invoked for each leaf of the uniform
*
* \param type Type of the field.
* \param name Fully qualified name of the field.
+ * \param row_major For a matrix type, is it stored row-major.
+ */
+ virtual void visit_field(const glsl_type *type, const char *name,
+ bool row_major) = 0;
+
+ /**
+ * Visit a record before visiting its fields
+ *
+ * For structures-of-structures or interfaces-of-structures, this visits
+ * the inner structure before visiting its fields.
+ *
+ * The default implementation does nothing.
*/
- virtual void visit_field(const glsl_type *type, const char *name) = 0;
+ virtual void visit_field(const glsl_struct_field *field);
private:
/**
* \param name_length Length of the current name \b not including the
* terminating \c NUL character.
*/
- void recursion(const glsl_type *t, char **name, size_t name_length);
+ void recursion(const glsl_type *t, char **name, size_t name_length,
+ bool row_major);
};
void