diff --git a/src/dawn/native/Toggles.cpp b/src/dawn/native/Toggles.cpp index 20e44f506b..74afc50ee4 100644 --- a/src/dawn/native/Toggles.cpp +++ b/src/dawn/native/Toggles.cpp @@ -266,12 +266,6 @@ static constexpr ToggleEnumAndInfoList kToggleNameAndInfoList = {{ "Disables usage of the blob cache (backed by the platform cache if set/passed). Prevents any " "persistent caching capabilities, i.e. pipeline caching.", "https://crbug.com/dawn/549"}}, - // TODO(dawn:549) Remove after deprecating usage on the Chromium side. - {Toggle::EnableBlobCache, - {"enable_blob_cache", - "Enables usage of the blob cache (backed by the platform cache if set/passed). Necessary for " - "any persistent caching capabilities, i.e. pipeline caching.", - "https://crbug.com/dawn/549"}}, {Toggle::D3D12ForceClearCopyableDepthStencilTextureOnCreation, {"d3d12_force_clear_copyable_depth_stencil_texture_on_creation", "Always clearing copyable depth stencil textures when creating them instead of skipping the " diff --git a/src/dawn/native/Toggles.h b/src/dawn/native/Toggles.h index 3dde2e4186..9a5d7920e9 100644 --- a/src/dawn/native/Toggles.h +++ b/src/dawn/native/Toggles.h @@ -73,7 +73,6 @@ enum class Toggle { D3D12SplitBufferTextureCopyForRowsPerImagePaddings, MetalRenderR8RG8UnormSmallMipToTempTexture, DisableBlobCache, - EnableBlobCache, D3D12ForceClearCopyableDepthStencilTextureOnCreation, D3D12DontSetClearValueOnDepthTextureCreation, D3D12AlwaysUseTypelessFormatsForCastableTexture, diff --git a/src/dawn/tests/end2end/PipelineCachingTests.cpp b/src/dawn/tests/end2end/PipelineCachingTests.cpp index b11a23bf39..c5abcec5a3 100644 --- a/src/dawn/tests/end2end/PipelineCachingTests.cpp +++ b/src/dawn/tests/end2end/PipelineCachingTests.cpp @@ -639,11 +639,11 @@ TEST_P(SinglePipelineCachingTests, RenderPipelineBlobCacheIsolationKey) { } DAWN_INSTANTIATE_TEST(SinglePipelineCachingTests, - D3D12Backend({"enable_blob_cache"}), - D3D12Backend({"enable_blob_cache", "use_dxc"}), - MetalBackend({"enable_blob_cache"}), - OpenGLBackend({"enable_blob_cache"}), - OpenGLESBackend({"enable_blob_cache"}), - VulkanBackend({"enable_blob_cache"})); + D3D12Backend(), + D3D12Backend({"use_dxc"}), + MetalBackend(), + OpenGLBackend(), + OpenGLESBackend(), + VulkanBackend()); } // namespace diff --git a/src/dawn/tests/unittests/native/CacheRequestTests.cpp b/src/dawn/tests/unittests/native/CacheRequestTests.cpp index df575e8b25..6d14f848e7 100644 --- a/src/dawn/tests/unittests/native/CacheRequestTests.cpp +++ b/src/dawn/tests/unittests/native/CacheRequestTests.cpp @@ -39,18 +39,6 @@ class CacheRequestTests : public DawnNativeTest { return std::make_unique(&mMockCache); } - WGPUDevice CreateTestDevice() override { - wgpu::DeviceDescriptor deviceDescriptor = {}; - wgpu::DawnTogglesDeviceDescriptor togglesDesc = {}; - deviceDescriptor.nextInChain = &togglesDesc; - - const char* toggle = "enable_blob_cache"; - togglesDesc.forceEnabledToggles = &toggle; - togglesDesc.forceEnabledTogglesCount = 1; - - return adapter.CreateDevice(&deviceDescriptor); - } - DeviceBase* GetDevice() { return dawn::native::FromAPI(device.Get()); } StrictMock mMockCache;