Capture/Replay: Update CaptureReplay sample for compression

samples/BUILD.gn

@@ -58,9 +58,10 @@ template("angle_sample") {
                            [
                              "cflags",
                              "defines",
+                             "deps",
                              "sources",
                            ])
-    deps = [ ":sample_util" ]
+    deps += [ ":sample_util" ]
     if (defined(invoker.data)) {
       deps += [ ":${target_name}_data" ]
     }
@@ -71,6 +72,10 @@ template("angle_sample") {
   }
 }
 
+set_defaults("angle_sample") {
+  deps = []
+}
+
 angle_sample("hello_triangle") {
   sources = [ "hello_triangle/HelloTriangle.cpp" ]
 }
@@ -188,6 +193,8 @@ if (angle_build_capture_replay_sample) {
           "capture_replay/angle_capture_context${_contextid}.h",
         ]
 
+    deps = [ "$angle_root:angle_compression" ]
+
     _data_path = rebase_path("capture_replay", root_out_dir)
     defines = [
       "ANGLE_CAPTURE_REPLAY_SAMPLE_DATA_DIR=\"${_data_path}\"",

samples/capture_replay/CaptureReplay.cpp

@@ -9,6 +9,8 @@
 
 #include <functional>
 
+#include "util/frame_capture_utils.h"
+
 #define ANGLE_MACRO_STRINGIZE_AUX(a) #a
 #define ANGLE_MACRO_STRINGIZE(a) ANGLE_MACRO_STRINGIZE_AUX(a)
 #define ANGLE_MACRO_CONCAT_AUX(a, b) a##b
@@ -39,6 +41,10 @@ class CaptureReplaySample : public SampleApplication
         std::string exeDir = angle::GetExecutableDirectory();
         if (!angle::SetCWD(exeDir.c_str()))
             return false;
+        if (kIsBinaryDataCompressed)
+        {
+            SetBinaryDataDecompressCallback(angle::DecompressBinaryData);
+        }
         SetBinaryDataDir(ANGLE_CAPTURE_REPLAY_SAMPLE_DATA_DIR);
         SetupContextReplay();
 

src/libANGLE/FrameCapture.cpp

@@ -961,12 +961,22 @@ void WriteCppReplayIndexFiles(bool compression,
     source << "    fseek(fp, 0, SEEK_SET);\n";
     source << "    if (gDecompressCallback)\n";
     source << "    {\n";
+    source << "        if (!strstr(fileName, \".gz\"))\n";
+    source << "        {\n";
+    source << "            fprintf(stderr, \"Filename does not end in .gz\");\n";
+    source << "            exit(1);\n";
+    source << "        }\n";
     source << "        std::vector<uint8_t> compressedData(size);\n";
     source << "        (void)fread(compressedData.data(), 1, size, fp);\n";
     source << "        gBinaryData = gDecompressCallback(compressedData);\n";
     source << "    }\n";
     source << "    else\n";
     source << "    {\n";
+    source << "        if (!strstr(fileName, \".angledata\"))\n";
+    source << "        {\n";
+    source << "            fprintf(stderr, \"Filename does not end in .angledata\");\n";
+    source << "            exit(1);\n";
+    source << "        }\n";
     source << "        gBinaryData = new uint8_t[size];\n";
     source << "        (void)fread(gBinaryData, 1, size, fp);\n";
     source << "    }\n";

src/tests/perf_tests/TracePerfTest.cpp

@@ -13,6 +13,7 @@
 #include "tests/perf_tests/ANGLEPerfTest.h"
 #include "tests/perf_tests/DrawCallPerfParams.h"
 #include "util/egl_loader_autogen.h"
+#include "util/frame_capture_utils.h"
 
 #include "restricted_traces/manhattan_10/manhattan_10_capture_context1.h"
 #include "restricted_traces/trex_200/trex_200_capture_context1.h"
@@ -21,9 +22,6 @@
 #include <functional>
 #include <sstream>
 
-#define USE_SYSTEM_ZLIB
-#include "compression_utils_portable.h"
-
 using namespace angle;
 using namespace egl_platform;
 
@@ -31,26 +29,6 @@ namespace
 {
 void FramebufferChangeCallback(void *userData, GLenum target, GLuint framebuffer);
 
-ANGLE_MAYBE_UNUSED uint8_t *DecompressBinaryData(const std::vector<uint8_t> &compressedData)
-{
-    uint32_t uncompressedSize =
-        zlib_internal::GetGzipUncompressedSize(compressedData.data(), compressedData.size());
-
-    std::unique_ptr<uint8_t[]> uncompressedData(new uint8_t[uncompressedSize]);
-    uLong destLen = uncompressedSize;
-    int zResult =
-        zlib_internal::GzipUncompressHelper(uncompressedData.get(), &destLen, compressedData.data(),
-                                            static_cast<uLong>(compressedData.size()));
-
-    if (zResult != Z_OK)
-    {
-        std::cerr << "Failure to decompressed binary data: " << zResult << "\n";
-        return nullptr;
-    }
-
-    return uncompressedData.release();
-}
-
 enum class TracePerfTestID
 {
     Manhattan10,

util/BUILD.gn

@@ -15,6 +15,7 @@ _util_sources = [
   "OSWindow.cpp",
   "OSWindow.h",
   "com_utils.h",
+  "frame_capture_utils.h",
   "geometry_utils.cpp",
   "geometry_utils.h",
   "keyboard.h",

util/frame_capture_utils.h

+//
+// Copyright 2020 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// frame_capture_utils:
+//   Helper functions for capture and replay of traces.
+//
+
+#ifndef UTIL_FRAME_CAPTURE_UTILS_H_
+#define UTIL_FRAME_CAPTURE_UTILS_H_
+
+#include <iostream>
+#include <memory>
+#include <vector>
+
+#include "common/angleutils.h"
+
+#define USE_SYSTEM_ZLIB
+#include "compression_utils_portable.h"
+
+namespace angle
+{
+
+inline uint8_t *DecompressBinaryData(const std::vector<uint8_t> &compressedData)
+{
+    uint32_t uncompressedSize =
+        zlib_internal::GetGzipUncompressedSize(compressedData.data(), compressedData.size());
+
+    std::unique_ptr<uint8_t[]> uncompressedData(new uint8_t[uncompressedSize]);
+    uLong destLen = uncompressedSize;
+    int zResult =
+        zlib_internal::GzipUncompressHelper(uncompressedData.get(), &destLen, compressedData.data(),
+                                            static_cast<uLong>(compressedData.size()));
+
+    if (zResult != Z_OK)
+    {
+        std::cerr << "Failure to decompressed binary data: " << zResult << "\n";
+        return nullptr;
+    }
+
+    return uncompressedData.release();
+}
+
+}  // namespace angle
+
+#endif  // UTIL_FRAME_CAPTURE_UTILS_H_