linker: Refactor intra-stage block compatabililty testing

Also slightly change the compatibility test.  Instead of comparing the
offsets of the block variables, compare the packing mode of the blocks.
Ideally we don't want to assign the offsets until a later stage of
linking.

This is put in a new file called link_uniform_blocks.cpp.  Some new
functions related to uniform blocks are going to live in that file as
well.

Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Carl Worth <[email protected]>
Reviewed-by: Chad Versace <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>

1 files changed, 4 insertions, 0 deletions

diff --git a/src/glsl/linker.h b/src/glsl/linker.h
index 67c7f348859..c8f38444c82 100644
--- a/src/glsl/linker.h
+++ b/src/glsl/linker.h
@@ -49,6 +49,10 @@ 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);
+
 /**
  * Class for processing all of the leaf fields of an uniform
  *