Skip to content

Expose api to externally trigger trimming #2599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
panos-lunarg wants to merge 3 commits into
base: dev
Choose a base branch
from
+916 −185
Open

Expose api to externally trigger trimming #2599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5df1cb1
Expose api to externally trigger trimming
panos-lunarg Jan 7, 2026
50b6a6e
Expose callback for signaling changes in trimming state
panos-lunarg Jan 13, 2026
bd88947
Test for external trimming trigger
panos-lunarg Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions TESTING_test_apps.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ Required arguments:
external-memory-fd-export
external-memory-fd-import
wait-for-present
trigger-trimming
[...]
```

Expand Down
2 changes: 0 additions & 2 deletions android/framework/decode/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ target_sources(gfxrecon_decode
$<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_tracked_object_info_table.h>
$<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_tracked_object_info.cpp>
$<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${GFXRECON_SOURCE_DIR}/framework/decode/openxr_tracked_object_info_table.cpp>
${GFXRECON_SOURCE_DIR}/framework/decode/mark_injected_commands.h
${GFXRECON_SOURCE_DIR}/framework/decode/mark_injected_commands.cpp
${GFXRECON_SOURCE_DIR}/framework/decode/parsed_block.h
${GFXRECON_SOURCE_DIR}/framework/decode/parsed_block.cpp
${GFXRECON_SOURCE_DIR}/framework/decode/pointer_decoder_base.h
Expand Down
2 changes: 2 additions & 0 deletions android/framework/util/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ target_sources(gfxrecon_util
${GFXRECON_SOURCE_DIR}/framework/util/argument_parser.cpp
${GFXRECON_SOURCE_DIR}/framework/util/buffer_writer.h
${GFXRECON_SOURCE_DIR}/framework/util/buffer_writer.cpp
${GFXRECON_SOURCE_DIR}/framework/util/callbacks.h
${GFXRECON_SOURCE_DIR}/framework/util/callbacks.cpp
${GFXRECON_SOURCE_DIR}/framework/util/clock_cache.h
${GFXRECON_SOURCE_DIR}/framework/util/compressor.h
${GFXRECON_SOURCE_DIR}/framework/util/date_time.h
Expand Down
1 change: 1 addition & 0 deletions android/test/test_apps/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,5 @@ add_test_app(triangle-extra-device)
add_test_app(shader-objects)
add_test_app(sparse-resources)
add_test_app(wait-for-present)
add_test_app(trigger-trimming)
add_test_app(ahb)
1 change: 1 addition & 0 deletions android/test/test_apps/launcher/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ set(GFXRECON_TEST_LAUNCHER_LINK_LIBRARIES
gfxrecon-testapp-external-memory-fd-export
gfxrecon-testapp-external-memory-fd-import
gfxrecon-testapp-wait-for-present
gfxrecon-testapp-trigger-trimming
gfxrecon-testapp-ahb)

target_link_libraries(${PROJECT_NAME}
Expand Down
2 changes: 0 additions & 2 deletions framework/decode/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,6 @@ target_sources(gfxrecon_decode
$<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${CMAKE_CURRENT_LIST_DIR}/openxr_tracked_object_info_table.h>
$<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${CMAKE_CURRENT_LIST_DIR}/openxr_tracked_object_info.cpp>
$<$<BOOL:${OPENXR_SUPPORT_ENABLED}>:${CMAKE_CURRENT_LIST_DIR}/openxr_tracked_object_info_table.cpp>
${CMAKE_CURRENT_LIST_DIR}/mark_injected_commands.h
${CMAKE_CURRENT_LIST_DIR}/mark_injected_commands.cpp
${CMAKE_CURRENT_LIST_DIR}/parsed_block.cpp
${CMAKE_CURRENT_LIST_DIR}/parsed_block.h
${CMAKE_CURRENT_LIST_DIR}/pointer_decoder_base.h
Expand Down
82 changes: 0 additions & 82 deletions framework/decode/mark_injected_commands.cpp
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions framework/decode/vulkan_address_replacer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "graphics/vulkan_struct_get_pnext.h"
#include "decode/vulkan_address_replacer.h"
#include "decode/vulkan_address_replacer_shaders.h"
#include "decode/mark_injected_commands.h"
#include "util/callbacks.h"
#include "util/alignment_utils.h"
#include "util/logging.h"

Expand All @@ -42,7 +42,7 @@ struct MarkInjectedCommandsHelper
// mark injected commands
if (semaphore++ == 0)
{
decode::BeginInjectedCommands();
util::BeginInjectedCommands();
};
}

Expand All @@ -51,7 +51,7 @@ struct MarkInjectedCommandsHelper
// mark end of injected commands
if (--semaphore == 0)
{
decode::EndInjectedCommands();
util::EndInjectedCommands();
}
}
};
Expand Down Expand Up @@ -567,14 +567,14 @@ void VulkanAddressReplacer::ProcessCmdBindDescriptorSets(VulkanCommandBufferInfo
else
{
// patch an existing uniform-buffer and retrieve a buffer-address for it
decode::BeginInjectedCommands();
util::BeginInjectedCommands();
VkBufferDeviceAddressInfo address_info = {};
address_info.sType = VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_INFO;
address_info.buffer = buffer_info->handle;
buffer_info->capture_address = buffer_info->replay_address =
get_device_address_fn_(device_, &address_info);
GFXRECON_ASSERT(buffer_info->replay_address != 0);
decode::EndInjectedCommands();
util::EndInjectedCommands();

// track newly acquired buffer/address
address_tracker.TrackBuffer(buffer_info);
Expand Down
38 changes: 19 additions & 19 deletions framework/decode/vulkan_replay_consumer_base.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
#include "util/hash.h"
#include "util/platform.h"
#include "util/logging.h"
#include "decode/mark_injected_commands.h"
#include "util/callbacks.h"

#include "spirv_reflect.h"

Expand Down Expand Up @@ -3101,13 +3101,13 @@ VulkanReplayConsumerBase::OverrideCreateInstance(VkResult original_result,
// emitted during calls that _aren't_ vkCreateInstance()/vkDestroyInstance()
if (create_state.messenger_create_info.pfnUserCallback != nullptr)
{
decode::BeginInjectedCommands();
util::BeginInjectedCommands();
GetInstanceTable(*replay_instance)
->CreateDebugUtilsMessengerEXT(*replay_instance,
&create_state.messenger_create_info,
GetAllocationCallbacks(pAllocator),
&instance_info->debug_messenger);
decode::EndInjectedCommands();
util::EndInjectedCommands();
}
}

Expand All @@ -3119,9 +3119,9 @@ void VulkanReplayConsumerBase::OverrideDestroyInstance(
const VulkanInstanceInfo* instance_info,
const StructPointerDecoder<Decoded_VkAllocationCallbacks>* pAllocator)
{
decode::BeginInjectedCommands();
util::BeginInjectedCommands();
DestroyInternalInstanceResources(instance_info);
decode::EndInjectedCommands();
util::EndInjectedCommands();

VkInstance instance = instance_info->handle;
func(instance, GetAllocationCallbacks(pAllocator));
Expand Down Expand Up @@ -3494,11 +3494,11 @@ void VulkanReplayConsumerBase::OverrideDestroyDevice(

if (screenshot_handler_ != nullptr)
{
decode::BeginInjectedCommands();
util::BeginInjectedCommands();

screenshot_handler_->DestroyDeviceResources(device, GetDeviceTable(device));

decode::EndInjectedCommands();
util::EndInjectedCommands();
}

// free replacer internal vulkan-resources for the device
Expand Down Expand Up @@ -4014,10 +4014,10 @@ VkResult VulkanReplayConsumerBase::OverrideGetFenceStatus(PFN_vkGetFenceStatus
{
// Replay is usually faster than the original application, so there is a good chance the fence is still not
// ready. In this case, we make sure the fence is signaled by waiting for it.
BeginInjectedCommands();
util::BeginInjectedCommands();
result =
GetDeviceTable(device)->WaitForFences(device, 1, &fence, VK_TRUE, std::numeric_limits<uint64_t>::max());
EndInjectedCommands();
util::EndInjectedCommands();
GFXRECON_ASSERT(result == VK_SUCCESS);
}

Expand Down Expand Up @@ -4281,7 +4281,7 @@ VkResult VulkanReplayConsumerBase::OverrideQueueSubmit(PFN_vkQueueSubmit

if (screenshot_handler_ != nullptr)
{
decode::BeginInjectedCommands();
util::BeginInjectedCommands();

VulkanCommandBufferInfo* frame_boundary_command_buffer_info = nullptr;
for (uint32_t i = 0; i < submitCount; ++i)
Expand Down Expand Up @@ -4319,7 +4319,7 @@ VkResult VulkanReplayConsumerBase::OverrideQueueSubmit(PFN_vkQueueSubmit
}
}

decode::EndInjectedCommands();
util::EndInjectedCommands();
}

return result;
Expand Down Expand Up @@ -4520,7 +4520,7 @@ VkResult VulkanReplayConsumerBase::OverrideQueueSubmit2(PFN_vkQueueSubmit2
// Check whether any of the submitted command buffers are frame boundaries.
if (screenshot_handler_ != nullptr)
{
decode::BeginInjectedCommands();
util::BeginInjectedCommands();

bool is_frame_boundary = false;
for (uint32_t i = 0; i < submitCount; ++i)
Expand All @@ -4547,7 +4547,7 @@ VkResult VulkanReplayConsumerBase::OverrideQueueSubmit2(PFN_vkQueueSubmit2
}
}

decode::EndInjectedCommands();
util::EndInjectedCommands();
}

return result;
Expand Down Expand Up @@ -5060,7 +5060,7 @@ VkResult VulkanReplayConsumerBase::OverrideAllocateDescriptorSets(

if ((original_result >= 0) && (result == VK_ERROR_OUT_OF_POOL_MEMORY))
{
decode::BeginInjectedCommands();
util::BeginInjectedCommands();

// Handle case where replay runs out of descriptor pool memory when capture did not by creating a new
// descriptor pool and attempting the allocation a second time.
Expand Down Expand Up @@ -5109,7 +5109,7 @@ VkResult VulkanReplayConsumerBase::OverrideAllocateDescriptorSets(
result = func(device_info->handle, &modified_allocate_info, pDescriptorSets->GetHandlePointer());
}

decode::EndInjectedCommands();
util::EndInjectedCommands();
}

// The information gathered here is only relevant when dumping or for portability-features
Expand Down Expand Up @@ -8283,7 +8283,7 @@ VulkanReplayConsumerBase::OverrideQueuePresentKHR(PFN_vkQueuePresentKHR
capture_image_indices_.clear();
swapchain_infos_.clear();

decode::BeginInjectedCommands();
util::BeginInjectedCommands();

if ((screenshot_handler_ != nullptr) && (screenshot_handler_->IsScreenshotFrame()))
{
Expand Down Expand Up @@ -8516,7 +8516,7 @@ VulkanReplayConsumerBase::OverrideQueuePresentKHR(PFN_vkQueuePresentKHR
GetDeviceTable(device)->DeviceWaitIdle(device);
}

decode::EndInjectedCommands();
util::EndInjectedCommands();

// Only attempt to find imported or shadow semaphores if we know at least one around.
if ((!have_imported_semaphores_) && (shadow_semaphores_.empty()) && (modified_present_info.swapchainCount != 0))
Expand Down Expand Up @@ -10393,7 +10393,7 @@ void VulkanReplayConsumerBase::OverrideFrameBoundaryANDROID(PFN_vkFrameBoundaryA

if (screenshot_handler_ != nullptr && !options_.screenshot_ignore_frameBoundaryAndroid)
{
decode::BeginInjectedCommands();
util::BeginInjectedCommands();

if (screenshot_handler_->IsScreenshotFrame() && image_info != nullptr)
{
Expand Down Expand Up @@ -10432,7 +10432,7 @@ void VulkanReplayConsumerBase::OverrideFrameBoundaryANDROID(PFN_vkFrameBoundaryA

screenshot_handler_->EndFrame();

decode::EndInjectedCommands();
util::EndInjectedCommands();
}

func(device, semaphore, image);
Expand Down
Loading
Loading