lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove accidental commit

Browse Source
This commit is contained in:
baldurk
2026-01-30 15:34:29 +00:00
parent a139a9faec
commit a9c590b8a2
2 changed files with 0 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/test/demos/main.cpp
-2
View File
@@ -390,8 +390,6 @@ int main(int argc, char **argv)
{
std::vector<TestMetadata> &tests = test_list();
LoadLibraryA("P:/renderdoc/x64/development/renderdoc.dll");
std::sort(tests.begin(), tests.end());
if(argc >= 2 && (!strcmp(argv[1], "--help") || !strcmp(argv[1], "-h") || !strcmp(argv[1], "-?") ||
util/test/demos/vk/vk_simple_triangle.cpp
-94
View File
@@ -76,45 +76,8 @@ RD_TEST(VK_Simple_Triangle, VulkanGraphicsTest)
VK_IMAGE_USAGE_TRANSFER_DST_BIT, 1, 1, VK_SAMPLE_COUNT_4_BIT),
VmaAllocationCreateInfo({0, VMA_MEMORY_USAGE_GPU_ONLY}));
VkDebugUtilsObjectTagInfoEXT tag = {
VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_TAG_INFO_EXT,
NULL,
VK_OBJECT_TYPE_INSTANCE,
(uint64_t)instance,
RENDERDOC_APIObjectAnnotationHelper,
sizeof(instance),
instance,
};
vkSetDebugUtilsObjectTagEXT(device, &tag);
tag.objectHandle = (uint64_t)phys;
tag.objectType = VK_OBJECT_TYPE_PHYSICAL_DEVICE;
tag.pTag = phys;
vkSetDebugUtilsObjectTagEXT(device, &tag);
RENDERDOC_AnnotationValue val;
rdoc->SetObjectAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), instance,
"someInstData", eRENDERDOC_Bool, 0, RDAnnotationHelper(true));
rdoc->SetObjectAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), phys, "physData",
eRENDERDOC_String, 0, RDAnnotationHelper("my physical device ha ha"));
rdoc->SetObjectAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), offimg.image,
"cool.secretInfo", eRENDERDOC_Float, 0, RDAnnotationHelper(3.14f));
val.apiObject = offimgMS.image;
rdoc->SetObjectAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), offimg.image,
"cool.otherimage", eRENDERDOC_APIObject, 0, &val);
while(Running())
{
rdoc->SetCommandAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), queue,
"global.coolQueue", eRENDERDOC_Bool, 0, RDAnnotationHelper(true));
int counter = 1;
rdoc->SetCommandAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), queue,
"global.counter", eRENDERDOC_Int32, 0,
RDAnnotationHelper(counter++));
VkCommandBuffer cmd = GetCommandBuffer();
vkBeginCommandBuffer(cmd, vkh::CommandBufferBeginInfo());
@@ -122,45 +85,20 @@ RD_TEST(VK_Simple_Triangle, VulkanGraphicsTest)
VkImage swapimg =
StartUsingBackbuffer(cmd, VK_ACCESS_TRANSFER_WRITE_BIT, VK_IMAGE_LAYOUT_GENERAL);
rdoc->SetCommandAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), cmd,
"global.counter", eRENDERDOC_Int32, 0,
RDAnnotationHelper(counter++));
rdoc->SetCommandAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), cmd,
"global.coolCommand", eRENDERDOC_Bool, 0, RDAnnotationHelper(true));
rdoc->SetCommandAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), cmd,
"draw.isClear", eRENDERDOC_Bool, 0, RDAnnotationHelper(true));
rdoc->SetCommandAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), cmd,
"draw.clearingswap", eRENDERDOC_Float, 0, RDAnnotationHelper(1.1f));
rdoc->SetCommandAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), cmd,
"draw.notclearing", eRENDERDOC_APIObject, 0, &val);
vkCmdClearColorImage(cmd, swapimg, VK_IMAGE_LAYOUT_GENERAL,
vkh::ClearColorValue(0.2f, 0.2f, 0.2f, 1.0f), 1,
vkh::ImageSubresourceRange());
rdoc->SetCommandAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), cmd, "draw",
eRENDERDOC_Empty, 0, NULL);
vkh::cmdPipelineBarrier(
cmd, {
vkh::ImageMemoryBarrier(0, VK_ACCESS_TRANSFER_WRITE_BIT, VK_IMAGE_LAYOUT_UNDEFINED,
VK_IMAGE_LAYOUT_GENERAL, offimg.image),
});
rdoc->SetCommandAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), cmd,
"global.counter", eRENDERDOC_Int32, 0,
RDAnnotationHelper(counter++));
vkCmdClearColorImage(cmd, offimg.image, VK_IMAGE_LAYOUT_GENERAL,
vkh::ClearColorValue(0.2f, 0.2f, 0.2f, 1.0f), 1,
vkh::ImageSubresourceRange());
rdoc->SetCommandAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), cmd,
"global.counter", eRENDERDOC_Int32, 0,
RDAnnotationHelper(counter++));
vkh::cmdPipelineBarrier(
cmd, {
vkh::ImageMemoryBarrier(0, VK_ACCESS_TRANSFER_WRITE_BIT, VK_IMAGE_LAYOUT_UNDEFINED,
@@ -171,52 +109,20 @@ RD_TEST(VK_Simple_Triangle, VulkanGraphicsTest)
vkh::ClearColorValue(0.2f, 0.2f, 0.2f, 1.0f), 1,
vkh::ImageSubresourceRange());
rdoc->SetCommandAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), cmd,
"global.counter", eRENDERDOC_Int32, 0,
RDAnnotationHelper(counter++));
rdoc->SetCommandAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), cmd,
"renderpass.type", eRENDERDOC_String, 0,
RDAnnotationHelper("boring"));
vkCmdBeginRenderPass(
cmd, vkh::RenderPassBeginInfo(mainWindow->rp, mainWindow->GetFB(), mainWindow->scissor),
VK_SUBPASS_CONTENTS_INLINE);
rdoc->SetCommandAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), cmd,
"global.counter", eRENDERDOC_Int32, 0,
RDAnnotationHelper(counter++));
vkCmdBindPipeline(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, pipe);
vkCmdSetViewport(cmd, 0, 1, &mainWindow->viewport);
rdoc->SetCommandAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), cmd,
"global.counter", eRENDERDOC_Int32, 0,
RDAnnotationHelper(counter++));
vkCmdSetScissor(cmd, 0, 1, &mainWindow->scissor);
vkh::cmdBindVertexBuffers(cmd, 0, {vb.buffer}, {0});
rdoc->SetCommandAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), cmd,
"global.counter", eRENDERDOC_Int32, 0,
RDAnnotationHelper(counter++));
vkCmdDraw(cmd, 3, 1, 0, 0);
rdoc->SetCommandAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), cmd,
"global.counter", eRENDERDOC_Int32, 0,
RDAnnotationHelper(counter++));
vkCmdEndRenderPass(cmd);
rdoc->SetCommandAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), cmd,
"global.counter", eRENDERDOC_Int32, 0,
RDAnnotationHelper(counter++));
FinishUsingBackbuffer(cmd, VK_ACCESS_TRANSFER_WRITE_BIT, VK_IMAGE_LAYOUT_GENERAL);
rdoc->SetCommandAnnotation(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(instance), cmd,
"global.counter", eRENDERDOC_Int32, 0,
RDAnnotationHelper(counter++));
vkEndCommandBuffer(cmd);
Submit(0, 1, {cmd});