d92de00cc1
This is a fairly fundamental change on how IDs are handled.
It serves many purposes:
- Improve performance. We only need to iterate over IDs which are
relevant at any one time.
- Makes sure we iterate through IDs in SPIR-V module declaration order
rather than ID space. IDs don't have to be monotonically increasing,
which was an assumption SPIRV-Cross used to have. It has apparently
never been a problem until now.
- Support LUTs of structs. We do this by interleaving declaration of
constants and struct types in SPIR-V module order.
To support this, the ParsedIR interface needed to change slightly.
Before setting any ID with variant_set<T> we let ParsedIR know
that an ID with a specific type has been added. The surface for change
should be minimal.
ParsedIR will maintain a per-type list of IDs which the cross-compiler
will need to consider for later.
Instead of looping over ir.ids[] (which can be extremely large), we loop
over types now, using:
ir.for_each_typed_id<SPIRVariable>([&](uint32_t id, SPIRVariable &var) {
handle_variable(var);
});
Now we make sure that we're never looking at irrelevant types.
47 lines
1.1 KiB
GLSL
47 lines
1.1 KiB
GLSL
#ifndef SPIRV_CROSS_CONSTANT_ID_201
|
|
#define SPIRV_CROSS_CONSTANT_ID_201 -10
|
|
#endif
|
|
static const int _7 = SPIRV_CROSS_CONSTANT_ID_201;
|
|
static const int _20 = (_7 + 2);
|
|
#ifndef SPIRV_CROSS_CONSTANT_ID_202
|
|
#define SPIRV_CROSS_CONSTANT_ID_202 100u
|
|
#endif
|
|
static const uint _8 = SPIRV_CROSS_CONSTANT_ID_202;
|
|
static const uint _25 = (_8 % 5u);
|
|
#ifndef SPIRV_CROSS_CONSTANT_ID_0
|
|
#define SPIRV_CROSS_CONSTANT_ID_0 int4(20, 30, _20, _20)
|
|
#endif
|
|
static const int4 _30 = SPIRV_CROSS_CONSTANT_ID_0;
|
|
static const int2 _32 = int2(_30.y, _30.x);
|
|
static const int _33 = _30.y;
|
|
|
|
static float4 gl_Position;
|
|
static int _4;
|
|
|
|
struct SPIRV_Cross_Output
|
|
{
|
|
nointerpolation int _4 : TEXCOORD0;
|
|
float4 gl_Position : SV_Position;
|
|
};
|
|
|
|
void vert_main()
|
|
{
|
|
float4 _63 = 0.0f.xxxx;
|
|
_63.y = float(_20);
|
|
float4 _66 = _63;
|
|
_66.z = float(_25);
|
|
float4 _52 = _66 + float4(_30);
|
|
float2 _56 = _52.xy + float2(_32);
|
|
gl_Position = float4(_56.x, _56.y, _52.z, _52.w);
|
|
_4 = _33;
|
|
}
|
|
|
|
SPIRV_Cross_Output main()
|
|
{
|
|
vert_main();
|
|
SPIRV_Cross_Output stage_output;
|
|
stage_output.gl_Position = gl_Position;
|
|
stage_output._4 = _4;
|
|
return stage_output;
|
|
}
|