Capture: Serialize only the content of initialized attachments

If a resource is marked MayNeedInit, then we don't serialize it but mark the data as not initialized. Bug: angleproject:6041 Change-Id: If3d3431a58848f7835692fe10b30fab68c901d8a Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2976657Reviewed-by: Cody Northrop <cnorthrop@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Gert Wollny <gert.wollny@collabora.com>

Capture: Serialize only the content of initialized attachments
41f86f35 · Gert Wollny · Angle LUCI CQ · ac795859 · 41f86f35
Commit 41f86f35 authored Jun 22, 2021 by Gert Wollny Committed by Angle LUCI CQ Jun 23, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 4 deletions

frame_capture_utils.cpp src/libANGLE/capture/frame_capture_utils.cpp +12 -4

No files found.
--- a/src/libANGLE/capture/frame_capture_utils.cpp
+++ b/src/libANGLE/capture/frame_capture_utils.cpp
@@ -398,10 +398,18 @@ Result SerializeFramebufferAttachment(const gl::Context *context,
            framebuffer->setReadBuffer(framebufferAttachment.getBinding());
            ANGLE_TRY(framebuffer->syncState(context, GL_FRAMEBUFFER, gl::Command::Other));
        }
-        MemoryBuffer *pixelsPtr = nullptr;
-        ANGLE_TRY(ReadPixelsFromAttachment(context, framebuffer, framebufferAttachment,
+        if (framebufferAttachment.initState() == gl::InitState::Initialized)
-                                           scratchBuffer, &pixelsPtr));
+        {
-        json->addBlob("Data", pixelsPtr->data(), pixelsPtr->size());
+            MemoryBuffer *pixelsPtr = nullptr;
+            ANGLE_TRY(ReadPixelsFromAttachment(context, framebuffer, framebufferAttachment,
+                                               scratchBuffer, &pixelsPtr));
+            json->addBlob("Data", pixelsPtr->data(), pixelsPtr->size());
+        }
+        else
+        {
+            json->addCString("Data", "Not initialized");
+        }
        // Reset framebuffer state
        framebuffer->setReadBuffer(prevReadBufferState);
    }