mirror of
https://github.com/RPCS3/glslang.git
synced 2025-02-24 12:50:46 +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
41 lines
636 B
GLSL
Executable File
41 lines
636 B
GLSL
Executable File
#version 430
|
|
|
|
// Verify that blocks with different instance names
|
|
// are correctly detected as invalid non-matching blocks
|
|
// when they are matched up by block name
|
|
layout (std140) uniform Block
|
|
{
|
|
mat4 uProj;
|
|
} uD;
|
|
|
|
out Vertex
|
|
{
|
|
vec4 v1;
|
|
} oV;
|
|
|
|
layout (std140) uniform ColorBlock
|
|
{
|
|
vec4 color1;
|
|
} uC;
|
|
|
|
// Error, buffer blocks and uniform blocks share the
|
|
// same namespace for their block name
|
|
layout (std430) buffer ColorBlock
|
|
{
|
|
vec4 color1;
|
|
} uBufC;
|
|
|
|
vec4 getWorld();
|
|
vec4 getColor2();
|
|
|
|
out vec4 oColor;
|
|
|
|
void
|
|
main()
|
|
{
|
|
oColor = uC.color1 * getColor2();
|
|
oV.v1 = uC.color1 + uBufC.color1;
|
|
|
|
gl_Position = uD.uProj * getWorld();
|
|
}
|