github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make layout validation optional, disable the struct size check

Browse Source
This commit is contained in:
Dzmitry Malyshau
2021-03-24 16:01:33 -04:00
committed by Dzmitry Malyshau
parent a0b5717fed
commit 06d777b609
5 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/valid/interface.rs
View File

@@ -1,6 +1,6 @@
use super::{
analyzer::{FunctionInfo, GlobalUse},
Disalignment, FunctionError, ModuleInfo, ShaderStages, TypeFlags,
Disalignment, FunctionError, ModuleInfo, ShaderStages, TypeFlags, ValidationFlags,
};
use crate::arena::{Arena, Handle};
@@ -275,10 +275,12 @@ impl super::Validator {
match types[var.ty].inner {
crate::TypeInner::Struct { block: true, .. } => {
if let Err((ty_handle, ref disalignment)) = type_info.storage_layout {
return Err(GlobalVariableError::Alignment(
ty_handle,
disalignment.clone(),
));
if self.flags.contains(ValidationFlags::STRUCT_LAYOUTS) {
return Err(GlobalVariableError::Alignment(
ty_handle,
disalignment.clone(),
));
}
}
}
_ => return Err(GlobalVariableError::InvalidType),
@@ -293,10 +295,12 @@ impl super::Validator {
match types[var.ty].inner {
crate::TypeInner::Struct { block: true, .. } => {
if let Err((ty_handle, ref disalignment)) = type_info.uniform_layout {
return Err(GlobalVariableError::Alignment(
ty_handle,
disalignment.clone(),
));
if self.flags.contains(ValidationFlags::STRUCT_LAYOUTS) {
return Err(GlobalVariableError::Alignment(
ty_handle,
disalignment.clone(),
));
}
}
}
_ => return Err(GlobalVariableError::InvalidType),

5
src/valid/mod.rs
View File

@@ -26,9 +26,14 @@ bitflags::bitflags! {
#[cfg_attr(feature = "serialize", derive(serde::Serialize))]
#[cfg_attr(feature = "deserialize", derive(serde::Deserialize))]
pub struct ValidationFlags: u8 {
/// Expressions.
const EXPRESSIONS = 0x1;
/// Statements and blocks of them.
const BLOCKS = 0x2;
/// Uniformity of control flow for operations that require it.
const CONTROL_FLOW_UNIFORMITY = 0x4;
/// Host-shareable structure layouts.
const STRUCT_LAYOUTS = 0x8;
}
}

17
src/valid/type.rs
View File

@@ -209,19 +209,19 @@ impl super::Validator {
}
}
let effective_alignment = match stride {
let effective_stride = match stride {
Some(stride) => stride.get(),
None => base_layout.size,
};
let uniform_layout =
if effective_alignment & UNIFORM_LAYOUT_ALIGNMENT_MASK == 0 {
if effective_stride & UNIFORM_LAYOUT_ALIGNMENT_MASK == 0 {
base_info.uniform_layout.clone()
} else {
Err((
handle,
Disalignment::ArrayStride {
stride: effective_alignment,
alignment: effective_alignment,
stride: effective_stride,
alignment: UNIFORM_LAYOUT_ALIGNMENT_MASK + 1,
},
))
};
@@ -295,12 +295,17 @@ impl super::Validator {
storage_layout = storage_layout.or_else(|_| base_info.storage_layout.clone());
}
if uniform_layout.is_ok() && offset % UNIFORM_LAYOUT_ALIGNMENT_MASK == 0 {
// disabled temporarily, see https://github.com/gpuweb/gpuweb/issues/1558
const CHECK_STRUCT_SIZE: bool = false;
if CHECK_STRUCT_SIZE
&& uniform_layout.is_ok()
&& offset & UNIFORM_LAYOUT_ALIGNMENT_MASK != 0
{
uniform_layout = Err((
handle,
Disalignment::StructSize {
size: offset,
alignment: UNIFORM_LAYOUT_ALIGNMENT_MASK,
alignment: UNIFORM_LAYOUT_ALIGNMENT_MASK + 1,
},
));
}

4
tests/out/collatz.info.ron.snap
View File

@@ -6,7 +6,7 @@ expression: output
functions: [
(
flags: (
bits: 7,
bits: 15,
),
available_stages: (
bits: 7,
@@ -351,7 +351,7 @@ expression: output
entry_points: [
(
flags: (
bits: 7,
bits: 15,
),
available_stages: (
bits: 7,

6
tests/out/shadow.info.ron.snap
View File

@@ -6,7 +6,7 @@ expression: output
functions: [
(
flags: (
bits: 7,
bits: 15,
),
available_stages: (
bits: 7,
@@ -1007,7 +1007,7 @@ expression: output
),
(
flags: (
bits: 7,
bits: 15,
),
available_stages: (
bits: 7,
@@ -2638,7 +2638,7 @@ expression: output
entry_points: [
(
flags: (
bits: 7,
bits: 15,
),
available_stages: (
bits: 7,