Expose 2 symbols from android_main

android/framework/decode/CMakeLists.txt

@@ -28,6 +28,8 @@ target_sources(gfxrecon_decode
                    ${GFXRECON_SOURCE_DIR}/framework/decode/handle_pointer_decoder.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/json_writer.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/json_writer.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/mark_injected_commands.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/mark_injected_commands.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/decode/pointer_decoder_base.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/pointer_decoder.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/portability.h

framework/decode/CMakeLists.txt

@@ -74,6 +74,8 @@ target_sources(gfxrecon_decode
                     ${CMAKE_CURRENT_LIST_DIR}/json_writer.cpp
                     ${CMAKE_CURRENT_LIST_DIR}/decode_json_util.h
                     ${CMAKE_CURRENT_LIST_DIR}/decode_json_util.cpp
+                    ${CMAKE_CURRENT_LIST_DIR}/mark_injected_commands.h
+                    ${CMAKE_CURRENT_LIST_DIR}/mark_injected_commands.cpp
                     ${CMAKE_CURRENT_LIST_DIR}/pointer_decoder_base.h
                     ${CMAKE_CURRENT_LIST_DIR}/pointer_decoder.h
                     ${CMAKE_CURRENT_LIST_DIR}/portability.h

framework/decode/file_processor.cpp

@@ -47,7 +47,7 @@ const uint32_t kFirstFrame = 0;
 FileProcessor::FileProcessor() :
     current_frame_number_(kFirstFrame), error_state_(kErrorInvalidFileDescriptor), bytes_read_(0),
     annotation_handler_(nullptr), compressor_(nullptr), block_index_(0), api_call_index_(0), block_limit_(0),
-    capture_uses_frame_markers_(false), first_frame_(kFirstFrame + 1)
+    capture_uses_frame_markers_(false), first_frame_(kFirstFrame + 1), loading_trimmed_capture_state_(false)
 {}
 
 FileProcessor::FileProcessor(uint64_t block_limit) : FileProcessor()
@@ -2167,11 +2167,13 @@ bool FileProcessor::ProcessStateMarker(const format::BlockHeader& block_header,
         if (marker_type == format::kBeginMarker)
         {
             GFXRECON_LOG_INFO("Loading state for captured frame %" PRId64, frame_number);
+            loading_trimmed_capture_state_ = true;
         }
         else if (marker_type == format::kEndMarker)
         {
             GFXRECON_LOG_INFO("Finished loading state for captured frame %" PRId64, frame_number);
-            first_frame_ = frame_number;
+            first_frame_                   = frame_number;
+            loading_trimmed_capture_state_ = false;
         }
 
         for (auto decoder : decoders_)

framework/decode/file_processor.h

@@ -98,6 +98,10 @@ class FileProcessor
 
     uint32_t GetCurrentFrameNumber() const { return current_frame_number_; }
 
+    uint64_t GetCurrentBlockIndex() const { return block_index_; }
+
+    bool GetLoadingTrimmedState() const { return loading_trimmed_capture_state_; }
+
     uint64_t GetNumBytesRead() const { return bytes_read_; }
 
     Error GetErrorState() const { return error_state_; }
@@ -238,6 +242,7 @@ class FileProcessor
     bool                                enable_print_block_info_{ false };
     int64_t                             block_index_from_{ 0 };
     int64_t                             block_index_to_{ 0 };
+    bool                                loading_trimmed_capture_state_;
 
     struct ActiveFiles
     {

framework/decode/mark_injected_commands.cpp

@@ -0,0 +1,75 @@
+/*
+** Copyright (c) 2024 Valve Corporation
+** Copyright (c) 2024 LunarG, Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and associated documentation files (the "Software"),
+** to deal in the Software without restriction, including without limitation
+** the rights to use, copy, modify, merge, publish, distribute, sublicense,
+** and/or sell copies of the Software, and to permit persons to whom the
+** Software is furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+** FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+*/
+
+#include "util/defines.h"
+#include "util/logging.h"
+#include "mark_injected_commands.h"
+
+GFXRECON_BEGIN_NAMESPACE(gfxrecon)
+GFXRECON_BEGIN_NAMESPACE(decode)
+
+static void BeginEndInjectedCommandsNoop(void* data)
+{
+    GFXRECON_UNREFERENCED_PARAMETER(data);
+}
+
+#ifdef GFXRECON_DEBUG_BUILD
+static bool injecting_api_calls_g = false;
+#endif
+
+static PFN_BeginInjectedCommands BeginInjectCommands_fp = BeginEndInjectedCommandsNoop;
+static PFN_EndInjectedCommands   EndInjectCommands_fp   = BeginEndInjectedCommandsNoop;
+static void*                     InjectCommandsData_ptr = nullptr;
+
+extern "C" void
+SetInjectedCommandCallbacks(PFN_BeginInjectedCommands begin_fp, PFN_EndInjectedCommands end_fp, void* data)
+{
+    BeginInjectCommands_fp = begin_fp != nullptr ? begin_fp : BeginEndInjectedCommandsNoop;
+    EndInjectCommands_fp   = end_fp != nullptr ? end_fp : BeginEndInjectedCommandsNoop;
+    InjectCommandsData_ptr = data;
+}
+
+void BeginInjectedCommands()
+{
+#ifdef GFXRECON_DEBUG_BUILD
+    // Nested BeginInjectedCommands/EndInjectedCommands
+    GFXRECON_ASSERT(!injecting_api_calls_g);
+    injecting_api_calls_g = true;
+#endif
+
+    BeginInjectCommands_fp(InjectCommandsData_ptr);
+}
+
+void EndInjectedCommands()
+{
+#ifdef GFXRECON_DEBUG_BUILD
+    // Nested BeginInjectedCommands/EndInjectedCommands
+    GFXRECON_ASSERT(injecting_api_calls_g);
+    injecting_api_calls_g = false;
+#endif
+
+    EndInjectCommands_fp(InjectCommandsData_ptr);
+}
+
+GFXRECON_END_NAMESPACE(decode)
+GFXRECON_END_NAMESPACE(gfxrecon)

framework/decode/mark_injected_commands.h

@@ -0,0 +1,48 @@
+/*
+** Copyright (c) 2024 Valve Corporation
+** Copyright (c) 2024 LunarG, Inc.
+**
+** Permission is hereby granted, free of charge, to any person obtaining a
+** copy of this software and associated documentation files (the "Software"),
+** to deal in the Software without restriction, including without limitation
+** the rights to use, copy, modify, merge, publish, distribute, sublicense,
+** and/or sell copies of the Software, and to permit persons to whom the
+** Software is furnished to do so, subject to the following conditions:
+**
+** The above copyright notice and this permission notice shall be included in
+** all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+** FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+** DEALINGS IN THE SOFTWARE.
+*/
+
+#include "util/defines.h"
+
+GFXRECON_BEGIN_NAMESPACE(gfxrecon)
+GFXRECON_BEGIN_NAMESPACE(decode)
+
+using PFN_BeginInjectedCommands       = void (*)(void*);
+using PFN_EndInjectedCommands         = void (*)(void*);
+using PFN_SetInjectedCommandCallbacks = void (*)(PFN_BeginInjectedCommands, PFN_EndInjectedCommands, void*);
+
+// Interface for registering callbacks so that GFXReconstruct can notify an external library about
+// generated API calls that are not included in the capture file.
+// Intended usage: GFXR will call PFN_BeginInjectedCommands once before it starts issuing synthesized
+// API calls, and PFN_EndInjectedCommands once it is finished.
+// A void * pointer allows passing optional data that will be forwared into both callbacks.
+//
+// SetInjectedCommandCallbacks can be discovered through dlsym/GetProcAddress.
+extern "C" void
+SetInjectedCommandCallbacks(PFN_BeginInjectedCommands begin_fp, PFN_EndInjectedCommands end_fp, void* data);
+
+void BeginInjectedCommands();
+
+void EndInjectedCommands();
+
+GFXRECON_END_NAMESPACE(decode)
+GFXRECON_END_NAMESPACE(gfxrecon)