FrameCapture: Track surface width/height per context

src/libANGLE/Context.cpp

@@ -673,7 +673,7 @@ egl::Error Context::makeCurrent(egl::Display *display,
         mHasBeenCurrent = true;
     }
 
-    mFrameCapture->onMakeCurrent(drawSurface);
+    mFrameCapture->onMakeCurrent(this, drawSurface);
 
     // TODO(jmadill): Rework this when we support ContextImpl
     mState.setAllDirtyBits();

src/libANGLE/FrameCapture.cpp

@@ -1185,8 +1185,7 @@ void WriteCppReplayIndexFiles(bool compression,
                               const gl::ContextID contextId,
                               const std::string &captureLabel,
                               uint32_t frameCount,
-                              EGLint drawSurfaceWidth,
-                              EGLint drawSurfaceHeight,
+                              const SurfaceDimensions &drawSurfaceDimensions,
                               size_t readBufferSize,
                               const gl::AttribArray<size_t> &clientArraySizes,
                               const HasResourceTypeMap &hasResourceType,
@@ -1230,8 +1229,10 @@ void WriteCppReplayIndexFiles(bool compression,
     header << " " << ANGLE_REVISION << "\n";
     header << "constexpr uint32_t kReplayFrameStart = 1;\n";
     header << "constexpr uint32_t kReplayFrameEnd = " << frameCount << ";\n";
-    header << "constexpr EGLint kReplayDrawSurfaceWidth = " << drawSurfaceWidth << ";\n";
-    header << "constexpr EGLint kReplayDrawSurfaceHeight = " << drawSurfaceHeight << ";\n";
+    header << "constexpr EGLint kReplayDrawSurfaceWidth = "
+           << drawSurfaceDimensions.at(contextId).width << ";\n";
+    header << "constexpr EGLint kReplayDrawSurfaceHeight = "
+           << drawSurfaceDimensions.at(contextId).height << ";\n";
     header << "constexpr EGLint kDefaultFramebufferRedBits = "
            << (config ? std::to_string(config->redSize) : "EGL_DONT_CARE") << ";\n";
     header << "constexpr EGLint kDefaultFramebufferGreenBits = "
@@ -4379,10 +4380,10 @@ void FrameCapture::onEndFrame(const gl::Context *context)
         if (mFrameIndex == mCaptureEndFrame)
         {
             // Save the index files after the last frame.
-            WriteCppReplayIndexFiles(
-                mCompression, mOutDirectory, context->id(), mCaptureLabel, getFrameCount(),
-                mDrawSurfaceWidth, mDrawSurfaceHeight, mReadBufferSize, mClientArraySizes,
-                mHasResourceType, mSerializeStateEnabled, false, context->getConfig(), mBinaryData);
+            WriteCppReplayIndexFiles(mCompression, mOutDirectory, context->id(), mCaptureLabel,
+                                     getFrameCount(), mDrawSurfaceDimensions, mReadBufferSize,
+                                     mClientArraySizes, mHasResourceType, mSerializeStateEnabled,
+                                     false, context->getConfig(), mBinaryData);
             if (!mBinaryData.empty())
             {
                 SaveBinaryData(mCompression, mOutDirectory, context->id(), mCaptureLabel,
@@ -4431,9 +4432,9 @@ void FrameCapture::onDestroyContext(const gl::Context *context)
         mFrameIndex -= 1;
         mCaptureEndFrame = mFrameIndex;
         WriteCppReplayIndexFiles(mCompression, mOutDirectory, context->id(), mCaptureLabel,
-                                 getFrameCount(), mDrawSurfaceWidth, mDrawSurfaceHeight,
-                                 mReadBufferSize, mClientArraySizes, mHasResourceType,
-                                 mSerializeStateEnabled, true, context->getConfig(), mBinaryData);
+                                 getFrameCount(), mDrawSurfaceDimensions, mReadBufferSize,
+                                 mClientArraySizes, mHasResourceType, mSerializeStateEnabled, true,
+                                 context->getConfig(), mBinaryData);
         if (!mBinaryData.empty())
         {
             SaveBinaryData(mCompression, mOutDirectory, context->id(), mCaptureLabel, mBinaryData);
@@ -4443,15 +4444,14 @@ void FrameCapture::onDestroyContext(const gl::Context *context)
     }
 }
 
-void FrameCapture::onMakeCurrent(const egl::Surface *drawSurface)
+void FrameCapture::onMakeCurrent(const gl::Context *context, const egl::Surface *drawSurface)
 {
     if (!drawSurface)
         return;
 
     // Track the width and height of the draw surface as provided to makeCurrent
-    // TODO (b/159238311): Track this per context. Right now last one wins.
-    mDrawSurfaceWidth  = drawSurface->getWidth();
-    mDrawSurfaceHeight = drawSurface->getHeight();
+    mDrawSurfaceDimensions[context->id()] =
+        gl::Extents(drawSurface->getWidth(), drawSurface->getHeight(), 1);
 }
 
 DataCounters::DataCounters() = default;

src/libANGLE/FrameCapture.h

@@ -301,6 +301,9 @@ using ProgramSourceMap = std::map<gl::ShaderProgramID, ProgramSources>;
 using TextureLevels       = std::map<GLint, std::vector<uint8_t>>;
 using TextureLevelDataMap = std::map<gl::TextureID, TextureLevels>;
 
+// Map from ContextID to surface dimensions
+using SurfaceDimensions = std::map<gl::ContextID, gl::Extents>;
+
 class FrameCapture final : angle::NonCopyable
 {
   public:
@@ -311,7 +314,7 @@ class FrameCapture final : angle::NonCopyable
     void checkForCaptureTrigger();
     void onEndFrame(const gl::Context *context);
     void onDestroyContext(const gl::Context *context);
-    void onMakeCurrent(const egl::Surface *drawSurface);
+    void onMakeCurrent(const gl::Context *context, const egl::Surface *drawSurface);
     bool enabled() const { return mEnabled; }
 
     bool isCapturing() const;
@@ -364,8 +367,7 @@ class FrameCapture final : angle::NonCopyable
     uint32_t mCaptureEndFrame;
     bool mIsFirstFrame   = true;
     bool mWroteIndexFile = false;
-    EGLint mDrawSurfaceWidth  = 0;
-    EGLint mDrawSurfaceHeight = 0;
+    SurfaceDimensions mDrawSurfaceDimensions;
     gl::AttribArray<size_t> mClientArraySizes;
     size_t mReadBufferSize;
     HasResourceTypeMap mHasResourceType;

src/libANGLE/FrameCapture_mock.cpp

@@ -24,7 +24,7 @@ ResourceTracker::~ResourceTracker() {}
 FrameCapture::FrameCapture() {}
 FrameCapture::~FrameCapture() {}
 void FrameCapture::onEndFrame(const gl::Context *context) {}
-void FrameCapture::onMakeCurrent(const egl::Surface *drawSurface) {}
+void FrameCapture::onMakeCurrent(const gl::Context *context, const egl::Surface *drawSurface) {}
 void FrameCapture::onDestroyContext(const gl::Context *context) {}
 void FrameCapture::replay(gl::Context *context) {}