diff --git a/src/dawn/native/vulkan/AdapterVk.cpp b/src/dawn/native/vulkan/AdapterVk.cpp index 35cd36783f..a4dc1ddf94 100644 --- a/src/dawn/native/vulkan/AdapterVk.cpp +++ b/src/dawn/native/vulkan/AdapterVk.cpp @@ -149,7 +149,10 @@ MaybeError Adapter::InitializeSupportedFeaturesImpl() { mSupportedFeatures.EnableFeature(Feature::PipelineStatisticsQuery); } - if (mDeviceInfo.properties.limits.timestampComputeAndGraphics == VK_TRUE) { + // TODO(dawn:1559) Resolving timestamp queries after a render pass is failing on Qualcomm-based + // Android devices. + if (mDeviceInfo.properties.limits.timestampComputeAndGraphics == VK_TRUE && + !IsAndroidQualcomm()) { mSupportedFeatures.EnableFeature(Feature::TimestampQuery); } diff --git a/src/dawn/tests/end2end/QueryTests.cpp b/src/dawn/tests/end2end/QueryTests.cpp index 2922f392a7..6638875f21 100644 --- a/src/dawn/tests/end2end/QueryTests.cpp +++ b/src/dawn/tests/end2end/QueryTests.cpp @@ -750,9 +750,6 @@ TEST_P(TimestampQueryTests, TimestampOnRenderPass) { // devices DAWN_TEST_UNSUPPORTED_IF(IsMacOS() && IsMetal() && IsApple()); - // TODO(dawn:1549) Fails on Qualcomm-based Android devices. - DAWN_SUPPRESS_TEST_IF(IsAndroid() && IsQualcomm()); - constexpr uint32_t kQueryCount = 2; // Write timestamp with different query indexes @@ -1035,9 +1032,6 @@ TEST_P(TimestampQueryTests, TimestampWritesOnRenderPassWithNoPipline) { // the issue is fixed. DAWN_SUPPRESS_TEST_IF(IsWindows() && IsVulkan() && IsIntel()); - // TODO(dawn:1549) Fails on Qualcomm-based Android devices. - DAWN_SUPPRESS_TEST_IF(IsAndroid() && IsQualcomm()); - wgpu::QuerySet querySet = CreateQuerySetForTimestamp(2); TestTimestampWritesOnRenderPass({{querySet, 0, wgpu::RenderPassTimestampLocation::Beginning}, {querySet, 1, wgpu::RenderPassTimestampLocation::End}}, @@ -1053,9 +1047,6 @@ TEST_P(TimestampQueryTests, TimestampWritesOnRenderPassWithOnlyVertexStage) { // the issue is fixed. DAWN_SUPPRESS_TEST_IF(IsWindows() && IsVulkan() && IsIntel()); - // TODO(dawn:1549) Fails on Qualcomm-based Android devices. - DAWN_SUPPRESS_TEST_IF(IsAndroid() && IsQualcomm()); - wgpu::QuerySet querySet = CreateQuerySetForTimestamp(2); TestTimestampWritesOnRenderPass({{querySet, 0, wgpu::RenderPassTimestampLocation::Beginning}, {querySet, 1, wgpu::RenderPassTimestampLocation::End}},