commit c7e156fb7b8fc18a67119d3805b11d19667412f3
author Loko Kung <lokokung@google.com> Wed Nov 23 02:32:42 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Nov 23 02:32:42 2022 +0000
tree 3900fbe5d844642dcfcd87407b796a0db57f4142
parent 32a31ac379a73324f7c00ccc748eb3c74590a9bc

Deprecates enable_blob_cache toggle in favor of a disable version.

Bug: dawn:549
Change-Id: I5ba4c3e381ae73c356b2e4700df3f463278c979c
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/110840
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Loko Kung <lokokung@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>

src/dawn/native/Toggles.cpp

diff --git a/src/dawn/native/Toggles.cpp b/src/dawn/native/Toggles.cpp
index 20e44f5..74afc50 100644
--- a/src/dawn/native/Toggles.cpp
+++ b/src/dawn/native/Toggles.cpp
@@ -266,12 +266,6 @@
       "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 "

src/dawn/native/Toggles.h

diff --git a/src/dawn/native/Toggles.h b/src/dawn/native/Toggles.h
index 3dde2e4..9a5d792 100644
--- a/src/dawn/native/Toggles.h
+++ b/src/dawn/native/Toggles.h
@@ -73,7 +73,6 @@
     D3D12SplitBufferTextureCopyForRowsPerImagePaddings,
     MetalRenderR8RG8UnormSmallMipToTempTexture,
     DisableBlobCache,
-    EnableBlobCache,
     D3D12ForceClearCopyableDepthStencilTextureOnCreation,
     D3D12DontSetClearValueOnDepthTextureCreation,
     D3D12AlwaysUseTypelessFormatsForCastableTexture,

src/dawn/tests/end2end/PipelineCachingTests.cpp

diff --git a/src/dawn/tests/end2end/PipelineCachingTests.cpp b/src/dawn/tests/end2end/PipelineCachingTests.cpp
index b11a23b..c5abcec 100644
--- a/src/dawn/tests/end2end/PipelineCachingTests.cpp
+++ b/src/dawn/tests/end2end/PipelineCachingTests.cpp
@@ -639,11 +639,11 @@
 }
 
 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

src/dawn/tests/unittests/native/CacheRequestTests.cpp

diff --git a/src/dawn/tests/unittests/native/CacheRequestTests.cpp b/src/dawn/tests/unittests/native/CacheRequestTests.cpp
index df575e8..6d14f84 100644
--- a/src/dawn/tests/unittests/native/CacheRequestTests.cpp
+++ b/src/dawn/tests/unittests/native/CacheRequestTests.cpp
@@ -39,18 +39,6 @@
         return std::make_unique<DawnCachingMockPlatform>(&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<CachingInterfaceMock> mMockCache;