mirror of
https://github.com/storytold/wgpu.git
synced 2026-11-22 15:31:03 +01:00
fix(naga): Validate matrix constructors (#9207)
Added column validation in matrix constructors. CTS change webgpu:shader,validation,expression,call,builtin,value_constructor:* 481/483 -> 483/483 (100%)
This commit is contained in:
1 parent
f59124f3f6
commit
93fe05dd35
3 files changed
+15
-19
No files matched your search
@@ -140,7 +140,6 @@ webgpu:shader,validation,expression,call,builtin,unpack4x8snorm:* // 81%, missin
|
||||
webgpu:shader,validation,expression,call,builtin,unpack4x8unorm:* // 81%, missing const eval (#4507)
|
||||
webgpu:shader,validation,expression,call,builtin,unpack4xI8:* // 75%, missing const eval (#4507)
|
||||
webgpu:shader,validation,expression,call,builtin,unpack4xU8:* // 75%, missing const eval (#4507)
|
||||
webgpu:shader,validation,expression,call,builtin,value_constructor:* // 92%, value constructors lack must-use validation + abstract-float matrix validation issues
|
||||
webgpu:shader,validation,expression,early_evaluation:* // 67%, mixed override/runtime composite evaluation
|
||||
webgpu:shader,validation,expression,matrix,* // 99%, #5474, #8868, atomic
|
||||
webgpu:shader,validation,expression,precedence:* // 76%, https://github.com/gfx-rs/wgpu/issues/4536
|
||||
|
||||
+1
-14
@@ -411,20 +411,7 @@ webgpu:shader,validation,expression,call,builtin,textureNumSamples:*
|
||||
fails-if(vulkan) webgpu:shader,validation,expression,call,builtin,textureSampleBaseClampToEdge:*
|
||||
webgpu:shader,validation,expression,call,builtin,textureStore:*
|
||||
webgpu:shader,validation,expression,call,builtin,trunc:*
|
||||
webgpu:shader,validation,expression,call,builtin,value_constructor:array_value:*
|
||||
webgpu:shader,validation,expression,call,builtin,value_constructor:array_zero_value:*
|
||||
webgpu:shader,validation,expression,call,builtin,value_constructor:matrix_zero_value:*
|
||||
webgpu:shader,validation,expression,call,builtin,value_constructor:must_use:ctor="mat4x4";use=true
|
||||
webgpu:shader,validation,expression,call,builtin,value_constructor:partial_eval:*
|
||||
webgpu:shader,validation,expression,call,builtin,value_constructor:scalar_value:*
|
||||
webgpu:shader,validation,expression,call,builtin,value_constructor:scalar_zero_value:*
|
||||
webgpu:shader,validation,expression,call,builtin,value_constructor:struct_value:*
|
||||
webgpu:shader,validation,expression,call,builtin,value_constructor:struct_zero_value:*
|
||||
webgpu:shader,validation,expression,call,builtin,value_constructor:vector_copy:*
|
||||
webgpu:shader,validation,expression,call,builtin,value_constructor:vector_elementwise:*
|
||||
webgpu:shader,validation,expression,call,builtin,value_constructor:vector_mixed:*
|
||||
webgpu:shader,validation,expression,call,builtin,value_constructor:vector_splat:*
|
||||
webgpu:shader,validation,expression,call,builtin,value_constructor:vector_zero_value:*
|
||||
webgpu:shader,validation,expression,call,builtin,value_constructor:*
|
||||
webgpu:shader,validation,expression,call,builtin,workgroupUniformLoad:*
|
||||
webgpu:shader,validation,expression,overload_resolution:*
|
||||
webgpu:shader,validation,extension,clip_distances:*
|
||||
|
||||
@@ -451,7 +451,7 @@ impl<'source> Lowerer<'source, '_> {
|
||||
spans,
|
||||
},
|
||||
Constructor::PartialMatrix { columns, rows },
|
||||
) => {
|
||||
) if components.len() == columns as usize => {
|
||||
let consensus_scalar = ctx
|
||||
.automatic_conversion_consensus(
|
||||
Some(crate::Scalar::ABSTRACT_FLOAT),
|
||||
@@ -460,7 +460,17 @@ impl<'source> Lowerer<'source, '_> {
|
||||
.map_err(|index| {
|
||||
Error::InvalidConstructorComponentType(spans[index], index as i32)
|
||||
})?;
|
||||
ctx.convert_slice_to_common_leaf_scalar(&mut components, consensus_scalar)?;
|
||||
|
||||
let component_ty = crate::TypeInner::Vector {
|
||||
size: rows,
|
||||
scalar: consensus_scalar,
|
||||
};
|
||||
ctx.try_automatic_conversions_slice(
|
||||
&mut components,
|
||||
&Tr::Value(component_ty),
|
||||
ty_span,
|
||||
)?;
|
||||
|
||||
let ty = ctx.ensure_type_exists(crate::TypeInner::Matrix {
|
||||
columns,
|
||||
rows,
|
||||
@@ -475,12 +485,12 @@ impl<'source> Lowerer<'source, '_> {
|
||||
Constructor::Type((
|
||||
ty,
|
||||
&crate::TypeInner::Matrix {
|
||||
columns: _,
|
||||
columns,
|
||||
rows,
|
||||
scalar,
|
||||
},
|
||||
)),
|
||||
) => {
|
||||
) if components.len() == columns as usize => {
|
||||
let component_ty = crate::TypeInner::Vector { size: rows, scalar };
|
||||
ctx.try_automatic_conversions_slice(
|
||||
&mut components,
|
||||
|
||||
Reference in new issue
Block a user