Capture: Write captured context for empty frames

src/libANGLE/capture/FrameCapture.cpp

@@ -1122,6 +1122,7 @@ void WriteCppReplay(bool compression,
         out << "{\n";
     }
 
+    if (!frameCalls.empty())
     {
         std::stringstream callStream;
 
@@ -4696,13 +4697,18 @@ void FrameCapture::onEndFrame(const gl::Context *context)
     }
 
     // Note that we currently capture before the start frame to collect shader and program sources.
-    if (!mFrameCalls.empty() && isCaptureActive())
+    if (isCaptureActive())
     {
         if (mIsFirstFrame)
         {
             mCaptureStartFrame = mFrameIndex;
             mIsFirstFrame      = false;
         }
+
+        if (!mFrameCalls.empty())
+        {
+            mActiveFrameIndices.push_back(getReplayFrameIndex());
+        }
         WriteCppReplay(mCompression, mOutDirectory, context, mCaptureLabel, getReplayFrameIndex(),
                        getFrameCount(), mFrameCalls, mSetupCalls, &mResourceTracker, &mBinaryData,
                        mClientArraySizes, mReadBufferSize, mSerializeStateEnabled);
@@ -5098,7 +5104,7 @@ void FrameCapture::writeCppReplayIndexFiles(const gl::Context *context, bool wri
     source << "{\n";
     source << "    switch (frameIndex)\n";
     source << "    {\n";
-    for (uint32_t frameIndex = 1; frameIndex <= frameCount; ++frameIndex)
+    for (uint32_t frameIndex : mActiveFrameIndices)
     {
         source << "        case " << frameIndex << ":\n";
         source << "            " << FmtReplayFunction(contextId, frameIndex) << ";\n";

src/libANGLE/capture/FrameCapture.h

@@ -434,6 +434,7 @@ class FrameCapture final : angle::NonCopyable
     uint32_t mCaptureTrigger;
 
     bool mCaptureActive = false;
+    std::vector<uint32_t> mActiveFrameIndices;
 };
 
 // Shared class for any items that need to be tracked by FrameCapture across shared contexts

src/tests/capture_replay_tests/capture_replay_expectations.txt

@@ -60,7 +60,6 @@ LineLoopTest.DISABLED_DrawArraysWithLargeCount/*
 MipmapTest.DISABLED_ThreeLevelsInitData/*
 
 # Compile failed tests
-RobustResourceInitTest.SurfaceInitializedAfterSwap/*
 
 # ES1 comparison failed tests
 BootAnimationTest.DefaultBootAnimation/*