Merge branch 'dev' into query-commands

Author: dnlbaines

CMakeLists.txt

@@ -311,10 +311,6 @@ if (APPLE)
             ${CMAKE_PREFIX_PATH})
 endif ()
 
-if(ANDROID)
-    add_link_options(-Wl,-z,max-page-size=16384)
-endif()
-
 # GFXReconstruct provided find modules
 if (WIN32)
     find_package(Detours)

USAGE_android.md

@@ -798,6 +798,8 @@ usage: gfxrecon.py replay [-h] [-p LOCAL_FILE] [--version] [--log-level LEVEL]
                           [--serialize-render-passes]
                           [--wait-before-frame MILLISECONDS]
                           [--serialize-queue-submissions]
+                          [--replay-event-plugin-path PATH]
+                          [--replay-event-plugin-params PARAMS]
                           [file]
 
 Launch the replay tool.
@@ -1033,6 +1035,14 @@ options:
                         `vkQueueSubmit2` call by adding semaphores between
                         consecutive submits during replay.
                         (forwarded to replay tool)
+  --replay-event-plugin-path PATH
+                        Path to a replay event plugin library. If specified, the
+                        plugin will be loaded and used to process replay events.
+                        (forwarded to replay tool)
+  --replay-event-plugin-params PARAMS
+                        Parameters to forward to the replay event plugin. The format
+                        of the parameters is determined by the plugin and is not
+                        interpreted by the replay tool. (forwarded to replay tool)
 ```
 
 The command will force-stop an active replay process before starting the replay

USAGE_desktop_Vulkan.md

@@ -638,6 +638,7 @@ gfxrecon-replay         [-h | --help] [--version] [--cpu-mask <binary-mask>] [--
                         [--idle-before-submit] [--serialize-render-passes]
                         [--wait-before-frame MILLISECONDS]
                         [--serialize-queue-submissions]
+                        [--replay-event-plugin-path <path>] [--replay-event-plugin-params <params>]
 
 
 Required arguments:
@@ -895,6 +896,14 @@ Optional arguments:
               Serialize submit entries within one `vkQueueSubmit` or
               `vkQueueSubmit2` call by adding semaphores between consecutive
               submits during replay.
+  --replay-event-plugin-path <path>
+              Path to a replay event plugin library. If specified, the
+              plugin will be loaded and used to process replay events.
+              (forwarded to replay tool)
+  --replay-event-plugin-params <params>
+              Parameters to forward to the replay event plugin. The format
+              of the parameters is determined by the plugin and is not
+              interpreted by the replay tool. (forwarded to replay tool)
 ```
 
 ### Frame Warm-Up

android/framework/application-multi-win/CMakeLists.txt

@@ -32,6 +32,7 @@ target_link_libraries(gfxrecon_application_multiwin
                       gfxrecon_graphics
                       gfxrecon_format
                       gfxrecon_util
+                      gfxrecon_replay_event_plugin_loader
                       native_app_glue
                       vulkan_registry
                       platform_specific)

android/framework/application/CMakeLists.txt

@@ -27,6 +27,7 @@ target_link_libraries(gfxrecon_application
                       gfxrecon_graphics
                       gfxrecon_format
                       gfxrecon_util
+                      gfxrecon_replay_event_plugin_loader
                       native_app_glue
                       vulkan_registry
                       platform_specific)

android/framework/decode/CMakeLists.txt

@@ -5,6 +5,8 @@ target_sources(gfxrecon_decode
                    ${GFXRECON_SOURCE_DIR}/framework/decode/annotation_handler.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/api_decoder.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/api_payload.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/async_processor.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/async_processor.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/decode/block_allocator.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/block_allocator.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/decode/block_buffer.h
@@ -37,6 +39,8 @@ target_sources(gfxrecon_decode
                    ${GFXRECON_SOURCE_DIR}/framework/decode/descriptor_update_template_decoder.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/decode/file_processor.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/file_processor.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/file_processor_types.h
+                   ${GFXRECON_SOURCE_DIR}/framework/decode/file_processor_visitors.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/preload_file_processor.h
                    ${GFXRECON_SOURCE_DIR}/framework/decode/preload_file_processor.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/decode/file_transformer.h
@@ -196,6 +200,8 @@ target_sources(gfxrecon_decode
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_pnext_struct_decoder.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_replay_consumer.h
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_replay_consumer.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_replay_frame_loop_consumer_base.h
+                   ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_replay_frame_loop_consumer_base.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_replay_dump_resources.h
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_replay_dump_resources.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/generated/generated_vulkan_struct_decoders_forward.h
@@ -225,6 +231,7 @@ target_link_libraries(gfxrecon_decode
                       gfxrecon_graphics
                       gfxrecon_format
                       gfxrecon_util
+                      gfxrecon_replay_event_plugin_loader
                       vulkan_registry
                       vulkan_memory_allocator
                       platform_specific

android/framework/util/CMakeLists.txt

@@ -74,6 +74,7 @@ target_sources(gfxrecon_util
                    ${GFXRECON_SOURCE_DIR}/framework/util/strings.cpp
                    ${GFXRECON_SOURCE_DIR}/framework/util/thread_data.h
                    ${GFXRECON_SOURCE_DIR}/framework/util/thread_data.cpp
+                   ${GFXRECON_SOURCE_DIR}/framework/util/thread_safe_queue.h
                    ${GFXRECON_SOURCE_DIR}/framework/util/type_traits_extras.h
                    ${GFXRECON_SOURCE_DIR}/framework/util/to_string.h
                    ${GFXRECON_SOURCE_DIR}/framework/util/to_string.cpp

android/scripts/gfxrecon.py

@@ -153,6 +153,8 @@ def CreateReplayParser():
     parser.add_argument('--frame-warm-up-load', metavar='LOAD', default=0, help='Specify workload scale factor for a compute dispatch warm-up pass run before each frame replay. Default is 0 (disabled). (forwarded to replay tool)')
     parser.add_argument('--wait-before-frame', metavar='MILLISECONDS', default=0, help='Wait for the specified amount of milliseconds before starting to replay each frame. Default is 0 (no wait). (forwarded to replay tool)')
     parser.add_argument('--serialize-queue-submissions', action='store_true', default=False, help='Serialize submit entries within one vkQueueSubmit or vkQueueSubmit2 call by adding semaphores between consecutive submits during replay. (forwarded to replay tool)')
+    parser.add_argument('--replay-event-plugin-path', metavar='PATH', help='Path to a replay event plugin library. If specified, the plugin will be loaded and used to process replay events. (forwarded to replay tool)')
+    parser.add_argument('--replay-event-plugin-params', metavar='PARAMS', help='Parameters to forward to the replay event plugin. The format of the parameters is determined by the plugin and is not interpreted by the replay tool. (forwarded to replay tool)')
 
     return parser
 
@@ -365,6 +367,14 @@ def MakeExtrasString(args):
         arg_list.append('--wait-before-frame')
         arg_list.append('{}'.format(args.wait_before_frame))
 
+    if args.replay_event_plugin_path:
+        arg_list.append('--replay-event-plugin-path')
+        arg_list.append('{}'.format(args.replay_event_plugin_path))
+
+    if args.replay_event_plugin_params:
+        arg_list.append('--replay-event-plugin-params')
+        arg_list.append('{}'.format(args.replay_event_plugin_params))
+
     if args.file:
         arg_list.append(args.file)
     elif not args.version:

android/test/test_apps/common/CMakeLists.txt

@@ -36,6 +36,7 @@ target_include_directories(gfxrecon-testapp-base
 set(FRAMEWORK_DIR ${GFXRECON_ANDROID_DIR}/framework)
 set(GFXRECON_ANDROID_TEST_APPS_DIR ${CMAKE_SOURCE_DIR}/..)
 add_subdirectory(${FRAMEWORK_DIR}/util ${FRAMEWORK_DIR}/util/build/${ANDROID_ABI})
+add_subdirectory(${GFXRECON_SOURCE_DIR}/framework/plugin ${FRAMEWORK_DIR}/plugin/build/${ANDROID_ABI})
 add_subdirectory(${FRAMEWORK_DIR}/decode ${FRAMEWORK_DIR}/decode/build/${ANDROID_ABI})
 add_subdirectory(${FRAMEWORK_DIR}/graphics ${FRAMEWORK_DIR}/graphics/build/${ANDROID_ABI})
 add_subdirectory(${FRAMEWORK_DIR}/format ${FRAMEWORK_DIR}/format/build/${ANDROID_ABI})

android/tools/multi-win-replay/CMakeLists.txt

@@ -14,6 +14,7 @@ find_package(nlohmann_json REQUIRED CONFIG PATHS "${nlohmann_json_DIR}" NO_DEFAU
 
 include(../../framework/cmake-config/PlatformConfig.cmake)
 add_subdirectory(../../framework/util ${PROJECT_SOURCE_DIR}/../../framework/util/build/tools/replay/${ANDROID_ABI})
+add_subdirectory(../../../framework/plugin ${PROJECT_SOURCE_DIR}/../../framework/plugin/build/tools/replay/${ANDROID_ABI})
 add_subdirectory(../../framework/graphics ${PROJECT_SOURCE_DIR}/../../framework/graphics/build/tools/replay/${ANDROID_ABI})
 add_subdirectory(../../framework/format ${PROJECT_SOURCE_DIR}/../../framework/format/build/tools/replay/${ANDROID_ABI})
 add_subdirectory(../../framework/decode ${PROJECT_SOURCE_DIR}/../../framework/decode/build/tools/replay/${ANDROID_ABI})