Fix crash after dequeueNativeBuffer fails Anytime dequeueNativeBuffer fails, it sets mDequeuedIndex to -1. This is causing a crash latter, when getCurrentSkSurface tries to index mNativeBuffers[mDequeuedIndex]. This CL removes mDequeuedIndex and improves Vulkan swapchain error handling. Test: Ran Camera app Bug: 129024275 Change-Id: Ieeb685c3a1b33f23ce2334d286199a44ace53165
diff --git a/libs/hwui/renderthread/VulkanSurface.cpp b/libs/hwui/renderthread/VulkanSurface.cpp index a98eb32..1708d3c 100644 --- a/libs/hwui/renderthread/VulkanSurface.cpp +++ b/libs/hwui/renderthread/VulkanSurface.cpp
@@ -420,9 +420,10 @@ } VulkanSurface::NativeBufferInfo* VulkanSurface::dequeueNativeBuffer() { - // Set the dequeue index to invalid in case of error and only reset it to the correct + // Set the mCurrentBufferInfo to invalid in case of error and only reset it to the correct // value at the end of the function if everything dequeued correctly. - mDequeuedIndex = -1; + mCurrentBufferInfo = nullptr; + //check if the native window has been resized or rotated and update accordingly SkISize newSize = SkISize::MakeEmpty(); @@ -511,7 +512,7 @@ } } - mDequeuedIndex = idx; + mCurrentBufferInfo = bufferInfo; return bufferInfo; } @@ -535,7 +536,8 @@ ALOGE_IF(err != 0, "native_window_set_surface_damage failed: %s (%d)", strerror(-err), err); } - VulkanSurface::NativeBufferInfo& currentBuffer = mNativeBuffers[mDequeuedIndex]; + LOG_ALWAYS_FATAL_IF(!mCurrentBufferInfo); + VulkanSurface::NativeBufferInfo& currentBuffer = *mCurrentBufferInfo; int queuedFd = (semaphoreFd != -1) ? semaphoreFd : currentBuffer.dequeue_fence; int err = mNativeWindow->queueBuffer(mNativeWindow.get(), currentBuffer.buffer.get(), queuedFd); @@ -560,7 +562,8 @@ } int VulkanSurface::getCurrentBuffersAge() { - VulkanSurface::NativeBufferInfo& currentBuffer = mNativeBuffers[mDequeuedIndex]; + LOG_ALWAYS_FATAL_IF(!mCurrentBufferInfo); + VulkanSurface::NativeBufferInfo& currentBuffer = *mCurrentBufferInfo; return currentBuffer.hasValidContents ? (mPresentCount - currentBuffer.lastPresentedCount) : 0; }