Skip to content
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

Jump to bottom

tests: Remove Deprecated m_commandBuffer #8591

Merged
merged 1 commit into from
Sep 25, 2024
Merged

tests: Remove Deprecated m_commandBuffer #8591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions tests/framework/layer_validation_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,6 @@ void VkLayerTest::Init(VkPhysicalDeviceFeatures *features, VkPhysicalDeviceFeatu
RETURN_IF_SKIP(InitState(features, features2));
}

vkt::CommandBuffer *VkLayerTest::CommandBuffer() { return m_commandBuffer; }

VkLayerTest::VkLayerTest() {
#if !defined(VK_USE_PLATFORM_ANDROID_KHR)
m_instance_extension_names.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);
Expand Down
1 change: 0 additions & 1 deletion tests/framework/layer_validation_tests.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ class VkLayerTest : public VkLayerTestBase {
void Init(VkPhysicalDeviceFeatures *features = nullptr, VkPhysicalDeviceFeatures2 *features2 = nullptr,
void *instance_pnext = nullptr);
void AddSurfaceExtension();
vkt::CommandBuffer *CommandBuffer();

template <typename Features>
VkPhysicalDeviceFeatures2 GetPhysicalDeviceFeatures2(Features &feature_query) {
Expand Down
8 changes: 4 additions & 4 deletions tests/framework/ray_tracing_objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ class GeometryKHR {
GeometryKHR& SetInstancesDeviceAddress(VkDeviceAddress address);
GeometryKHR& SetInstanceHostAccelStructRef(VkAccelerationStructureKHR blas, uint32_t instance_i);
GeometryKHR& SetInstanceHostAddress(void* address);

GeometryKHR& Build();

const auto& GetVkObj() const { return vk_obj_; }
Expand Down Expand Up @@ -248,9 +248,9 @@ void BuildHostAccelerationStructuresKHR(VkDevice device, std::vector<BuildGeomet
// as_build_info.GetDstAS().SetBufferMemoryPropertyFlags(VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
// as_build_info.SetFlags(VK_BUILD_ACCELERATION_STRUCTURE_ALLOW_COMPACTION_BIT_KHR);
//
// m_commandBuffer->begin();
// as_build_info.BuildCmdBuffer(*m_device, m_commandBuffer->handle());
// m_commandBuffer->end();
// m_command_buffer.begin();
// as_build_info.BuildCmdBuffer(*m_device, m_command_buffer.handle());
// m_command_buffer.end();
// }
namespace blueprint {
GeometryKHR GeometrySimpleOnDeviceTriangleInfo(const vkt::Device& device, size_t triangles_count = 1);
Expand Down
2 changes: 1 addition & 1 deletion tests/framework/render.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,7 @@ void VkRenderFramework::SetDefaultDynamicStatesExclude(const std::vector<VkDynam
m_vertex_buffer = new vkt::Buffer(*m_device, 32u, VK_BUFFER_USAGE_VERTEX_BUFFER_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT);
}

VkCommandBuffer cmdBuffer = commandBuffer ? commandBuffer : m_commandBuffer->handle();
VkCommandBuffer cmdBuffer = commandBuffer ? commandBuffer : m_command_buffer.handle();
VkViewport viewport = {0, 0, static_cast<float>(m_width), static_cast<float>(m_height), 0.0f, 1.0f};
VkRect2D scissor = {{0, 0}, {m_width, m_height}};
if (!excluded(VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT)) vk::CmdSetViewportWithCountEXT(cmdBuffer, 1u, &viewport);
Expand Down
28 changes: 14 additions & 14 deletions tests/unit/amd_best_practices.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ TEST_F(VkAmdBestPracticesLayerTest, ClearImage) {
VK_IMAGE_LAYOUT_UNDEFINED};
vkt::Image image_1D(*m_device, img_info, vkt::set_layout);

m_commandBuffer->begin();
m_command_buffer.begin();
image_1D.SetLayout(m_commandBuffer, VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);

VkClearColorValue clear_value = {{0.0f, 0.0f, 0.0f, 0.0f}};
Expand All @@ -393,11 +393,11 @@ TEST_F(VkAmdBestPracticesLayerTest, ClearImage) {

m_errorMonitor->SetDesiredFailureMsg(kPerformanceWarningBit, "BestPractices-AMD-ClearAttachment-ClearImage-color");

vk::CmdClearColorImage(m_commandBuffer->handle(), image_1D.handle(), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, &clear_value, 1,
vk::CmdClearColorImage(m_command_buffer.handle(), image_1D.handle(), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, &clear_value, 1,
&image_range);
m_errorMonitor->VerifyFound();

m_commandBuffer->end();
m_command_buffer.end();
}

vk::ResetCommandPool(device(), m_command_pool.handle(), 0);
Expand All @@ -421,7 +421,7 @@ TEST_F(VkAmdBestPracticesLayerTest, ClearImage) {
m_errorMonitor->SetAllowedFailureMsg("VUID-VkImageCreateInfo-imageCreateMaxMipLevels-02251");
vkt::Image image_1D(*m_device, img_info, vkt::set_layout);

m_commandBuffer->begin();
m_command_buffer.begin();
image_1D.SetLayout(m_commandBuffer, VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT,
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL);

Expand All @@ -433,11 +433,11 @@ TEST_F(VkAmdBestPracticesLayerTest, ClearImage) {

m_errorMonitor->SetDesiredFailureMsg(kPerformanceWarningBit, "BestPractices-AMD-ClearAttachment-ClearImage-depth-stencil");

vk::CmdClearDepthStencilImage(m_commandBuffer->handle(), image_1D.handle(), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
vk::CmdClearDepthStencilImage(m_command_buffer.handle(), image_1D.handle(), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
&clear_value, 1, &image_range);
m_errorMonitor->VerifyFound();

m_commandBuffer->end();
m_command_buffer.end();
}
}

Expand Down Expand Up @@ -470,7 +470,7 @@ TEST_F(VkAmdBestPracticesLayerTest, ImageToImageCopy) {
GTEST_SKIP() << "Could not initilize Linear image, skipping image to image copy test";
}

m_commandBuffer->begin();
m_command_buffer.begin();

image1D_1.SetLayout(m_commandBuffer, VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
m_errorMonitor->SetDesiredFailureMsg(kPerformanceWarningBit, "BestPractices-AMD-vkImage-AvoidImageToImageCopy");
Expand All @@ -480,10 +480,10 @@ TEST_F(VkAmdBestPracticesLayerTest, ImageToImageCopy) {
copy.dstSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
copy.dstSubresource.layerCount = 1;
copy.srcSubresource = copy.dstSubresource;
vk::CmdCopyImage(m_commandBuffer->handle(), image1D_1.handle(), VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, image_1D_2.handle(),
vk::CmdCopyImage(m_command_buffer.handle(), image1D_1.handle(), VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, image_1D_2.handle(),
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &copy);
m_errorMonitor->VerifyFound();
m_commandBuffer->end();
m_command_buffer.end();
}

TEST_F(VkAmdBestPracticesLayerTest, GeneralLayout) {
Expand Down Expand Up @@ -565,7 +565,7 @@ TEST_F(VkAmdBestPracticesLayerTest, Barriers) {
VK_IMAGE_LAYOUT_UNDEFINED};
vkt::Image image_1D(*m_device, img_info, vkt::set_layout);

m_commandBuffer->begin();
m_command_buffer.begin();
// check for read-to-read barrier
m_errorMonitor->SetDesiredFailureMsg(kPerformanceWarningBit, "BestPractices-PipelineBarrier-readToReadBarrier");
image_1D.SetLayout(m_commandBuffer, VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL);
Expand All @@ -586,7 +586,7 @@ TEST_F(VkAmdBestPracticesLayerTest, Barriers) {
image_1D.SetLayout(m_commandBuffer, VK_IMAGE_ASPECT_COLOR_BIT, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL);
m_errorMonitor->VerifyFound();

m_commandBuffer->end();
m_command_buffer.end();
}

TEST_F(VkAmdBestPracticesLayerTest, NumberOfSubmissions) {
Expand Down Expand Up @@ -724,12 +724,12 @@ TEST_F(VkAmdBestPracticesLayerTest, SecondaryCmdBuffer) {

secondary_cmd_buf.end();

m_commandBuffer->begin();
m_commandBuffer->BeginRenderPass(m_renderPassBeginInfo, VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS);
m_command_buffer.begin();
m_command_buffer.BeginRenderPass(m_renderPassBeginInfo, VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS);
m_errorMonitor->SetDesiredFailureMsg(kPerformanceWarningBit, "BestPractices-DrawState-ClearCmdBeforeDraw");
m_errorMonitor->SetDesiredFailureMsg(kPerformanceWarningBit, "BestPractices-AMD-VkCommandBuffer-AvoidSecondaryCmdBuffers");

vk::CmdExecuteCommands(m_commandBuffer->handle(), 1, &secondary_cmd_buf.handle());
vk::CmdExecuteCommands(m_command_buffer.handle(), 1, &secondary_cmd_buf.handle());

m_errorMonitor->VerifyFound();
}
Expand Down
74 changes: 37 additions & 37 deletions tests/unit/android_external_resolve.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,11 +458,11 @@ TEST_F(NegativeAndroidExternalResolve, ImagelessFramebuffer) {
render_pass_bi.clearValueCount = 1;
render_pass_bi.pClearValues = &clear_value;

m_commandBuffer->begin();
m_command_buffer.begin();
m_errorMonitor->SetDesiredError("VUID-VkRenderPassBeginInfo-framebuffer-09354");
m_commandBuffer->BeginRenderPass(render_pass_bi);
m_command_buffer.BeginRenderPass(render_pass_bi);
m_errorMonitor->VerifyFound();
m_commandBuffer->end();
m_command_buffer.end();
}

TEST_F(NegativeAndroidExternalResolve, ImagelessFramebufferFormat) {
Expand Down Expand Up @@ -580,11 +580,11 @@ TEST_F(NegativeAndroidExternalResolve, ImagelessFramebufferFormat) {
render_pass_bi.clearValueCount = 1;
render_pass_bi.pClearValues = &clear_value;

m_commandBuffer->begin();
m_command_buffer.begin();
m_errorMonitor->SetDesiredError("VUID-VkRenderPassBeginInfo-framebuffer-09353");
m_commandBuffer->BeginRenderPass(render_pass_bi);
m_command_buffer.BeginRenderPass(render_pass_bi);
m_errorMonitor->VerifyFound();
m_commandBuffer->end();
m_command_buffer.end();
}

TEST_F(NegativeAndroidExternalResolve, DynamicRendering) {
Expand Down Expand Up @@ -661,13 +661,13 @@ TEST_F(NegativeAndroidExternalResolve, DynamicRendering) {
begin_rendering_info.pDepthAttachment = &ds_attachment;
begin_rendering_info.pStencilAttachment = &ds_attachment;

m_commandBuffer->begin();
m_command_buffer.begin();

m_errorMonitor->SetAllowedFailureMsg("VUID-VkRenderingAttachmentInfo-imageView-06129");
// One for depth and stencil attachment
m_errorMonitor->SetDesiredError("VUID-VkRenderingInfo-pDepthAttachment-09318");
m_errorMonitor->SetDesiredError("VUID-VkRenderingInfo-pStencilAttachment-09319");
m_commandBuffer->BeginRendering(begin_rendering_info);
m_command_buffer.BeginRendering(begin_rendering_info);
m_errorMonitor->VerifyFound();

begin_rendering_info.colorAttachmentCount = 2;
Expand All @@ -677,7 +677,7 @@ TEST_F(NegativeAndroidExternalResolve, DynamicRendering) {
begin_rendering_info.pStencilAttachment = nullptr;

m_errorMonitor->SetDesiredError("VUID-VkRenderingInfo-colorAttachmentCount-09320");
m_commandBuffer->BeginRendering(begin_rendering_info);
m_command_buffer.BeginRendering(begin_rendering_info);
m_errorMonitor->VerifyFound();
}

Expand Down Expand Up @@ -751,21 +751,21 @@ TEST_F(NegativeAndroidExternalResolve, DynamicRenderingResolveModeNonNullColor)
begin_rendering_info.colorAttachmentCount = 1;
begin_rendering_info.pColorAttachments = &color_attachment;

m_commandBuffer->begin();
m_command_buffer.begin();

color_attachment.resolveImageView = resolve_view.handle();
color_attachment.imageView = VK_NULL_HANDLE;
m_errorMonitor->SetAllowedFailureMsg("VUID-VkRenderingAttachmentInfo-imageView-06129");
m_errorMonitor->SetDesiredError("VUID-VkRenderingAttachmentInfo-resolveMode-09329");
m_commandBuffer->BeginRendering(begin_rendering_info);
m_command_buffer.BeginRendering(begin_rendering_info);
m_errorMonitor->VerifyFound();

color_attachment.imageView = color_view.handle();
color_attachment.resolveImageView = bad_resolve_view.handle();
m_errorMonitor->SetAllowedFailureMsg("VUID-VkRenderingAttachmentInfo-imageView-06129");
m_errorMonitor->SetDesiredError("VUID-VkRenderingAttachmentInfo-resolveMode-09326");
m_errorMonitor->SetDesiredError("VUID-VkRenderingAttachmentInfo-resolveMode-09327");
m_commandBuffer->BeginRendering(begin_rendering_info);
m_command_buffer.BeginRendering(begin_rendering_info);
m_errorMonitor->VerifyFound();
}

Expand Down Expand Up @@ -907,11 +907,11 @@ TEST_F(NegativeAndroidExternalResolve, MissingImageUsage) {
begin_rendering_info.colorAttachmentCount = 1;
begin_rendering_info.pColorAttachments = &color_attachment;

m_commandBuffer->begin();
m_command_buffer.begin();
m_errorMonitor->SetAllowedFailureMsg("VUID-VkRenderingAttachmentInfo-imageView-06865");
m_errorMonitor->SetAllowedFailureMsg("VUID-VkRenderingAttachmentInfo-imageView-06129");
m_errorMonitor->SetDesiredError("VUID-VkRenderingInfo-colorAttachmentCount-09476");
m_commandBuffer->BeginRendering(begin_rendering_info);
m_command_buffer.BeginRendering(begin_rendering_info);
m_errorMonitor->VerifyFound();
}

Expand Down Expand Up @@ -983,21 +983,21 @@ TEST_F(NegativeAndroidExternalResolve, ClearAttachment) {
begin_rendering_info.colorAttachmentCount = 1;
begin_rendering_info.pColorAttachments = &color_attachment;

m_commandBuffer->begin();
m_command_buffer.begin();
m_errorMonitor->SetAllowedFailureMsg("VUID-VkRenderingAttachmentInfo-imageView-06865");
m_errorMonitor->SetAllowedFailureMsg("VUID-VkRenderingAttachmentInfo-imageView-06129");
m_commandBuffer->BeginRendering(begin_rendering_info);
m_command_buffer.BeginRendering(begin_rendering_info);

m_errorMonitor->SetDesiredError("VUID-vkCmdClearAttachments-aspectMask-09298");
VkClearAttachment clear_depth_attachment;
clear_depth_attachment.aspectMask = VK_IMAGE_ASPECT_PLANE_1_BIT;
clear_depth_attachment.colorAttachment = 0;
VkClearRect clear_rect = {{{0, 0}, {32, 32}}, 0, 1};
vk::CmdClearAttachments(m_commandBuffer->handle(), 1, &clear_depth_attachment, 1, &clear_rect);
vk::CmdClearAttachments(m_command_buffer.handle(), 1, &clear_depth_attachment, 1, &clear_rect);
m_errorMonitor->VerifyFound();

m_commandBuffer->EndRendering();
m_commandBuffer->end();
m_command_buffer.EndRendering();
m_command_buffer.end();
}

TEST_F(NegativeAndroidExternalResolve, DrawDynamicRasterizationSamples) {
Expand Down Expand Up @@ -1080,21 +1080,21 @@ TEST_F(NegativeAndroidExternalResolve, DrawDynamicRasterizationSamples) {
pipe.gp_ci_.renderPass = VK_NULL_HANDLE;
pipe.CreateGraphicsPipeline();

m_commandBuffer->begin();
m_command_buffer.begin();
m_errorMonitor->SetAllowedFailureMsg("VUID-VkRenderingAttachmentInfo-imageView-06865");
m_errorMonitor->SetAllowedFailureMsg("VUID-VkRenderingAttachmentInfo-imageView-06129");
m_commandBuffer->BeginRendering(begin_rendering_info);
vk::CmdBindPipeline(m_commandBuffer->handle(), VK_PIPELINE_BIND_POINT_GRAPHICS, pipe.Handle());
m_command_buffer.BeginRendering(begin_rendering_info);
vk::CmdBindPipeline(m_command_buffer.handle(), VK_PIPELINE_BIND_POINT_GRAPHICS, pipe.Handle());

vk::CmdSetRasterizationSamplesEXT(m_commandBuffer->handle(), VK_SAMPLE_COUNT_2_BIT);
vk::CmdSetRasterizationSamplesEXT(m_command_buffer.handle(), VK_SAMPLE_COUNT_2_BIT);
m_errorMonitor->SetAllowedFailureMsg("VUID-vkCmdDraw-None-09363");
m_errorMonitor->SetDesiredError("VUID-vkCmdDraw-None-09365");
m_errorMonitor->SetDesiredError("VUID-vkCmdDraw-rasterizationSamples-07474");
vk::CmdDraw(m_commandBuffer->handle(), 1, 1, 0, 0);
vk::CmdDraw(m_command_buffer.handle(), 1, 1, 0, 0);
m_errorMonitor->VerifyFound();

m_commandBuffer->EndRendering();
m_commandBuffer->end();
m_command_buffer.EndRendering();
m_command_buffer.end();
}

TEST_F(NegativeAndroidExternalResolve, PipelineBarrier) {
Expand Down Expand Up @@ -1162,7 +1162,7 @@ TEST_F(NegativeAndroidExternalResolve, PipelineBarrier) {
pipe.gp_ci_.renderPass = rp.Handle();
pipe.CreateGraphicsPipeline();

m_commandBuffer->begin();
m_command_buffer.begin();

VkImageMemoryBarrier2 barrier = vku::InitStructHelper();
barrier.srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
Expand All @@ -1181,17 +1181,17 @@ TEST_F(NegativeAndroidExternalResolve, PipelineBarrier) {
dependency_info.imageMemoryBarrierCount = 1;
dependency_info.pImageMemoryBarriers = &barrier;
// Valid because outside renderpass
vk::CmdPipelineBarrier2KHR(*m_commandBuffer, &dependency_info);
vk::CmdPipelineBarrier2KHR(m_command_buffer, &dependency_info);

m_commandBuffer->BeginRenderPass(rp.Handle(), framebuffer.handle(), 32, 32);
m_command_buffer.BeginRenderPass(rp.Handle(), framebuffer.handle(), 32, 32);

m_errorMonitor->SetDesiredError("VUID-vkCmdPipelineBarrier2-image-09374");
barrier.oldLayout = VK_IMAGE_LAYOUT_GENERAL;
vk::CmdPipelineBarrier2KHR(*m_commandBuffer, &dependency_info);
vk::CmdPipelineBarrier2KHR(m_command_buffer, &dependency_info);
m_errorMonitor->VerifyFound();

m_commandBuffer->EndRenderPass();
m_commandBuffer->end();
m_command_buffer.EndRenderPass();
m_command_buffer.end();
}

TEST_F(NegativeAndroidExternalResolve, PipelineBarrierUnused) {
Expand Down Expand Up @@ -1269,8 +1269,8 @@ TEST_F(NegativeAndroidExternalResolve, PipelineBarrierUnused) {
pipe.gp_ci_.renderPass = rp.Handle();
pipe.CreateGraphicsPipeline();

m_commandBuffer->begin();
m_commandBuffer->BeginRenderPass(rp.Handle(), framebuffer.handle());
m_command_buffer.begin();
m_command_buffer.BeginRenderPass(rp.Handle(), framebuffer.handle());

VkImageMemoryBarrier image_barrier = vku::InitStructHelper();
image_barrier.srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
Expand All @@ -1283,13 +1283,13 @@ TEST_F(NegativeAndroidExternalResolve, PipelineBarrierUnused) {
image_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;

m_errorMonitor->SetDesiredError("VUID-vkCmdPipelineBarrier-image-09373");
vk::CmdPipelineBarrier(m_commandBuffer->handle(), VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
vk::CmdPipelineBarrier(m_command_buffer.handle(), VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_DEPENDENCY_BY_REGION_BIT, 0, nullptr, 0, nullptr, 1,
&image_barrier);
m_errorMonitor->VerifyFound();

m_commandBuffer->EndRenderPass();
m_commandBuffer->end();
m_command_buffer.EndRenderPass();
m_command_buffer.end();
}

TEST_F(NegativeAndroidExternalResolve, RenderPassAndFramebuffer) {
Expand Down
Loading
Loading