lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-12 21:10:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Test VK_EXT_tooling_info in VK_Parameter_Zoo not VK_Simple_Triangle

Browse Source 
* Keep the simple triangle really the bare minimum.
This commit is contained in:
baldurk
2020-02-03 14:59:19 +00:00
parent f18cf01671
commit 4df8ce7a02
4 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/test/demos/vk/vk_parameter_zoo.cpp
+23
View File
@@ -173,6 +173,7 @@ void main()
int main()
{
optDevExts.push_back(VK_EXT_TOOLING_INFO_EXTENSION_NAME);
optDevExts.push_back(VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_EXTENSION_NAME);
optDevExts.push_back(VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME);
optDevExts.push_back(VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME);
@@ -181,6 +182,20 @@ void main()
if(!Init())
return 3;
std::vector<VkPhysicalDeviceToolPropertiesEXT> tools;
if(std::find(devExts.begin(), devExts.end(), VK_EXT_TOOLING_INFO_EXTENSION_NAME) != devExts.end())
{
uint32_t toolCount = 0;
vkGetPhysicalDeviceToolPropertiesEXT(phys, &toolCount, NULL);
tools.resize(toolCount);
vkGetPhysicalDeviceToolPropertiesEXT(phys, &toolCount, tools.data());
TEST_LOG("%u tools available:", toolCount);
for(VkPhysicalDeviceToolPropertiesEXT &tool : tools)
TEST_LOG(" - %s", tool.name);
}
bool KHR_descriptor_update_template =
std::find(devExts.begin(), devExts.end(),
VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_EXTENSION_NAME) != devExts.end();
@@ -1033,6 +1048,14 @@ void main()
cmd, vkh::RenderPassBeginInfo(mainWindow->rp, mainWindow->GetFB(), mainWindow->scissor),
VK_SUBPASS_CONTENTS_INLINE);
if(!tools.empty())
{
pushMarker(cmd, "Tools available");
for(VkPhysicalDeviceToolPropertiesEXT &tool : tools)
setMarker(cmd, tool.name);
popMarker(cmd);
}
vkCmdBindPipeline(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, pipe);
vkCmdSetViewport(cmd, 0, 1, &mainWindow->viewport);
vkCmdSetScissor(cmd, 0, 1, &mainWindow->scissor);
util/test/demos/vk/vk_simple_triangle.cpp
-29
View File
@@ -74,33 +74,12 @@ void main()
)EOSHADER";
void Prepare(int argc, char **argv)
{
optDevExts.push_back(VK_EXT_TOOLING_INFO_EXTENSION_NAME);
VulkanGraphicsTest::Prepare(argc, argv);
}
int main()
{
// initialise, create window, create context, etc
if(!Init())
return 3;
std::vector<VkPhysicalDeviceToolPropertiesEXT> tools;
if(std::find(devExts.begin(), devExts.end(), VK_EXT_TOOLING_INFO_EXTENSION_NAME) != devExts.end())
{
uint32_t toolCount = 0;
vkGetPhysicalDeviceToolPropertiesEXT(phys, &toolCount, NULL);
tools.resize(toolCount);
vkGetPhysicalDeviceToolPropertiesEXT(phys, &toolCount, tools.data());
TEST_LOG("%u tools available:", toolCount);
for(VkPhysicalDeviceToolPropertiesEXT &tool : tools)
TEST_LOG(" - %s", tool.name);
}
VkPipelineLayout layout = createPipelineLayout(vkh::PipelineLayoutCreateInfo());
vkh::GraphicsPipelineCreateInfo pipeCreateInfo;
@@ -159,14 +138,6 @@ void main()
cmd, vkh::RenderPassBeginInfo(mainWindow->rp, mainWindow->GetFB(), mainWindow->scissor),
VK_SUBPASS_CONTENTS_INLINE);
if(!tools.empty())
{
pushMarker(cmd, "Tools available");
for(VkPhysicalDeviceToolPropertiesEXT &tool : tools)
setMarker(cmd, tool.name);
popMarker(cmd);
}
vkCmdBindPipeline(cmd, VK_PIPELINE_BIND_POINT_GRAPHICS, pipe);
vkCmdSetViewport(cmd, 0, 1, &mainWindow->viewport);
vkCmdSetScissor(cmd, 0, 1, &mainWindow->scissor);
util/test/tests/Vulkan/VK_Parameter_Zoo.py
+8 -1
View File
@@ -114,4 +114,11 @@ class VK_Parameter_Zoo(rdtest.TestCase):
rdtest.log.success("Resources in push template set were found as expected")
rdtest.log.success("All resources were found as expected")
rdtest.log.success("All resources were found as expected")
draw = self.find_draw("Tools available")
self.check(len(draw.children) > 1)
self.check(any([d.name == 'RenderDoc' for d in draw.children]))
rdtest.log.success("RenderDoc tool was listed as available")
util/test/tests/Vulkan/VK_Simple_Triangle.py
-5
View File
@@ -44,8 +44,3 @@ class VK_Simple_Triangle(rdtest.TestCase):
}
self.check_mesh_data(postvs_ref, postvs_data)
draw = self.find_draw("Tools available")
self.check(len(draw.children) > 1)
self.check(any([d.name == 'RenderDoc' for d in draw.children]))