mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-13 15:16:16 +00:00
Remove 2d Array Multisampled Textures
These do not exist in the WGSL spec, so removing them. BUG=tint:717 Change-Id: I5eb2280fa2f0c923b67070a9ce4a7d2fc10d365d Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/48460 Auto-Submit: Ryan Harrison <rharrison@chromium.org> Reviewed-by: Antonio Maiorano <amaiorano@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Kokoro: Kokoro <noreply+kokoro@google.com> Commit-Queue: Ben Clayton <bclayton@google.com>
This commit is contained in:
committed by
Commit Bot service account
parent
913a2f4b2a
commit
a32e4f66e5
@@ -324,17 +324,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
|
||||
"textureDimensions",
|
||||
[](ProgramBuilder* b) { return b->ExprList("texture"); },
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kDimensionsMultisampled2dArray,
|
||||
"textureDimensions(t : texture_multisampled_2d_array<f32>)-> "
|
||||
"vec2<i32>",
|
||||
TextureKind::kMultisampled,
|
||||
sem::SamplerKind::kSampler,
|
||||
sem::TextureDimension::k2dArray,
|
||||
TextureDataType::kF32,
|
||||
"textureDimensions",
|
||||
[](ProgramBuilder* b) { return b->ExprList("texture"); },
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kDimensionsDepth2d,
|
||||
"textureDimensions(t : texture_depth_2d) -> vec2<i32>",
|
||||
@@ -525,16 +514,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
|
||||
"textureNumLayers",
|
||||
[](ProgramBuilder* b) { return b->ExprList("texture"); },
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kNumLayersMultisampled2dArray,
|
||||
"textureNumLayers(t : texture_multisampled_2d_array<f32>) -> i32",
|
||||
TextureKind::kMultisampled,
|
||||
sem::SamplerKind::kSampler,
|
||||
sem::TextureDimension::k2dArray,
|
||||
TextureDataType::kF32,
|
||||
"textureNumLayers",
|
||||
[](ProgramBuilder* b) { return b->ExprList("texture"); },
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kNumLayersDepth2dArray,
|
||||
"textureNumLayers(t : texture_depth_2d_array) -> i32",
|
||||
@@ -665,16 +644,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
|
||||
"textureNumSamples",
|
||||
[](ProgramBuilder* b) { return b->ExprList("texture"); },
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kNumSamplesMultisampled2dArray,
|
||||
"textureNumSamples(t : texture_multisampled_2d_array<f32>) -> i32",
|
||||
TextureKind::kMultisampled,
|
||||
sem::SamplerKind::kSampler,
|
||||
sem::TextureDimension::k2dArray,
|
||||
TextureDataType::kF32,
|
||||
"textureNumSamples",
|
||||
[](ProgramBuilder* b) { return b->ExprList("texture"); },
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kSample1dF32,
|
||||
"textureSample(t : texture_1d<f32>,\n"
|
||||
@@ -1888,57 +1857,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
|
||||
3); // sample_index
|
||||
},
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kLoadMultisampled2dArrayF32,
|
||||
"textureLoad(t : texture_multisampled_2d_array<f32>,\n"
|
||||
" coords : vec2<i32>,\n"
|
||||
" array_index : i32,\n"
|
||||
" sample_index : i32) -> vec4<f32>",
|
||||
TextureKind::kMultisampled,
|
||||
sem::TextureDimension::k2dArray,
|
||||
TextureDataType::kF32,
|
||||
"textureLoad",
|
||||
[](ProgramBuilder* b) {
|
||||
return b->ExprList("texture", // t
|
||||
b->vec2<i32>(1, 2), // coords
|
||||
3, // array_index
|
||||
4); // sample_index
|
||||
},
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kLoadMultisampled2dArrayU32,
|
||||
"textureLoad(t : texture_multisampled_2d_array<u32>,\n"
|
||||
" coords : vec2<i32>,\n"
|
||||
" array_index : i32,\n"
|
||||
" sample_index : i32) -> vec4<u32>",
|
||||
TextureKind::kMultisampled,
|
||||
sem::TextureDimension::k2dArray,
|
||||
TextureDataType::kU32,
|
||||
"textureLoad",
|
||||
[](ProgramBuilder* b) {
|
||||
return b->ExprList("texture", // t
|
||||
b->vec2<i32>(1, 2), // coords
|
||||
3, // array_index
|
||||
4); // sample_index
|
||||
},
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kLoadMultisampled2dArrayI32,
|
||||
"textureLoad(t : texture_multisampled_2d_array<i32>,\n"
|
||||
" coords : vec2<i32>,\n"
|
||||
" array_index : i32,\n"
|
||||
" sample_index : i32) -> vec4<i32>",
|
||||
TextureKind::kMultisampled,
|
||||
sem::TextureDimension::k2dArray,
|
||||
TextureDataType::kI32,
|
||||
"textureLoad",
|
||||
[](ProgramBuilder* b) {
|
||||
return b->ExprList("texture", // t
|
||||
b->vec2<i32>(1, 2), // coords
|
||||
3, // array_index
|
||||
4); // sample_index
|
||||
},
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kLoadDepth2dLevelF32,
|
||||
"textureLoad(t : texture_depth_2d,\n"
|
||||
|
||||
@@ -46,7 +46,6 @@ enum class ValidTextureOverload {
|
||||
kDimensionsCubeArray,
|
||||
kDimensionsCubeArrayLevel,
|
||||
kDimensionsMultisampled2d,
|
||||
kDimensionsMultisampled2dArray,
|
||||
kDimensionsDepth2d,
|
||||
kDimensionsDepth2dLevel,
|
||||
kDimensionsDepth2dArray,
|
||||
@@ -65,7 +64,6 @@ enum class ValidTextureOverload {
|
||||
kDimensionsStorageWO3d,
|
||||
kNumLayers2dArray,
|
||||
kNumLayersCubeArray,
|
||||
kNumLayersMultisampled2dArray,
|
||||
kNumLayersDepth2dArray,
|
||||
kNumLayersDepthCubeArray,
|
||||
kNumLayersStorageWO2dArray,
|
||||
@@ -79,7 +77,6 @@ enum class ValidTextureOverload {
|
||||
kNumLevelsDepthCube,
|
||||
kNumLevelsDepthCubeArray,
|
||||
kNumSamplesMultisampled2d,
|
||||
kNumSamplesMultisampled2dArray,
|
||||
kSample1dF32,
|
||||
kSample2dF32,
|
||||
kSample2dOffsetF32,
|
||||
@@ -146,9 +143,6 @@ enum class ValidTextureOverload {
|
||||
kLoadMultisampled2dF32,
|
||||
kLoadMultisampled2dU32,
|
||||
kLoadMultisampled2dI32,
|
||||
kLoadMultisampled2dArrayF32,
|
||||
kLoadMultisampled2dArrayU32,
|
||||
kLoadMultisampled2dArrayI32,
|
||||
kLoadDepth2dLevelF32,
|
||||
kLoadDepth2dArrayLevelF32,
|
||||
kLoadStorageRO1dRgba32float, // Not permutated for all texel formats
|
||||
|
||||
Reference in New Issue
Block a user