encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-06-06 14:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the ConvertTimestampToNanoseconds toggle.

Browse Source 
It was used to avoid requiring the dependency on Tint so it isn't needed
anymore now that Dawn unconditionally dependent on Tint.

Bug: dawn:686
Bug: dawn:706
Change-Id: Ifd12c2f94fcaaa70120ae7ef72bcdc34f970fbea
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/46004
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Auto-Submit: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Stephen White <senorblanco@chromium.org>
This commit is contained in:
Corentin Wallez 2021-03-31 19:31:42 +00:00 committed by Commit Bot service account
parent 50f995851d
commit ad879f520d
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/dawn_native/CommandEncoder.cpp
View File

@ -868,10 +868,9 @@ namespace dawn_native {
cmd->destinationOffset = destinationOffset; cmd->destinationOffset = destinationOffset;
// Encode internal compute pipeline for timestamp query // Encode internal compute pipeline for timestamp query
if (querySet->GetQueryType() == wgpu::QueryType::Timestamp && if (querySet->GetQueryType() == wgpu::QueryType::Timestamp) {
GetDevice()->IsToggleEnabled(Toggle::ConvertTimestampsToNanoseconds)) { DAWN_TRY(EncodeTimestampsToNanosecondsConversion(this, querySet, queryCount, destination,
DAWN_TRY(EncodeTimestampsToNanosecondsConversion(this, querySet, queryCount, destinationOffset));
destination, destinationOffset));
} }
return {}; return {};

1
src/dawn_native/Device.cpp
View File

@ -1262,7 +1262,6 @@ namespace dawn_native {
void DeviceBase::SetDefaultToggles() { void DeviceBase::SetDefaultToggles() {
SetToggle(Toggle::LazyClearResourceOnFirstUse, true); SetToggle(Toggle::LazyClearResourceOnFirstUse, true);
SetToggle(Toggle::DisallowUnsafeAPIs, true); SetToggle(Toggle::DisallowUnsafeAPIs, true);
SetToggle(Toggle::ConvertTimestampsToNanoseconds, true);
} }
void DeviceBase::ApplyToggleOverrides(const DeviceDescriptor* deviceDescriptor) { void DeviceBase::ApplyToggleOverrides(const DeviceDescriptor* deviceDescriptor) {

6
src/dawn_native/Toggles.cpp
View File

@ -167,12 +167,6 @@ namespace dawn_native {
{"flush_before_client_wait_sync", {"flush_before_client_wait_sync",
"Call glFlush before glClientWaitSync to work around bugs in the latter", "Call glFlush before glClientWaitSync to work around bugs in the latter",
"https://crbug.com/dawn/633"}}, "https://crbug.com/dawn/633"}},
{Toggle::ConvertTimestampsToNanoseconds,
{"convert_timestamps_to_nanoseconds",
"If needed, use a compute shader to transform timestamp queries from ticks to "
"nanoseconds. This is temporarily needed to avoid requiring Tint to use timestamp "
"queries",
"https://crbug.com/dawn/686"}},
{Toggle::UseTempBufferInSmallFormatTextureToTextureCopyFromGreaterToLessMipLevel, {Toggle::UseTempBufferInSmallFormatTextureToTextureCopyFromGreaterToLessMipLevel,
{"use_temp_buffer_in_small_format_texture_to_texture_copy_from_greater_to_less_mip_" {"use_temp_buffer_in_small_format_texture_to_texture_copy_from_greater_to_less_mip_"
"level", "level",

1
src/dawn_native/Toggles.h
View File

@ -50,7 +50,6 @@ namespace dawn_native {
DisallowUnsafeAPIs, DisallowUnsafeAPIs,
UseTintGenerator, UseTintGenerator,
FlushBeforeClientWaitSync, FlushBeforeClientWaitSync,
ConvertTimestampsToNanoseconds,
UseTempBufferInSmallFormatTextureToTextureCopyFromGreaterToLessMipLevel, UseTempBufferInSmallFormatTextureToTextureCopyFromGreaterToLessMipLevel,
EnumCount, EnumCount,