[glsl-out] Emit globals of any type, as required by Naga IR. #1823
Conversation
|
Draft because:
|
jimblandy
force-pushed
the
glsl-flexible-global-types
branch
from
0ef61e4 to
4cd8f0a
Compare
| // unsized arrays can only be in storage buffers, for which we use `ByteAddressBuffer` anyway. | ||
| continue; | ||
| } | ||
| if module.types[members.last().unwrap().ty] |
There was a problem hiding this comment.
An empty struct in input shader will break this code? I think it would be better to use if let Some(member) = members.last() ....
There was a problem hiding this comment.
Empty structures are forbidden in WGSL, and I thought the validator enforced this - but it does not. GLSL doesn't allow empty structures either, but SPIR-V does (and Vulkan doesn't seem to add any further restrictions about that).
But for the time being, since we do have empty structs passing through Naga, I'll change this and the other sites.
There was a problem hiding this comment.
Can we avoid unwrap here and return EmptyStruct error instead? In case where validation is disabled (it disabled by default).
There was a problem hiding this comment.
The general stance backends have over panicking is that it's fine if the IR is illegal there are multiple cases where we panic if the IR isn't good, just grep unwrap, if validation isn't enabled it's the responsibility of the user to ensure it's legal, otherwise the behavior may include panics.
There was a problem hiding this comment.
That principle makes sense; I've submitted #1828 to write it down.
jimblandy
force-pushed
the
glsl-flexible-global-types
branch
from
e8a29bb to
cd83790
Compare
Use it in HLSL and GLSL back ends.
No change in behavior. Exhaustive matches aid error detection, and are clearer when the number of match arms isn't excessive.
"Storage qualifier" is the term used in the GLSL ES specification.
Delete `GlobalTypeKind`. Break out `Writer::write_global`'s code into two new functions, `write_simple_global` and `write_interface_block`. This introduces some repeated code, but the way we need to produce interface blocks and normal globals are sufficiently different that I think it's clearer overall to just separate them entirely. Much of the details are handled by their callees. Loosen the interface block code to support arbitrary types.
jimblandy
force-pushed
the
glsl-flexible-global-types
branch
from
cd83790 to
b36b67e
Compare
Fixes #1811.