Remove filtering_parameters feature Remove the filtering parameters feature from Tint. Bug: 507087794 Change-Id: I72b4245ac8cbced6c81eb49cf2a836445d496b12 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/307915 Reviewed-by: James Price <jrprice@google.com>
diff --git a/src/dawn/common/WGSLFeatureMapping.h b/src/dawn/common/WGSLFeatureMapping.h index a37e56b..8653ad1 100644 --- a/src/dawn/common/WGSLFeatureMapping.h +++ b/src/dawn/common/WGSLFeatureMapping.h
@@ -44,7 +44,6 @@ X(kSubgroupUniformity, SubgroupUniformity) \ X(kTextureAndSamplerLet, TextureAndSamplerLet) \ X(kBufferView, BufferView) \ - X(kFilteringParameters, FilteringParameters) \ X(kSwizzleAssignment, SwizzleAssignment) \ X(kLinearIndexing, LinearIndexing) \ X(kTextureFormatsTier1, TextureFormatsTier1) \
diff --git a/src/dawn/dawn.json b/src/dawn/dawn.json index dfc6c09..f24a904 100644 --- a/src/dawn/dawn.json +++ b/src/dawn/dawn.json
@@ -4607,8 +4607,7 @@ {"value": 8, "name": "fragment depth", "jsrepr": "'fragment_depth'", "tags": ["dawn"]}, {"value": 9, "name": "immediate address space", "jsrepr": "'immediate_address_space'", "tags": ["dawn"]}, {"value": 11, "name": "buffer view", "jsrepr": "'buffer_view'", "tags": ["dawn"]}, - {"value": 12, "name": "filtering parameters", "jsrepr": "'filtering_parameters'", "tags": ["dawn"]}, - {"value": 13, "name": "swizzle assignment", "jsrepr": "'swizzle_assignment'", "tags": ["dawn"]} + {"value": 12, "name": "swizzle assignment", "jsrepr": "'swizzle_assignment'", "tags": ["dawn"]} ] }, "whole size" : {
diff --git a/src/dawn/node/binding/Converter.cpp b/src/dawn/node/binding/Converter.cpp index 6715a56..41eeb64 100644 --- a/src/dawn/node/binding/Converter.cpp +++ b/src/dawn/node/binding/Converter.cpp
@@ -1880,9 +1880,6 @@ case interop::WGSLLanguageFeatureName::kBufferView: out = wgpu::WGSLLanguageFeatureName::BufferView; return true; - case interop::WGSLLanguageFeatureName::kFilteringParameters: - out = wgpu::WGSLLanguageFeatureName::FilteringParameters; - return true; case interop::WGSLLanguageFeatureName::kSwizzleAssignment: out = wgpu::WGSLLanguageFeatureName::SwizzleAssignment; return true; @@ -1940,9 +1937,6 @@ case wgpu::WGSLLanguageFeatureName::BufferView: out = interop::WGSLLanguageFeatureName::kBufferView; return true; - case wgpu::WGSLLanguageFeatureName::FilteringParameters: - out = interop::WGSLLanguageFeatureName::kFilteringParameters; - return true; case wgpu::WGSLLanguageFeatureName::SwizzleAssignment: out = interop::WGSLLanguageFeatureName::kSwizzleAssignment; return true;
diff --git a/src/dawn/node/interop/DawnExtensions.idl b/src/dawn/node/interop/DawnExtensions.idl index 0f7487e..dc94ec5 100644 --- a/src/dawn/node/interop/DawnExtensions.idl +++ b/src/dawn/node/interop/DawnExtensions.idl
@@ -46,7 +46,6 @@ "subgroup_uniformity", "texture_and_sampler_let", "buffer_view", - "filtering_parameters", "swizzle_assignment", "linear_indexing", "texture_formats_tier1",
diff --git a/src/tint/cmd/fuzz/wgsl/dictionary.txt b/src/tint/cmd/fuzz/wgsl/dictionary.txt index 5b3f95f..a64bb57 100644 --- a/src/tint/cmd/fuzz/wgsl/dictionary.txt +++ b/src/tint/cmd/fuzz/wgsl/dictionary.txt
@@ -232,7 +232,6 @@ "faceForward" "fallthrough" "false" -"filtering_parameters" "first" "firstLeadingBit" "firstTrailingBit"
diff --git a/src/tint/lang/wgsl/enums.cc b/src/tint/lang/wgsl/enums.cc index c80aae3..b31d0e3 100644 --- a/src/tint/lang/wgsl/enums.cc +++ b/src/tint/lang/wgsl/enums.cc
@@ -201,9 +201,6 @@ if (str == "chromium_testing_unsafe_experimental") { return LanguageFeature::kChromiumTestingUnsafeExperimental; } - if (str == "filtering_parameters") { - return LanguageFeature::kFilteringParameters; - } if (str == "fragment_depth") { return LanguageFeature::kFragmentDepth; } @@ -269,8 +266,6 @@ return "chromium_testing_unimplemented"; case LanguageFeature::kChromiumTestingUnsafeExperimental: return "chromium_testing_unsafe_experimental"; - case LanguageFeature::kFilteringParameters: - return "filtering_parameters"; case LanguageFeature::kFragmentDepth: return "fragment_depth"; case LanguageFeature::kImmediateAddressSpace:
diff --git a/src/tint/lang/wgsl/enums.h b/src/tint/lang/wgsl/enums.h index 145c9b4..f9f446c 100644 --- a/src/tint/lang/wgsl/enums.h +++ b/src/tint/lang/wgsl/enums.h
@@ -194,7 +194,6 @@ kChromiumTestingShippedWithKillswitch, kChromiumTestingUnimplemented, kChromiumTestingUnsafeExperimental, - kFilteringParameters, kFragmentDepth, kImmediateAddressSpace, kLinearIndexing, @@ -229,7 +228,6 @@ "chromium_testing_shipped_with_killswitch", "chromium_testing_unimplemented", "chromium_testing_unsafe_experimental", - "filtering_parameters", "fragment_depth", "immediate_address_space", "linear_indexing", @@ -256,7 +254,6 @@ LanguageFeature::kChromiumTestingShippedWithKillswitch, LanguageFeature::kChromiumTestingUnimplemented, LanguageFeature::kChromiumTestingUnsafeExperimental, - LanguageFeature::kFilteringParameters, LanguageFeature::kFragmentDepth, LanguageFeature::kImmediateAddressSpace, LanguageFeature::kLinearIndexing,
diff --git a/src/tint/lang/wgsl/enums_test.cc b/src/tint/lang/wgsl/enums_test.cc index a4a55ec..2ffd39d 100644 --- a/src/tint/lang/wgsl/enums_test.cc +++ b/src/tint/lang/wgsl/enums_test.cc
@@ -319,7 +319,6 @@ {"chromium_testing_shipped_with_killswitch", LanguageFeature::kChromiumTestingShippedWithKillswitch}, {"chromium_testing_unimplemented", LanguageFeature::kChromiumTestingUnimplemented}, {"chromium_testing_unsafe_experimental", LanguageFeature::kChromiumTestingUnsafeExperimental}, - {"filtering_parameters", LanguageFeature::kFilteringParameters}, {"fragment_depth", LanguageFeature::kFragmentDepth}, {"immediate_address_space", LanguageFeature::kImmediateAddressSpace}, {"linear_indexing", LanguageFeature::kLinearIndexing}, @@ -359,54 +358,51 @@ {"chroFFium_testing_unsafe_experimental", LanguageFeature::kUndefined}, {"chromiuftesting_uPsaQe_00xperimental", LanguageFeature::kUndefined}, {"chPomium_testing_unsafe_experimental", LanguageFeature::kUndefined}, - {"fil77ering_paraseters", LanguageFeature::kUndefined}, - {"filterbbng_parameCeRRs", LanguageFeature::kUndefined}, - {"filXXering_parameters", LanguageFeature::kUndefined}, - {"fragmqntdepCCOOO", LanguageFeature::kUndefined}, - {"frasment_eutL", LanguageFeature::kUndefined}, - {"fXagment_depth", LanguageFeature::kUndefined}, - {"immediate_address_spac", LanguageFeature::kUndefined}, - {"immeiaOe_areqqs_space", LanguageFeature::kUndefined}, - {"immed22ate_address_space", LanguageFeature::kUndefined}, - {"lynea_izzdex0XXg", LanguageFeature::kUndefined}, - {"iinearVVndexinP", LanguageFeature::kUndefined}, - {"linCar_indexing", LanguageFeature::kUndefined}, - {"qqacked_x_integer_AAot_produHHt", LanguageFeature::kUndefined}, - {"packed_4x8_iteger_dot_product", LanguageFeature::kUndefined}, - {"pafKked_4_integer_dot_product", LanguageFeature::kUndefined}, - {"pointer_ggompost_Pcless", LanguageFeature::kUndefined}, - {"pointer_comosite_access", LanguageFeature::kUndefined}, - {"pointeN_composctTT_a4cess", LanguageFeature::kUndefined}, - {"readppnly_and_re77dwrlte_stoage_textures", LanguageFeature::kUndefined}, - {"readonly_and_readgzzite_stoag_tNNxtures", LanguageFeature::kUndefined}, - {"readonly_anbbuurXXdwrite_strage_textures", LanguageFeature::kUndefined}, - {"ized_binding_array", LanguageFeature::kUndefined}, - {"szeK_bin88ig_Qrray", LanguageFeature::kUndefined}, - {"sized_b9nding_aqry", LanguageFeature::kUndefined}, - {"su11group_id", LanguageFeature::kUndefined}, - {"siibgr22p_id", LanguageFeature::kUndefined}, - {"77bgroup_id", LanguageFeature::kUndefined}, - {"subgroup_unifNNrmiy", LanguageFeature::kUndefined}, - {"subgroup_uniformiVVy", LanguageFeature::kUndefined}, - {"su11gWWoup_unFformwty", LanguageFeature::kUndefined}, - {"swizle_assignmenww", LanguageFeature::kUndefined}, - {"swizzle_asDignment", LanguageFeature::kUndefined}, - {"Kwizzle_assignent", LanguageFeature::kUndefined}, - {"texel_bhf11erPP", LanguageFeature::kUndefined}, - {"texl_buffers", LanguageFeature::kUndefined}, - {"texel_bYYffers", LanguageFeature::kUndefined}, - {"textukke_aVd_satpler_lHH", LanguageFeature::kUndefined}, - {"texturerrand_sampler_let", LanguageFeature::kUndefined}, - {"teture_and_sampleWWs_let", LanguageFeature::kUndefined}, - {"teYture_format_tier1", LanguageFeature::kUndefined}, - {"tqture_Lormats_tief1", LanguageFeature::kUndefined}, - {"texture_fvrmatf_tuu22r1", LanguageFeature::kUndefined}, - {"uiorm_buffer_standard_layout", LanguageFeature::kUndefined}, - {"unifrm_bufferYYtandard_layout", LanguageFeature::kUndefined}, - {"uniformYYbufyer77standard_layoEt", LanguageFeature::kUndefined}, - {"unrestrictood_pointe_paMamdters", LanguageFeature::kUndefined}, - {"unrestricMMed_pointer_paameters", LanguageFeature::kUndefined}, - {"unrestricted_poi55ter_parameters", LanguageFeature::kUndefined}, + {"fragment_77epsh", LanguageFeature::kUndefined}, + {"RRrbbgment_Cepth", LanguageFeature::kUndefined}, + {"fXXagment_depth", LanguageFeature::kUndefined}, + {"imedOOatq_addrOOssCCspace", LanguageFeature::kUndefined}, + {"imediLts_address_space", LanguageFeature::kUndefined}, + {"immediate_addresX_space", LanguageFeature::kUndefined}, + {"liear_indexing", LanguageFeature::kUndefined}, + {"lqqnaridexOng", LanguageFeature::kUndefined}, + {"linear_indexin22", LanguageFeature::kUndefined}, + {"packe0_zzy8_inXXeger_dot_produc", LanguageFeature::kUndefined}, + {"packed_4x8_inteier_doVPproduct", LanguageFeature::kUndefined}, + {"pacCed_x8_integenn_dot_product", LanguageFeature::kUndefined}, + {"pintHH_qqomposite_aAAcess", LanguageFeature::kUndefined}, + {"ointer_composite_access", LanguageFeature::kUndefined}, + {"poiterKKcomposie_acfess", LanguageFeature::kUndefined}, + {"readonly_ggnd_readwrite_sPorage_xturel", LanguageFeature::kUndefined}, + {"readonly_and_readwrite_storage_texture", LanguageFeature::kUndefined}, + {"readcnly_and_reaNwrite_stTTrag4_textures", LanguageFeature::kUndefined}, + {"slzepp7_bining_array", LanguageFeature::kUndefined}, + {"sgzed_bndigNNzarray", LanguageFeature::kUndefined}, + {"sized_indibbg_XXrauu", LanguageFeature::kUndefined}, + {"subgrou_id", LanguageFeature::kUndefined}, + {"KbQrou88id", LanguageFeature::kUndefined}, + {"sub9ropqid", LanguageFeature::kUndefined}, + {"subgroup_uniform11ty", LanguageFeature::kUndefined}, + {"subgr22ip_unifFrmity", LanguageFeature::kUndefined}, + {"su77roup_uniformity", LanguageFeature::kUndefined}, + {"Nwizzle_assignme2t", LanguageFeature::kUndefined}, + {"VVwizzle_assignment", LanguageFeature::kUndefined}, + {"swizzleFWWssignm11nt", LanguageFeature::kUndefined}, + {"tewwel_buffrs", LanguageFeature::kUndefined}, + {"texel_buDfers", LanguageFeature::kUndefined}, + {"texl_bufferK", LanguageFeature::kUndefined}, + {"textuPP1e_andhsampfer_ret", LanguageFeature::kUndefined}, + {"texture_and_samper_let", LanguageFeature::kUndefined}, + {"tYYxture_and_sampler_let", LanguageFeature::kUndefined}, + {"ttxturV_formats_tirHkk", LanguageFeature::kUndefined}, + {"texture_formats_tirrr1", LanguageFeature::kUndefined}, + {"textre_WWormats_ssier1", LanguageFeature::kUndefined}, + {"unform_buffer_standarY_layout", LanguageFeature::kUndefined}, + {"uniffrm_buffer_standLrd_lyoqt", LanguageFeature::kUndefined}, + {"vvniffm_buffer_standarduulayo22t", LanguageFeature::kUndefined}, + {"unrestricted_pointr_paraeters", LanguageFeature::kUndefined}, + {"unrstricted_poiYYter_parametes", LanguageFeature::kUndefined}, + {"unrestrYYEted_y7ointer_parameters", LanguageFeature::kUndefined}, }; using LanguageFeatureParseTest = testing::TestWithParam<LanguageFeatureCase>;
diff --git a/src/tint/lang/wgsl/feature_status.cc b/src/tint/lang/wgsl/feature_status.cc index 4dfd54e..6195e8f 100644 --- a/src/tint/lang/wgsl/feature_status.cc +++ b/src/tint/lang/wgsl/feature_status.cc
@@ -41,7 +41,6 @@ case LanguageFeature::kFragmentDepth: case LanguageFeature::kImmediateAddressSpace: case LanguageFeature::kBufferView: - case LanguageFeature::kFilteringParameters: case LanguageFeature::kSwizzleAssignment: return FeatureStatus::kUnsafeExperimental;
diff --git a/src/tint/lang/wgsl/wgsl.def b/src/tint/lang/wgsl/wgsl.def index 4ea0853..20a4d4d 100644 --- a/src/tint/lang/wgsl/wgsl.def +++ b/src/tint/lang/wgsl/wgsl.def
@@ -120,7 +120,6 @@ immediate_address_space texture_and_sampler_let buffer_view - filtering_parameters swizzle_assignment linear_indexing texture_formats_tier1