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.h b/libs/hwui/renderthread/VulkanSurface.h
index 4fd9cd2..418d40f 100644
--- a/libs/hwui/renderthread/VulkanSurface.h
+++ b/libs/hwui/renderthread/VulkanSurface.h
@@ -42,7 +42,9 @@
const VulkanManager& vkManager);
~VulkanSurface();
- sk_sp<SkSurface> getCurrentSkSurface() { return mNativeBuffers[mDequeuedIndex].skSurface; }
+ sk_sp<SkSurface> getCurrentSkSurface() {
+ return mCurrentBufferInfo ? mCurrentBufferInfo->skSurface : nullptr;
+ }
const SkMatrix& getCurrentPreTransform() { return mWindowInfo.preTransform; }
private:
@@ -65,7 +67,7 @@
};
NativeBufferInfo* dequeueNativeBuffer();
- NativeBufferInfo* getCurrentBufferInfo() { return &mNativeBuffers[mDequeuedIndex]; }
+ NativeBufferInfo* getCurrentBufferInfo() { return mCurrentBufferInfo; }
bool presentCurrentBuffer(const SkRect& dirtyRect, int semaphoreFd);
// The width and height are are the logical width and height for when submitting draws to the
@@ -115,8 +117,8 @@
WindowInfo mWindowInfo;
GrContext* mGrContext;
- int mDequeuedIndex = -1;
uint32_t mPresentCount = 0;
+ NativeBufferInfo* mCurrentBufferInfo = nullptr;
const SkISize mMinWindowSize;
const SkISize mMaxWindowSize;