Skip to content

Commit 2c86ddb

Browse files
Zorro666Zorro666
committed
Extend VK_Resource_Test to include per frame update descriptorset
1 parent b2ed8e7 commit 2c86ddb

2 files changed

Lines changed: 74 additions & 62 deletions

File tree

‎util/test/demos/vk/vk_resource_usage.cpp‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -837,6 +837,18 @@ RD_TEST(VK_Resource_Usage, VulkanGraphicsTest)
837837
viewPort = {0.0f, 0.0f, sqSize, sqSize, 0.0f, 1.0f};
838838
setName(mainWindow->GetFB(), "Main Framebuffer");
839839

840+
vkh::updateDescriptorSets(
841+
device,
842+
{
843+
vkh::WriteDescriptorSet(compWriteDataDescSet, 0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
844+
{vkh::DescriptorBufferInfo(indirectData.buffer)}),
845+
vkh::WriteDescriptorSet(compDescSet, 0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,
846+
{vkh::DescriptorBufferInfo(compBufIn.buffer)}),
847+
vkh::WriteDescriptorSet(
848+
descSet, 2, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
849+
{vkh::DescriptorImageInfo(offimgRTV, VK_IMAGE_LAYOUT_GENERAL, linearSampler)}),
850+
});
851+
840852
VkCommandBuffer barrierSecCmd = GetCommandBuffer(VK_COMMAND_BUFFER_LEVEL_SECONDARY);
841853
vkBeginCommandBuffer(barrierSecCmd, vkh::CommandBufferBeginInfo(
842854
VK_COMMAND_BUFFER_USAGE_SIMULTANEOUS_USE_BIT,

‎util/test/tests/Vulkan/VK_Resource_Usage.py‎

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -173,16 +173,16 @@ def check_capture(self):
173173
# the swap chain image has usage, anything else does not
174174
if res.resourceId == swapImage:
175175
expectedUsage = [
176-
(6,rd.ResourceUsage.Barrier),
177-
(6,rd.ResourceUsage.Discard),
178-
(7,rd.ResourceUsage.Clear),
179-
(8,rd.ResourceUsage.Barrier)]
176+
(7,rd.ResourceUsage.Barrier),
177+
(7,rd.ResourceUsage.Discard),
178+
(8,rd.ResourceUsage.Clear),
179+
(9,rd.ResourceUsage.Barrier)]
180180
for eid in drawEIDs:
181181
expectedUsage.append((eid,rd.ResourceUsage.ColorTarget))
182182
for eid in meshDispatchEIDs:
183183
expectedUsage.append((eid,rd.ResourceUsage.ColorTarget))
184184
expectedUsage += [
185-
(235+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier)]
185+
(236+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier)]
186186
else:
187187
expectedUsage = []
188188
elif res.type == rd.ResourceType.RenderPass:
@@ -223,39 +223,39 @@ def check_capture(self):
223223
elif nestedSecondaries and eid > markerNestedSecondaryCommandBuffer:
224224
expectedUsage.append((eid,rd.ResourceUsage.CS_RWResource))
225225
if res.name == "Indirect Data":
226-
expectedUsage += [(14,rd.ResourceUsage.Barrier),
227-
(15,rd.ResourceUsage.Clear),
228-
(16,rd.ResourceUsage.Barrier),
229-
(20,rd.ResourceUsage.CS_RWResource),
230-
(21,rd.ResourceUsage.Barrier),
231-
(97,rd.ResourceUsage.Barrier),
232-
(109,rd.ResourceUsage.Barrier),
233-
(120,rd.ResourceUsage.Indirect),
234-
(124,rd.ResourceUsage.Indirect),
235-
(142,rd.ResourceUsage.Indirect),
236-
(144,rd.ResourceUsage.Barrier),
237-
(149,rd.ResourceUsage.Barrier),
238-
(150,rd.ResourceUsage.Clear),
239-
(151,rd.ResourceUsage.Barrier),
240-
(155,rd.ResourceUsage.CS_RWResource),
241-
(157,rd.ResourceUsage.Barrier),
242-
(161,rd.ResourceUsage.Barrier),
243-
(163,rd.ResourceUsage.Barrier),
244-
(177,rd.ResourceUsage.Indirect),
245-
(208,rd.ResourceUsage.Indirect)]
226+
expectedUsage += [(15,rd.ResourceUsage.Barrier),
227+
(16,rd.ResourceUsage.Clear),
228+
(17,rd.ResourceUsage.Barrier),
229+
(21,rd.ResourceUsage.CS_RWResource),
230+
(22,rd.ResourceUsage.Barrier),
231+
(98,rd.ResourceUsage.Barrier),
232+
(110,rd.ResourceUsage.Barrier),
233+
(121,rd.ResourceUsage.Indirect),
234+
(125,rd.ResourceUsage.Indirect),
235+
(143,rd.ResourceUsage.Indirect),
236+
(145,rd.ResourceUsage.Barrier),
237+
(150,rd.ResourceUsage.Barrier),
238+
(151,rd.ResourceUsage.Clear),
239+
(152,rd.ResourceUsage.Barrier),
240+
(156,rd.ResourceUsage.CS_RWResource),
241+
(158,rd.ResourceUsage.Barrier),
242+
(162,rd.ResourceUsage.Barrier),
243+
(164,rd.ResourceUsage.Barrier),
244+
(178,rd.ResourceUsage.Indirect),
245+
(209,rd.ResourceUsage.Indirect)]
246246
if drawIndirectCount:
247247
expectedUsage += [
248-
(247,rd.ResourceUsage.Indirect),
249-
(254,rd.ResourceUsage.Indirect)]
250-
expectedUsage += [(231+countDrawIndirectCount,rd.ResourceUsage.Barrier)]
248+
(248,rd.ResourceUsage.Indirect),
249+
(255,rd.ResourceUsage.Indirect)]
250+
expectedUsage += [(232+countDrawIndirectCount,rd.ResourceUsage.Barrier)]
251251
if nestedSecondaries:
252252
expectedUsage += [
253-
(268+countDrawIndirectCount+countDescBufferCopy,rd.ResourceUsage.Barrier)]
253+
(269+countDrawIndirectCount+countDescBufferCopy,rd.ResourceUsage.Barrier)]
254254
if meshShader:
255255
expectedUsage += [
256-
(249+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Indirect),
257-
(252+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Indirect),
258-
(255+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Indirect)]
256+
(250+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Indirect),
257+
(253+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Indirect),
258+
(256+countDrawIndirectCount+countNested+countDescBuffer,rd.ResourceUsage.Indirect)]
259259
for eid in indirectEIDs:
260260
# Dispatch + Indirect
261261
if eid in dispatchEIDs:
@@ -269,44 +269,44 @@ def check_capture(self):
269269
expectedUsage.append((eid,rd.ResourceUsage.IndexBuffer))
270270
expectedUsage.append((eid,rd.ResourceUsage.Indirect))
271271
if res.name == "Barrier Buffer":
272-
expectedUsage = [(243+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
273-
(251+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
274-
(259+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
275-
(267+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
276-
(275+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
277-
(283+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
278-
(291+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
279-
(299+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
280-
(307+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
281-
(315+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier)]
272+
expectedUsage = [(244+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
273+
(252+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
274+
(260+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
275+
(268+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
276+
(276+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
277+
(284+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
278+
(292+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
279+
(300+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
280+
(308+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
281+
(316+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier)]
282282
if res.name == "Barrier2 Buffer":
283-
expectedUsage = [(323+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
284-
(328+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
285-
(333+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
286-
(338+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier)]
283+
expectedUsage = [(324+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
284+
(329+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
285+
(334+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier),
286+
(339+countDrawIndirectCount+countNested+countDescBuffer+countMeshShader,rd.ResourceUsage.Barrier)]
287287
if res.name == "Descriptor Buffer":
288288
if descBuffer:
289-
expectedUsage = [(235+countDrawIndirectCount,rd.ResourceUsage.Barrier),
290-
(236+countDrawIndirectCount,rd.ResourceUsage.CopySrc),
291-
(237+countDrawIndirectCount,rd.ResourceUsage.Barrier),
292-
(238+countDrawIndirectCount,rd.ResourceUsage.Clear),
293-
(241+countDrawIndirectCount,rd.ResourceUsage.Barrier),
294-
(242+countDrawIndirectCount,rd.ResourceUsage.CopyDst)]
289+
expectedUsage = [(236+countDrawIndirectCount,rd.ResourceUsage.Barrier),
290+
(237+countDrawIndirectCount,rd.ResourceUsage.CopySrc),
291+
(238+countDrawIndirectCount,rd.ResourceUsage.Barrier),
292+
(239+countDrawIndirectCount,rd.ResourceUsage.Clear),
293+
(242+countDrawIndirectCount,rd.ResourceUsage.Barrier),
294+
(243+countDrawIndirectCount,rd.ResourceUsage.CopyDst)]
295295
if res.name == "Descriptor Backup Buffer":
296296
if descBuffer:
297-
expectedUsage = [(235+countDrawIndirectCount,rd.ResourceUsage.Barrier),
298-
(236+countDrawIndirectCount,rd.ResourceUsage.CopyDst),
299-
(241+countDrawIndirectCount,rd.ResourceUsage.Barrier),
300-
(242+countDrawIndirectCount,rd.ResourceUsage.CopySrc)]
297+
expectedUsage = [(236+countDrawIndirectCount,rd.ResourceUsage.Barrier),
298+
(237+countDrawIndirectCount,rd.ResourceUsage.CopyDst),
299+
(242+countDrawIndirectCount,rd.ResourceUsage.Barrier),
300+
(243+countDrawIndirectCount,rd.ResourceUsage.CopySrc)]
301301
elif res.type == rd.ResourceType.Texture:
302302
if res.name == "Offscreen MSAA Image":
303-
expectedUsage = [(11,rd.ResourceUsage.Barrier),
304-
(11,rd.ResourceUsage.Discard),
305-
(12,rd.ResourceUsage.Clear)]
303+
expectedUsage = [(12,rd.ResourceUsage.Barrier),
304+
(12,rd.ResourceUsage.Discard),
305+
(13,rd.ResourceUsage.Clear)]
306306
if res.name == "Offscreen Image":
307-
expectedUsage = [(9,rd.ResourceUsage.Barrier),
308-
(9,rd.ResourceUsage.Discard),
309-
(10,rd.ResourceUsage.Clear)]
307+
expectedUsage = [(10,rd.ResourceUsage.Barrier),
308+
(10,rd.ResourceUsage.Discard),
309+
(11,rd.ResourceUsage.Clear)]
310310
for eid in descSetDrawEIDs:
311311
expectedUsage.append((eid,rd.ResourceUsage.PS_Resource))
312312
for eid in descBufferDrawEIDs:

0 commit comments

Comments
 (0)