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

[msl-out] remove min version check on storage address space

Browse Source
This commit is contained in:
teoxoy
2023-09-18 20:11:07 +02:00
committed by Jim Blandy
parent 68ce1ebfa2
commit 0cfd2213cc
49 changed files with 69 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/back/msl/mod.rs
View File

@@ -127,8 +127,6 @@ pub enum Error {
UnsupportedBuiltIn(crate::BuiltIn),
#[error("capability {0:?} is not supported")]
CapabilityNotSupported(crate::valid::Capabilities),
#[error("address space {0:?} is not supported for target MSL version")]
UnsupportedAddressSpace(crate::AddressSpace),
#[error("attribute '{0}' is not supported for target MSL version")]
UnsupportedAttribute(String),
}
@@ -197,7 +195,7 @@ pub struct Options {
impl Default for Options {
fn default() -> Self {
Options {
lang_version: (2, 0),
lang_version: (1, 0),
per_entry_point_map: EntryPointResourceMap::default(),
inline_samplers: Vec::new(),
spirv_cross_compatibility: false,

3
src/back/msl/writer.rs
View File

@@ -3940,9 +3940,6 @@ impl<W: Write> Writer<W> {
let resolved = match var.space {
crate::AddressSpace::PushConstant => options.resolve_push_constants(ep).ok(),
crate::AddressSpace::WorkGroup => None,
crate::AddressSpace::Storage { .. } if options.lang_version < (2, 0) => {
return Err(Error::UnsupportedAddressSpace(var.space))
}
_ => options
.resolve_resource_binding(ep, var.binding.as_ref().unwrap())
.ok(),

2
tests/in/access.param.ron
View File

@@ -5,7 +5,7 @@
adjust_coordinate_space: false,
),
msl: (
lang_version: (2, 0),
lang_version: (1, 2),
per_entry_point_map: {
"foo_vert": (
resources: {

2
tests/in/bitcast.params.ron
View File

@@ -1,6 +1,6 @@
(
msl: (
lang_version: (1, 2),
lang_version: (1, 0),
per_entry_point_map: {
"main": (
resources: {

2
tests/in/boids.param.ron
View File

@@ -5,7 +5,7 @@
adjust_coordinate_space: false,
),
msl: (
lang_version: (2, 0),
lang_version: (1, 0),
per_entry_point_map: {
"main": (
resources: {

8
tests/in/bounds-check-image-restrict.param.ron
View File

@@ -13,4 +13,12 @@
binding_map: { },
zero_initialize_workgroup_memory: true,
),
msl: (
lang_version: (1, 2),
per_entry_point_map: {},
inline_samplers: [],
spirv_cross_compatibility: false,
fake_missing_bindings: true,
zero_initialize_workgroup_memory: true,
),
)

8
tests/in/bounds-check-image-rzsw.param.ron
View File

@@ -13,4 +13,12 @@
binding_map: { },
zero_initialize_workgroup_memory: true,
),
msl: (
lang_version: (1, 2),
per_entry_point_map: {},
inline_samplers: [],
spirv_cross_compatibility: false,
fake_missing_bindings: true,
zero_initialize_workgroup_memory: true,
),
)

18
tests/in/dualsource.param.ron
View File

@@ -1,13 +1,11 @@
(
god_mode: true,
vertex:[
],
fragment:[
(
entry_point:"main",
target_profile:"ps_5_1",
),
],
compute:[
],
msl: (
lang_version: (1, 2),
per_entry_point_map: {},
inline_samplers: [],
spirv_cross_compatibility: false,
fake_missing_bindings: false,
zero_initialize_workgroup_memory: true,
),
)

2
tests/in/padding.param.ron
View File

@@ -5,7 +5,7 @@
adjust_coordinate_space: false,
),
msl: (
lang_version: (2, 0),
lang_version: (1, 0),
per_entry_point_map: {
"vertex": (
resources: {

2
tests/in/resource-binding-map.param.ron
View File

@@ -1,7 +1,7 @@
(
god_mode: true,
msl: (
lang_version: (2, 0),
lang_version: (1, 0),
per_entry_point_map: {
"entry_point_one": (
resources: {

2
tests/in/workgroup-var-init.param.ron
View File

@@ -5,7 +5,7 @@
adjust_coordinate_space: false,
),
msl: (
lang_version: (2, 0),
lang_version: (1, 0),
per_entry_point_map: {
"main": (
resources: {

2
tests/out/msl/access.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.2
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/array-in-ctor.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/array-in-function-return-type.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/atomicOps.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/bitcast.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/boids.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/bounds-check-image-restrict.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.2
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/bounds-check-image-rzsw.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.2
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/bounds-check-restrict.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/bounds-check-zero-atomic.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/bounds-check-zero.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/break-if.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/collatz.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/const-exprs.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/constructors.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/control-flow.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/do-while.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/dualsource.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.2
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/empty-global-name.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/empty.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/fragment-output.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/functions.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

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

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/image.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/interpolate.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/math-functions.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/msl-varyings.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/operators.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/padding.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/policy-mix.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/quad-vert.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/quad.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/resource-binding-map.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/shadow.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/standard.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/texture-arg.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/workgroup-uniform-load.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>

2
tests/out/msl/workgroup-var-init.msl
View File

@@ -1,4 +1,4 @@
// language: metal2.0
// language: metal1.0
#include <metal_stdlib>
#include <simd/simd.h>