mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-16 16:37:08 +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:
committed by
Commit Bot service account
parent
00eb8dfa8b
commit
13dbbc6797
@@ -67,8 +67,6 @@ TypeTextureDimensionToResourceBindingTextureDimension(
|
||||
switch (type_dim) {
|
||||
case type::TextureDimension::k1d:
|
||||
return ResourceBinding::TextureDimension::k1d;
|
||||
case type::TextureDimension::k1dArray:
|
||||
return ResourceBinding::TextureDimension::k1dArray;
|
||||
case type::TextureDimension::k2d:
|
||||
return ResourceBinding::TextureDimension::k2d;
|
||||
case type::TextureDimension::k2dArray:
|
||||
|
||||
@@ -37,8 +37,6 @@ struct ResourceBinding {
|
||||
kNone = -1,
|
||||
/// 1 dimensional texture
|
||||
k1d,
|
||||
/// 1 dimenstional array texture
|
||||
k1dArray,
|
||||
/// 2 dimensional texture
|
||||
k2d,
|
||||
/// 2 dimensional array texture
|
||||
|
||||
@@ -586,7 +586,6 @@ class InspectorHelper : public ProgramBuilder {
|
||||
type::Type* GetCoordsType(type::TextureDimension dim, type::Type* scalar) {
|
||||
switch (dim) {
|
||||
case type::TextureDimension::k1d:
|
||||
case type::TextureDimension::k1dArray:
|
||||
return scalar;
|
||||
case type::TextureDimension::k2d:
|
||||
case type::TextureDimension::k2dArray:
|
||||
@@ -2352,10 +2351,6 @@ INSTANTIATE_TEST_SUITE_P(
|
||||
InspectorGetSampledArrayTextureResourceBindingsTest,
|
||||
InspectorGetSampledArrayTextureResourceBindingsTestWithParam,
|
||||
testing::Values(
|
||||
GetSampledTextureTestParams{
|
||||
type::TextureDimension::k1dArray,
|
||||
inspector::ResourceBinding::TextureDimension::k1dArray,
|
||||
inspector::ResourceBinding::SampledKind::kFloat},
|
||||
GetSampledTextureTestParams{
|
||||
type::TextureDimension::k2dArray,
|
||||
inspector::ResourceBinding::TextureDimension::k2dArray,
|
||||
@@ -2470,18 +2465,6 @@ INSTANTIATE_TEST_SUITE_P(
|
||||
InspectorGetMultisampledArrayTextureResourceBindingsTest,
|
||||
InspectorGetMultisampledArrayTextureResourceBindingsTestWithParam,
|
||||
testing::Values(
|
||||
GetMultisampledTextureTestParams{
|
||||
type::TextureDimension::k1dArray,
|
||||
inspector::ResourceBinding::TextureDimension::k1dArray,
|
||||
inspector::ResourceBinding::SampledKind::kFloat},
|
||||
GetMultisampledTextureTestParams{
|
||||
type::TextureDimension::k1dArray,
|
||||
inspector::ResourceBinding::TextureDimension::k1dArray,
|
||||
inspector::ResourceBinding::SampledKind::kSInt},
|
||||
GetMultisampledTextureTestParams{
|
||||
type::TextureDimension::k1dArray,
|
||||
inspector::ResourceBinding::TextureDimension::k1dArray,
|
||||
inspector::ResourceBinding::SampledKind::kUInt},
|
||||
GetMultisampledTextureTestParams{
|
||||
type::TextureDimension::k2dArray,
|
||||
inspector::ResourceBinding::TextureDimension::k2dArray,
|
||||
@@ -2537,7 +2520,6 @@ TEST_P(InspectorGetStorageTextureResourceBindingsTestWithParam, Simple) {
|
||||
type::Type* dim_type = nullptr;
|
||||
switch (dim) {
|
||||
case type::TextureDimension::k1d:
|
||||
case type::TextureDimension::k1dArray:
|
||||
dim_type = ty.i32();
|
||||
break;
|
||||
case type::TextureDimension::k2d:
|
||||
@@ -2590,8 +2572,6 @@ INSTANTIATE_TEST_SUITE_P(
|
||||
testing::Values(
|
||||
std::make_tuple(type::TextureDimension::k1d,
|
||||
ResourceBinding::TextureDimension::k1d),
|
||||
std::make_tuple(type::TextureDimension::k1dArray,
|
||||
ResourceBinding::TextureDimension::k1dArray),
|
||||
std::make_tuple(type::TextureDimension::k2d,
|
||||
ResourceBinding::TextureDimension::k2d),
|
||||
std::make_tuple(type::TextureDimension::k2dArray,
|
||||
|
||||
Reference in New Issue
Block a user