summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2019-08-22 17:02:30 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-08-22 17:02:30 +0000
commit52d84f8f2510835339e55ce0b59c92d63154cf2a (patch)
tree7f30719fafb6bcc49bcec0bd24410be6adad243c
parentc176c0da5f82a5e7d7255ee833857eb2562aecea (diff)
parentc81b532412c6a036e7ba397827ae9b1fcd7c6ef1 (diff)
downloadnative-52d84f8f2510835339e55ce0b59c92d63154cf2a.tar.gz
Merge "libvulkan: add a nullptr check for ANativeWindow*"
-rw-r--r--vulkan/libvulkan/swapchain.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index 3db8a3962e..bb5c151911 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -1306,7 +1306,7 @@ void DestroySwapchainKHR(VkDevice device,
bool active = swapchain->surface.swapchain_handle == swapchain_handle;
ANativeWindow* window = active ? swapchain->surface.window.get() : nullptr;
- if (swapchain->frame_timestamps_enabled) {
+ if (window && swapchain->frame_timestamps_enabled) {
native_window_enable_frame_timestamps(window, false);
}
for (uint32_t i = 0; i < swapchain->num_images; i++)