encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Loko Kung 2022-11-23 02:32:42 +00:00 committed by Dawn LUCI CQ
parent 32a31ac379
commit c7e156fb7b
4 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dawn/native/Toggles.cpp
View File

@ -266,12 +266,6 @@ static constexpr ToggleEnumAndInfoList kToggleNameAndInfoList = {{
"Disables usage of the blob cache (backed by the platform cache if set/passed). Prevents any " "Disables usage of the blob cache (backed by the platform cache if set/passed). Prevents any "
"persistent caching capabilities, i.e. pipeline caching.", "persistent caching capabilities, i.e. pipeline caching.",
"https://crbug.com/dawn/549"}}, "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, {Toggle::D3D12ForceClearCopyableDepthStencilTextureOnCreation,
{"d3d12_force_clear_copyable_depth_stencil_texture_on_creation", {"d3d12_force_clear_copyable_depth_stencil_texture_on_creation",
"Always clearing copyable depth stencil textures when creating them instead of skipping the " "Always clearing copyable depth stencil textures when creating them instead of skipping the "

1
src/dawn/native/Toggles.h
View File

@ -73,7 +73,6 @@ enum class Toggle {
D3D12SplitBufferTextureCopyForRowsPerImagePaddings, D3D12SplitBufferTextureCopyForRowsPerImagePaddings,
MetalRenderR8RG8UnormSmallMipToTempTexture, MetalRenderR8RG8UnormSmallMipToTempTexture,
DisableBlobCache, DisableBlobCache,
EnableBlobCache,
D3D12ForceClearCopyableDepthStencilTextureOnCreation, D3D12ForceClearCopyableDepthStencilTextureOnCreation,
D3D12DontSetClearValueOnDepthTextureCreation, D3D12DontSetClearValueOnDepthTextureCreation,
D3D12AlwaysUseTypelessFormatsForCastableTexture, D3D12AlwaysUseTypelessFormatsForCastableTexture,

12
src/dawn/tests/end2end/PipelineCachingTests.cpp
View File

@ -639,11 +639,11 @@ TEST_P(SinglePipelineCachingTests, RenderPipelineBlobCacheIsolationKey) {
} }
DAWN_INSTANTIATE_TEST(SinglePipelineCachingTests, DAWN_INSTANTIATE_TEST(SinglePipelineCachingTests,
D3D12Backend({"enable_blob_cache"}), D3D12Backend(),
D3D12Backend({"enable_blob_cache", "use_dxc"}), D3D12Backend({"use_dxc"}),
MetalBackend({"enable_blob_cache"}), MetalBackend(),
OpenGLBackend({"enable_blob_cache"}), OpenGLBackend(),
OpenGLESBackend({"enable_blob_cache"}), OpenGLESBackend(),
VulkanBackend({"enable_blob_cache"})); VulkanBackend());
} // namespace } // namespace

12
src/dawn/tests/unittests/native/CacheRequestTests.cpp
View File

@ -39,18 +39,6 @@ class CacheRequestTests : public DawnNativeTest {
return std::make_unique<DawnCachingMockPlatform>(&mMockCache); 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()); } DeviceBase* GetDevice() { return dawn::native::FromAPI(device.Get()); }
StrictMock<CachingInterfaceMock> mMockCache; StrictMock<CachingInterfaceMock> mMockCache;