Skip to content

Commit

Permalink
WGSL: remove 1d_array textures (#1452)
Browse files Browse the repository at this point in the history
Fixes #1450
  • Loading branch information
dneto0 committed Feb 22, 2021
1 parent e6b6d6a commit 9b8f7c2
Showing 1 changed file with 0 additions and 18 deletions.
18 changes: 0 additions & 18 deletions wgsl/index.bs
Original file line number Diff line number Diff line change
Expand Up @@ -1323,9 +1323,6 @@ The following table lists the correspondence between WGSL texel formats and
`texture_1d<type>`
%1 = OpTypeImage %type 1D 0 0 0 1 Unknown

`texture_1d_array<type>`
%1 = OpTypeImage %type 1D 0 1 0 1 Unknown

`texture_2d<type>`
%1 = OpTypeImage %type 2D 0 0 0 1 Unknown

Expand Down Expand Up @@ -1375,9 +1372,6 @@ TODO(dneto): Move description of the conversion to the builtin function that act
`texture_storage_1d<texel_format>`
// %1 = OpTypeImage sampled_type 1D 0 0 0 2 image_format

`texture_storage_1d_array<texel_format>`
// %1 = OpTypeImage sampled_type 1D 0 1 0 2 image_format

`texture_storage_2d<texel_format>`
// %1 = OpTypeImage sampled_type 2D 0 0 0 2 image_format

Expand Down Expand Up @@ -1468,7 +1462,6 @@ sampler_type

sampled_texture_type
: TEXTURE_1D
| TEXTURE_1D_ARRAY
| TEXTURE_2D
| TEXTURE_2D_ARRAY
| TEXTURE_3D
Expand All @@ -1480,7 +1473,6 @@ multisampled_texture_type

storage_texture_type
: TEXTURE_STORAGE_1D
| TEXTURE_STORAGE_1D_ARRAY
| TEXTURE_STORAGE_2D
| TEXTURE_STORAGE_2D_ARRAY
| TEXTURE_STORAGE_3D
Expand Down Expand Up @@ -4299,15 +4291,13 @@ I've written what an NVIDIA GPU does. See https://github.com/google/amber/pull/
<tr><td>`SAMPLER_COMPARISON`<td>sampler_comparison
<tr><td>`STRUCT`<td>struct
<tr><td>`TEXTURE_1D`<td>texture_1d
<tr><td>`TEXTURE_1D_ARRAY`<td>texture_1d_array
<tr><td>`TEXTURE_2D`<td>texture_2d
<tr><td>`TEXTURE_2D_ARRAY`<td>texture_2d_array
<tr><td>`TEXTURE_3D`<td>texture_3d
<tr><td>`TEXTURE_CUBE`<td>texture_cube
<tr><td>`TEXTURE_CUBE_ARRAY`<td>texture_cube_array
<tr><td>`TEXTURE_MULTISAMPLED_2D`<td>texture_multisampled_2d
<tr><td>`TEXTURE_STORAGE_1D`<td>texture_storage_1d
<tr><td>`TEXTURE_STORAGE_1D_ARRAY`<td>texture_storage_1d_array
<tr><td>`TEXTURE_STORAGE_2D`<td>texture_storage_2d
<tr><td>`TEXTURE_STORAGE_2D_ARRAY`<td>texture_storage_2d_array
<tr><td>`TEXTURE_STORAGE_3D`<td>texture_storage_3d
Expand Down Expand Up @@ -5242,7 +5232,6 @@ Returns the dimensions of a texture, or texture's mip level in texels.

```rust
textureDimensions(t : texture_1d<T>) -> i32
textureDimensions(t : texture_1d_array<T>) -> i32
textureDimensions(t : texture_2d<T>) -> vec2<i32>
textureDimensions(t : texture_2d<T>, level : i32) -> vec2<i32>
textureDimensions(t : texture_2d_array<T>) -> vec2<i32>
Expand All @@ -5264,7 +5253,6 @@ textureDimensions(t : texture_depth_cube, level : i32) -> vec3<i32>
textureDimensions(t : texture_depth_cube_array) -> vec3<i32>
textureDimensions(t : texture_depth_cube_array, level : i32) -> vec3<i32>
textureDimensions(t : texture_storage_1d<F>) -> i32
textureDimensions(t : texture_storage_1d_array<F>) -> i32
textureDimensions(t : texture_storage_2d<F>) -> vec2<i32>
textureDimensions(t : texture_storage_2d_array<F>) -> vec2<i32>
textureDimensions(t : texture_storage_3d<F>) -> vec3<i32>
Expand Down Expand Up @@ -5293,7 +5281,6 @@ Reads a single texel from a texture without sampling or filtering.

```rust
textureLoad(t : texture_1d<T>, coords : i32, level : i32) -> vec4<T>
textureLoad(t : texture_1d_array<T>, coords : i32, array_index : i32, level : i32) -> vec4<T>
textureLoad(t : texture_2d<T>, coords : vec2<i32>, level : i32) -> vec4<T>
textureLoad(t : texture_2d_array<T>, coords : vec2<i32>, array_index : i32, level : i32) -> vec4<T>
textureLoad(t : texture_3d<T>, coords : vec3<i32>, level : i32) -> vec4<T>
Expand All @@ -5302,7 +5289,6 @@ textureLoad(t : texture_multisampled_2d_array<T>, coords : vec2<i32>, array_inde
textureLoad(t : texture_depth_2d, coords : vec2<i32>, level : i32) -> f32
textureLoad(t : texture_depth_2d_array, coords : vec2<i32>, array_index : i32, level : i32) -> f32
textureLoad(t : [[access(read)]] texture_storage_1d<F>, coords : i32) -> vec4<T>
textureLoad(t : [[access(read)]] texture_storage_1d_array<F>, coords : i32, array_index : i32) -> vec4<T>
textureLoad(t : [[access(read)]] texture_storage_2d<F>, coords : vec2<i32>) -> vec4<T>
textureLoad(t : [[access(read)]] texture_storage_2d_array<F>, coords : vec2<i32>, array_index : i32) -> vec4<T>
textureLoad(t : [[access(read)]] texture_storage_3d<F>, coords : vec3<i32>) -> vec4<T>
Expand Down Expand Up @@ -5341,13 +5327,11 @@ If any of the parameters are out of bounds, then zero in all components.
Returns the number of layers (elements) of an array texture.

```rust
textureNumLayers(t : texture_1d_array<T>) -> i32
textureNumLayers(t : texture_2d_array<T>) -> i32
textureNumLayers(t : texture_cube_array<T>) -> i32
textureNumLayers(t : texture_multisampled_2d_array<T>) -> i32
textureNumLayers(t : texture_depth_2d_array) -> i32
textureNumLayers(t : texture_depth_cube_array) -> i32
textureNumLayers(t : texture_storage_1d_array<F>) -> i32
textureNumLayers(t : texture_storage_2d_array<F>) -> i32
```

Expand Down Expand Up @@ -5420,7 +5404,6 @@ Samples a texture.

```rust
textureSample(t : texture_1d<f32>, s : sampler, coords : f32) -> vec4<f32>
textureSample(t : texture_1d_array<f32>, s : sampler, coords : f32, array_index : i32) -> vec4<f32>
textureSample(t : texture_2d<f32>, s : sampler, coords : vec2<f32>) -> vec4<f32>
textureSample(t : texture_2d<f32>, s : sampler, coords : vec2<f32>, offset : vec2<i32>) -> vec4<f32>
textureSample(t : texture_2d_array<f32>, s : sampler, coords : vec2<f32>, array_index : i32) -> vec4<f32>
Expand Down Expand Up @@ -5661,7 +5644,6 @@ Writes a single texel to a texture.

```rust
textureStore(t : [[access(write)]] texture_storage_1d<F>, coords : i32, value : vec4<T>) -> void
textureStore(t : [[access(write)]] texture_storage_1d_array<F>, coords : i32, array_index : i32, value : vec4<T>) -> void
textureStore(t : [[access(write)]] texture_storage_2d<F>, coords : vec2<i32>, value : vec4<T>) -> void
textureStore(t : [[access(write)]] texture_storage_2d_array<F>, coords : vec2<i32>, array_index : i32, value : vec4<T>) -> void
textureStore(t : [[access(write)]] texture_storage_3d<F>, coords : vec3<i32>, value : vec4<T>) -> void
Expand Down

0 comments on commit 9b8f7c2

Please sign in to comment.