mirror of
https://github.com/KhronosGroup/glslang
synced 2024-09-19 20:29:54 +00:00
0b66fa3b62
* rework how shader interface block naming rules are handled * Fixes 2136 According to the spec, shader interfaces (uniform blocks, buffer blocks, input blocks, output blocks) all should be matched up via their block names across all compilation units, not instance names. Also, all block names can be re-used between all 4 interface types without conflict. This change makes it so all of these blocks are matched and remapped using block name and not by instance name. Additional the rule that matched uniform and buffer blocks must either be anonymous or named (but not nessearily the same name) is now imposed. * add warning if instance names differ between matched shader interfaces * Add test cases from #2137 which is now fixed as well. * replace some tab characters with spaces * buffer blocks and uniform blocks now share the same block namespace
47 lines
715 B
GLSL
Executable File
47 lines
715 B
GLSL
Executable File
#version 430
|
|
|
|
// OK: different instance names is allowed in other unit
|
|
layout (std140, binding = 1) uniform ColorBlock
|
|
{
|
|
vec4 color1;
|
|
bool b;
|
|
vec4 color2;
|
|
vec4 color3;
|
|
} uColor;
|
|
|
|
// OK: different instance names is allowed in other unit
|
|
layout (std430, binding = 1) buffer BufferBlock
|
|
{
|
|
mat4 p;
|
|
} uBuffer;
|
|
|
|
// OK: different instance names is allowed in other unit
|
|
layout (std140, binding = 0) uniform MatrixBlock
|
|
{
|
|
mat4 uProj;
|
|
mat4 uWorld;
|
|
} uMatrix;
|
|
|
|
// OK, it's allowed for input/output interfaces to
|
|
// be anonymous is one unit and not in another
|
|
out Vertex
|
|
{
|
|
vec4 v1;
|
|
vec4 v2;
|
|
};
|
|
|
|
|
|
in vec4 P;
|
|
|
|
vec4 getColor2()
|
|
{
|
|
return uColor.color2;
|
|
}
|
|
|
|
vec4 getWorld()
|
|
{
|
|
v1 = vec4(1);
|
|
return uMatrix.uWorld * P;
|
|
}
|
|
|