Vulkan: refactor error info

src/libANGLE/renderer/vulkan/DisplayVk.cpp

@@ -26,6 +26,7 @@ DisplayVk::DisplayVk(const egl::DisplayState &state)
     : DisplayImpl(state),
       vk::Context(new RendererVk()),
       mScratchBuffer(1000u),
+      mSavedError({VK_SUCCESS, "", "", 0}),
       mHasSurfaceWithRobustInit(false)
 {}
 
@@ -267,14 +268,15 @@ void DisplayVk::handleError(VkResult result,
 {
     ASSERT(result != VK_SUCCESS);
 
-    std::stringstream errorStream;
-    errorStream << "Internal Vulkan error (" << result << "): " << VulkanResultString(result)
-                << ", in " << file << ", " << function << ":" << line << ".";
-    mStoredErrorString = errorStream.str();
+    mSavedError.mErrorCode = result;
+    mSavedError.mFile      = file;
+    mSavedError.mFunction  = function;
+    mSavedError.mLine      = line;
 
     if (result == VK_ERROR_DEVICE_LOST)
     {
-        WARN() << mStoredErrorString;
+        WARN() << "Internal Vulkan error (" << result << "): " << VulkanResultString(result)
+               << ", in " << file << ", " << function << ":" << line << ".";
         mRenderer->notifyDeviceLost();
     }
 }
@@ -282,7 +284,14 @@ void DisplayVk::handleError(VkResult result,
 // TODO(jmadill): Remove this. http://anglebug.com/3041
 egl::Error DisplayVk::getEGLError(EGLint errorCode)
 {
-    return egl::Error(errorCode, 0, std::move(mStoredErrorString));
+    std::stringstream errorStream;
+    errorStream << "Internal Vulkan error (" << mSavedError.mErrorCode
+                << "): " << VulkanResultString(mSavedError.mErrorCode) << ", in "
+                << mSavedError.mFile << ", " << mSavedError.mFunction << ":" << mSavedError.mLine
+                << ".";
+    std::string errorString = errorStream.str();
+
+    return egl::Error(errorCode, 0, std::move(errorString));
 }
 
 void DisplayVk::populateFeatureList(angle::FeatureList *features)

src/libANGLE/renderer/vulkan/DisplayVk.h

@@ -140,7 +140,7 @@ class DisplayVk : public DisplayImpl, public vk::Context
 
     mutable angle::ScratchBuffer mScratchBuffer;
 
-    std::string mStoredErrorString;
+    vk::Error mSavedError;
     bool mHasSurfaceWithRobustInit;
 };
 

src/libANGLE/renderer/vulkan/vk_utils.h

@@ -151,6 +151,14 @@ void AddToPNextChain(VulkanStruct1 *chainStart, VulkanStruct2 *ptr)
     localPtr->pNext              = reinterpret_cast<VkBaseOutStructure *>(ptr);
 }
 
+struct Error
+{
+    VkResult mErrorCode;
+    const char *mFile;
+    const char *mFunction;
+    unsigned int mLine;
+};
+
 // Abstracts error handling. Implemented by both ContextVk for GL and DisplayVk for EGL errors.
 class Context : angle::NonCopyable
 {