mirror of
https://github.com/KhronosGroup/glslang
synced 2024-11-13 21:50:06 +00:00
a2e7531057
This adds structure splitting, which among other things will enable GS support where input structs are passed, and thus become input arrays of structs in the GS inputs. That is a common GS case. The salient points of this PR are: * Structure splitting has been changed from "always between stages" to "only into the VS and out of the PS". It had previously happened between stages because it's not legal to pass a struct containing a builtin IO variable. * Structs passed between stages are now split into a struct containing ONLY user types, and a collection of loose builtin IO variables, if any. The user-part is passed as a normal struct between stages, which is valid SPIR-V now that the builtin IO is removed. * Internal to the shader, a sanitized struct (with IO qualifiers removed) is used, so that e.g, functions can work unmodified. * If a builtin IO such as Position occurs in an arrayed struct, for example as an input to a GS, the array reference is moved to the split-off loose variable, which is given the array dimension itself. When passing things around inside the shader, such as over a function call, the the original type is used in a sanitized form that removes the builtIn qualifications and makes them temporaries. This means internal function calls do not have to change. However, the type when returned from the shader will be member-wise copied from the internal sanitized one to the external type. The sanitized type is used in variable declarations. When copying split types and unsplit, if a sub-struct contains only user variables, it is copied as a single entity to avoid more AST verbosity. Above strategy arrived at with talks with @johnkslang. This is a big complex change. I'm inclined to leave it as a WIP until it can get some exposure to real world cases.
33 lines
545 B
GLSL
33 lines
545 B
GLSL
// Test passing split structs to functions.
|
|
|
|
struct VS_INPUT
|
|
{
|
|
int x0_in : foo0;
|
|
float4 Pos_in : SV_Position;
|
|
int x1_in : foo1;
|
|
};
|
|
|
|
struct VS_OUTPUT
|
|
{
|
|
int x0_out : foo0;
|
|
float4 Pos_out : SV_Position;
|
|
int x1_out : foo1;
|
|
};
|
|
|
|
void Fn1(VS_INPUT fn1_in, VS_OUTPUT fn1_out) {
|
|
fn1_in.Pos_in + fn1_out.Pos_out;
|
|
}
|
|
|
|
VS_OUTPUT main(VS_INPUT vsin)
|
|
{
|
|
VS_OUTPUT vsout;
|
|
|
|
vsout.x0_out = vsin.x0_in;
|
|
vsout.Pos_out = vsin.Pos_in;
|
|
vsout.x1_out = vsin.x1_in;
|
|
|
|
Fn1(vsin, vsout);
|
|
|
|
return vsout;
|
|
}
|