OSDN Git Service

glsl linker: compare interface blocks during intrastage linking
authorJordan Justen <jordan.l.justen@intel.com>
Tue, 21 May 2013 06:42:49 +0000 (23:42 -0700)
committerJordan Justen <jordan.l.justen@intel.com>
Thu, 23 May 2013 16:37:12 +0000 (09:37 -0700)
commit4a0bcd90cff6701aaf08d9bbcf6144b18c2d8284
tree99c738535c1bbdfea537cba3c1abbb6e5ec45a65
parentd6863acb9f40fd36eb18e873def31a3b72e0d68a
glsl linker: compare interface blocks during intrastage linking

Verify that interface blocks match when combining compilation
units at the same stage. (For example, when merging all vertex
shaders.)

Fixes piglit glsl-1.50 test:
* linker/interface-blocks-multiple-vs-member-count-mismatch.shader_test

v5 (Ken): Rename to link_interface_blocks.cpp and drop the separate .h
file for consistency with other linker code.  Remove "ok" variable.
Fold cross_validate_interface_blocks into its caller.

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
src/glsl/Makefile.sources
src/glsl/link_interface_blocks.cpp [new file with mode: 0644]
src/glsl/linker.cpp
src/glsl/linker.h