mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-09 21:47:47 +00:00
Remove references 1D Array texture dimension
WGSL recently removed this concept, since it didn't exist in WebGPU, so excising it from the code. BUG=tint:515 Change-Id: Ibbca6bd643fd96c2fb10bd33f471c9e9e58de535 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/42320 Auto-Submit: Ryan Harrison <rharrison@chromium.org> Reviewed-by: Ben Clayton <bclayton@google.com> Commit-Queue: Ryan Harrison <rharrison@chromium.org>
This commit is contained in:
Ryan Harrison
committed by
Commit Bot service account
Commit Bot service account
parent
00eb8dfa8b
commit
13dbbc6797
@@ -213,16 +213,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
|
||||
"textureDimensions",
|
||||
[](ProgramBuilder* b) { return b->ExprList("texture"); },
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kDimensions1dArray,
|
||||
"textureDimensions(t : texture_1d_array<f32>) -> i32",
|
||||
TextureKind::kRegular,
|
||||
type::SamplerKind::kSampler,
|
||||
type::TextureDimension::k1dArray,
|
||||
TextureDataType::kF32,
|
||||
"textureDimensions",
|
||||
[](ProgramBuilder* b) { return b->ExprList("texture"); },
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kDimensions2d,
|
||||
"textureDimensions(t : texture_2d<f32>) -> vec2<i32>",
|
||||
@@ -443,17 +433,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
|
||||
"textureDimensions",
|
||||
[](ProgramBuilder* b) { return b->ExprList("texture"); },
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kDimensionsStorageRO1dArray,
|
||||
"textureDimensions(t : texture_storage_1d_array<rgba32float>) -> "
|
||||
"i32",
|
||||
ast::AccessControl::kReadOnly,
|
||||
type::ImageFormat::kRgba32Float,
|
||||
type::TextureDimension::k1dArray,
|
||||
TextureDataType::kF32,
|
||||
"textureDimensions",
|
||||
[](ProgramBuilder* b) { return b->ExprList("texture"); },
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kDimensionsStorageRO2d,
|
||||
"textureDimensions(t : texture_storage_2d<rgba32float>) -> "
|
||||
@@ -497,17 +476,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
|
||||
"textureDimensions",
|
||||
[](ProgramBuilder* b) { return b->ExprList("texture"); },
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kDimensionsStorageWO1dArray,
|
||||
"textureDimensions(t : texture_storage_1d_array<rgba32float>) -> "
|
||||
"i32",
|
||||
ast::AccessControl::kWriteOnly,
|
||||
type::ImageFormat::kRgba32Float,
|
||||
type::TextureDimension::k1dArray,
|
||||
TextureDataType::kF32,
|
||||
"textureDimensions",
|
||||
[](ProgramBuilder* b) { return b->ExprList("texture"); },
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kDimensionsStorageWO2d,
|
||||
"textureDimensions(t : texture_storage_2d<rgba32float>) -> "
|
||||
@@ -541,16 +509,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
|
||||
"textureDimensions",
|
||||
[](ProgramBuilder* b) { return b->ExprList("texture"); },
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kNumLayers1dArray,
|
||||
"textureNumLayers(t : texture_1d_array<f32>) -> i32",
|
||||
TextureKind::kRegular,
|
||||
type::SamplerKind::kSampler,
|
||||
type::TextureDimension::k1dArray,
|
||||
TextureDataType::kF32,
|
||||
"textureNumLayers",
|
||||
[](ProgramBuilder* b) { return b->ExprList("texture"); },
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kNumLayers2dArray,
|
||||
"textureNumLayers(t : texture_2d_array<f32>) -> i32",
|
||||
@@ -601,16 +559,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
|
||||
"textureNumLayers",
|
||||
[](ProgramBuilder* b) { return b->ExprList("texture"); },
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kNumLayersStorageWO1dArray,
|
||||
"textureNumLayers(t : texture_storage_1d_array<rgba32float>) -> i32",
|
||||
ast::AccessControl::kWriteOnly,
|
||||
type::ImageFormat::kRgba32Float,
|
||||
type::TextureDimension::k1dArray,
|
||||
TextureDataType::kF32,
|
||||
"textureNumLayers",
|
||||
[](ProgramBuilder* b) { return b->ExprList("texture"); },
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kNumLayersStorageWO2dArray,
|
||||
"textureNumLayers(t : texture_storage_2d_array<rgba32float>) -> i32",
|
||||
@@ -747,24 +695,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
|
||||
1.0f); // coords
|
||||
},
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kSample1dArrayF32,
|
||||
"textureSample(t : texture_1d_array<f32>,\n"
|
||||
" s : sampler,\n"
|
||||
" coords : f32,\n"
|
||||
" array_index : i32) -> vec4<f32>",
|
||||
TextureKind::kRegular,
|
||||
type::SamplerKind::kSampler,
|
||||
type::TextureDimension::k1dArray,
|
||||
TextureDataType::kF32,
|
||||
"textureSample",
|
||||
[](ProgramBuilder* b) {
|
||||
return b->ExprList("texture", // t
|
||||
"sampler", // s
|
||||
1.0f, // coords
|
||||
2); // array_index
|
||||
},
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kSample2dF32,
|
||||
"textureSample(t : texture_2d<f32>,\n"
|
||||
@@ -1770,51 +1700,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
|
||||
1); // coords
|
||||
},
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kLoad1dArrayF32,
|
||||
"textureLoad(t : texture_1d_array<f32>,\n"
|
||||
" coords : i32,\n"
|
||||
" array_index : i32) -> vec4<f32>",
|
||||
TextureKind::kRegular,
|
||||
type::TextureDimension::k1dArray,
|
||||
TextureDataType::kF32,
|
||||
"textureLoad",
|
||||
[](ProgramBuilder* b) {
|
||||
return b->ExprList("texture", // t
|
||||
1, // coords
|
||||
2); // array_index
|
||||
},
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kLoad1dArrayU32,
|
||||
"textureLoad(t : texture_1d_array<u32>,\n"
|
||||
" coords : i32,\n"
|
||||
" array_index : i32) -> vec4<u32>",
|
||||
TextureKind::kRegular,
|
||||
type::TextureDimension::k1dArray,
|
||||
TextureDataType::kU32,
|
||||
"textureLoad",
|
||||
[](ProgramBuilder* b) {
|
||||
return b->ExprList("texture", // t
|
||||
1, // coords
|
||||
2); // array_index
|
||||
},
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kLoad1dArrayI32,
|
||||
"textureLoad(t : texture_1d_array<i32>,\n"
|
||||
" coords : i32,\n"
|
||||
" array_index : i32) -> vec4<i32>",
|
||||
TextureKind::kRegular,
|
||||
type::TextureDimension::k1dArray,
|
||||
TextureDataType::kI32,
|
||||
"textureLoad",
|
||||
[](ProgramBuilder* b) {
|
||||
return b->ExprList("texture", // t
|
||||
1, // coords
|
||||
2); // array_index
|
||||
},
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kLoad2dF32,
|
||||
"textureLoad(t : texture_2d<f32>,\n"
|
||||
@@ -2249,23 +2134,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
|
||||
1); // coords
|
||||
},
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kLoadStorageRO1dArrayRgba32float,
|
||||
"textureLoad(t : "
|
||||
"texture_storage_1d_array<rgba32float>,\n"
|
||||
" coords : i32,\n"
|
||||
" array_index : i32) -> vec4<f32>",
|
||||
ast::AccessControl::kReadOnly,
|
||||
type::ImageFormat::kRgba32Float,
|
||||
type::TextureDimension::k1dArray,
|
||||
TextureDataType::kF32,
|
||||
"textureLoad",
|
||||
[](ProgramBuilder* b) {
|
||||
return b->ExprList("texture", // t
|
||||
1, // coords
|
||||
2); // array_index
|
||||
},
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kLoadStorageRO2dRgba8unorm,
|
||||
"textureLoad(t : texture_storage_2d<rgba8unorm>,\n"
|
||||
@@ -2537,24 +2405,6 @@ std::vector<TextureOverloadCase> TextureOverloadCase::ValidCases() {
|
||||
b->vec4<f32>(2.f, 3.f, 4.f, 5.f)); // value
|
||||
},
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kStoreWO1dArrayRgba32float,
|
||||
"textureStore(t : texture_storage_1d_array<rgba32float>,\n"
|
||||
" coords : i32,\n"
|
||||
" array_index : i32,\n"
|
||||
" value : vec4<T>) -> void",
|
||||
ast::AccessControl::kWriteOnly,
|
||||
type::ImageFormat::kRgba32Float,
|
||||
type::TextureDimension::k1dArray,
|
||||
TextureDataType::kF32,
|
||||
"textureStore",
|
||||
[](ProgramBuilder* b) {
|
||||
return b->ExprList("texture", // t
|
||||
1, // coords
|
||||
2, // array_index
|
||||
b->vec4<f32>(3.f, 4.f, 5.f, 6.f)); // value
|
||||
},
|
||||
},
|
||||
{
|
||||
ValidTextureOverload::kStoreWO2dRgba32float,
|
||||
"textureStore(t : texture_storage_2d<rgba32float>,\n"
|
||||
|
||||
@@ -38,7 +38,6 @@ std::ostream& operator<<(std::ostream& out, const TextureDataType& ty);
|
||||
/// Non-exhaustive list of valid texture overloads
|
||||
enum class ValidTextureOverload {
|
||||
kDimensions1d,
|
||||
kDimensions1dArray,
|
||||
kDimensions2d,
|
||||
kDimensions2dLevel,
|
||||
kDimensions2dArray,
|
||||
@@ -60,22 +59,18 @@ enum class ValidTextureOverload {
|
||||
kDimensionsDepthCubeArray,
|
||||
kDimensionsDepthCubeArrayLevel,
|
||||
kDimensionsStorageRO1d,
|
||||
kDimensionsStorageRO1dArray,
|
||||
kDimensionsStorageRO2d,
|
||||
kDimensionsStorageRO2dArray,
|
||||
kDimensionsStorageRO3d,
|
||||
kDimensionsStorageWO1d,
|
||||
kDimensionsStorageWO1dArray,
|
||||
kDimensionsStorageWO2d,
|
||||
kDimensionsStorageWO2dArray,
|
||||
kDimensionsStorageWO3d,
|
||||
kNumLayers1dArray,
|
||||
kNumLayers2dArray,
|
||||
kNumLayersCubeArray,
|
||||
kNumLayersMultisampled2dArray,
|
||||
kNumLayersDepth2dArray,
|
||||
kNumLayersDepthCubeArray,
|
||||
kNumLayersStorageWO1dArray,
|
||||
kNumLayersStorageWO2dArray,
|
||||
kNumLevels2d,
|
||||
kNumLevels2dArray,
|
||||
@@ -89,7 +84,6 @@ enum class ValidTextureOverload {
|
||||
kNumSamplesMultisampled2d,
|
||||
kNumSamplesMultisampled2dArray,
|
||||
kSample1dF32,
|
||||
kSample1dArrayF32,
|
||||
kSample2dF32,
|
||||
kSample2dOffsetF32,
|
||||
kSample2dArrayF32,
|
||||
@@ -143,9 +137,6 @@ enum class ValidTextureOverload {
|
||||
kLoad1dF32,
|
||||
kLoad1dU32,
|
||||
kLoad1dI32,
|
||||
kLoad1dArrayF32,
|
||||
kLoad1dArrayU32,
|
||||
kLoad1dArrayI32,
|
||||
kLoad2dF32,
|
||||
kLoad2dU32,
|
||||
kLoad2dI32,
|
||||
@@ -175,7 +166,6 @@ enum class ValidTextureOverload {
|
||||
kLoadDepth2dArrayF32,
|
||||
kLoadDepth2dArrayLevelF32,
|
||||
kLoadStorageRO1dRgba32float, // Not permutated for all texel formats
|
||||
kLoadStorageRO1dArrayRgba32float, // Not permutated for all texel formats
|
||||
kLoadStorageRO2dRgba8unorm,
|
||||
kLoadStorageRO2dRgba8snorm,
|
||||
kLoadStorageRO2dRgba8uint,
|
||||
@@ -195,7 +185,6 @@ enum class ValidTextureOverload {
|
||||
kLoadStorageRO2dArrayRgba32float, // Not permutated for all texel formats
|
||||
kLoadStorageRO3dRgba32float, // Not permutated for all texel formats
|
||||
kStoreWO1dRgba32float, // Not permutated for all texel formats
|
||||
kStoreWO1dArrayRgba32float, // Not permutated for all texel formats
|
||||
kStoreWO2dRgba32float, // Not permutated for all texel formats
|
||||
kStoreWO2dArrayRgba32float, // Not permutated for all texel formats
|
||||
kStoreWO3dRgba32float, // Not permutated for all texel formats
|
||||
|
||||
Reference in New Issue
Block a user