Capture/Replay: Fixups for draw surface

Ran into these two problems while capturing gfxbench and trying to replay in the sample. Test: Capture and replay sample of gfxbench Bug: b/159238311 Change-Id: I1c873cbf2e297b5299581a7ffc2b1273e2d4c18a Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2265287Reviewed-by: Manh Nguyen <nguyenmh@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Cody Northrop <cnorthrop@google.com>

Capture/Replay: Fixups for draw surface
ea706304 · Cody Northrop · Commit Bot · 259221d5 · ea706304
Commit ea706304 authored Jun 24, 2020 by Cody Northrop Committed by Commit Bot Jun 25, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

FrameCapture.cpp src/libANGLE/FrameCapture.cpp +4 -0

No files found.
--- a/src/libANGLE/FrameCapture.cpp
+++ b/src/libANGLE/FrameCapture.cpp
@@ -928,6 +928,7 @@ void WriteCppReplayIndexFiles(bool compression,
    header << "#pragma once\n";
    header << "\n";
    header << "#include \"util/gles_loader_autogen.h\"\n";
+    header << "#include \"util/egl_loader_autogen.h\"\n";
    header << "\n";
    header << "#include <cstdint>\n";
    header << "#include <cstdio>\n";
@@ -3902,6 +3903,9 @@ void FrameCapture::onEndFrame(const gl::Context *context)
 void FrameCapture::onMakeCurrent(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();