Capture/Replay: Update headers.

Instead of including "angle_trace_gl.h" in shared capture header we can include it in each cpp file. This prevents a header conflict with the "old" way of using the util GL loader. Bug: angleproject:4845 Change-Id: Ia00a2beffc77446c779ceec8995fce9704e7b8af Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2315625Reviewed-by: Manh Nguyen <nguyenmh@google.com> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Capture/Replay: Update headers.
07ae186b · Jamie Madill · Commit Bot · 8adc5469 · 07ae186b
Commit 07ae186b authored Jul 24, 2020 by Jamie Madill Committed by Commit Bot Jul 26, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

FrameCapture.cpp src/libANGLE/FrameCapture.cpp +3 -1

No files found.
--- a/src/libANGLE/FrameCapture.cpp
+++ b/src/libANGLE/FrameCapture.cpp
@@ -992,7 +992,8 @@ void WriteCppReplayIndexFiles(bool compression,

    header << "#pragma once\n";
    header << "\n";
-    header << "#include \"angle_trace_gl.h\"\n";
+    header << "#include <EGL/egl.h>\n";
+    header << "#include \"angle_gl.h\"\n";
    header << "\n";
    header << "#include <cstdint>\n";
    header << "#include <cstdio>\n";
@@ -1071,6 +1072,7 @@ void WriteCppReplayIndexFiles(bool compression,
    header << "extern uint8_t *gBinaryData;\n";

    source << "#include \"" << FmtCapturePrefix(contextId, captureLabel) << ".h\"\n";
+    source << "#include \"angle_trace_gl.h\"\n";
    source << "\n";

    if (!captureLabel.empty())