nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-11-27 01:03:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

[hlsl-out] Emit row_major qualifier on matrix uniform globals.

Browse Source 
Fixes #1836.
This commit is contained in:
Jim Blandy 2022-04-16 22:22:34 -07:00
parent c942a9011b
commit ef387f73a6
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/back/hlsl/writer.rs
View File

@ -646,6 +646,12 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
if global.space == crate::AddressSpace::Uniform { if global.space == crate::AddressSpace::Uniform {
write!(self.out, " {{ ")?; write!(self.out, " {{ ")?;
// Even though Naga IR matrices are column-major, we must describe
// matrices passed from the CPU as being in row-major order. See
// the module-level comments for details.
if let TypeInner::Matrix { .. } = module.types[global.ty].inner {
write!(self.out, "row_major ")?;
}
self.write_type(module, global.ty)?; self.write_type(module, global.ty)?;
let sub_name = &self.names[&NameKey::GlobalVariable(handle)]; let sub_name = &self.names[&NameKey::GlobalVariable(handle)];
write!(self.out, " {}", sub_name)?; write!(self.out, " {}", sub_name)?;

2
tests/out/hlsl/globals.hlsl
View File

@ -11,7 +11,7 @@ RWByteAddressBuffer alignment : register(u1);
ByteAddressBuffer dummy : register(t2); ByteAddressBuffer dummy : register(t2);
cbuffer float_vecs : register(b3) { float4 float_vecs[20]; } cbuffer float_vecs : register(b3) { float4 float_vecs[20]; }
cbuffer global_vec : register(b4) { float4 global_vec; } cbuffer global_vec : register(b4) { float4 global_vec; }
cbuffer global_mat : register(b5) { float4x4 global_mat; } cbuffer global_mat : register(b5) { row_major float4x4 global_mat; }
void test_msl_packed_vec3_as_arg(float3 arg) void test_msl_packed_vec3_as_arg(float3 arg)
{ {