diff --git a/docs/gpu_validation.md b/docs/gpu_validation.md index 63a3bf73571..3b5dd2f0c04 100644 --- a/docs/gpu_validation.md +++ b/docs/gpu_validation.md @@ -165,7 +165,7 @@ array elements, those elements are not required to have been written. The instrumentation code needs to know which elements of a descriptor array have been written, so that it can tell if one is used that has not been written. -Note that currently, `VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT` validation is not working and all accesses are reported as valid. +Note that currently, `VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK` validation is not working and all accesses are reported as valid. ### Buffer device address validation The vkGetBufferDeviceAddressEXT routine can be used to get a GPU address that a shader can use to directly address a particular buffer. diff --git a/docs/synchronization.md b/docs/synchronization.md index c2dde315406..16b319ffb4f 100644 --- a/docs/synchronization.md +++ b/docs/synchronization.md @@ -1,5 +1,5 @@ - + [![Khronos Vulkan][1]][2] [1]: https://vulkan.lunarg.com/img/Vulkan_100px_Dec16.png "https://www.khronos.org/vulkan/" @@ -16,7 +16,7 @@ Authors: Tobin Ehlis, John Zulauf ## Overview -The Vulkan API features a number of unique synchronization primitives to express execution and memory dependencies and currently validation only has limited support for tracking fence and semaphore primitives. +The Vulkan API features a number of unique synchronization primitives to express execution and memory dependencies and currently validation only has limited support for tracking fence and semaphore primitives. @@ -99,7 +99,7 @@ For read operations the most recent access rules apply to prior reads with execu ![sync_wrr](images/sync_wrr.png) -For write hazard checks in a given range of memory addresses, if there are intervening read operations between the current write and the most recent previous write, these intervening read operations are considered the most recent access. In that case, write-after-write checks are not done. +For write hazard checks in a given range of memory addresses, if there are intervening read operations between the current write and the most recent previous write, these intervening read operations are considered the most recent access. In that case, write-after-write checks are not done. Consider the following sequence of operations one the same memory address: @@ -138,7 +138,7 @@ Memory access is characterized by the _memory extent_ and _memory usage_. Memor ### Memory Address Space -To simplify tracking and updating the state of memory extents as listed below, state is stored in a consistent way for all resource types. Also, to eliminate needing to define separate address spaces for each device memory allocations, VkMemory are placed at “fake” base addresses (FBA) within a global address space using a simple “next available” allocation scheme. (Which is robust for all rational Vulkan usage models for months of runtime.) Additionally, because the actual memory organization of certain resources is opaque, an "opaque range" is allocated with an independent FBA to the extent needed to hold the Synchronization Validation internal representation of these opaque resources. +To simplify tracking and updating the state of memory extents as listed below, state is stored in a consistent way for all resource types. Also, to eliminate needing to define separate address spaces for each device memory allocations, VkMemory are placed at “fake” base addresses (FBA) within a global address space using a simple “next available” allocation scheme. (Which is robust for all rational Vulkan usage models for months of runtime.) Additionally, because the actual memory organization of certain resources is opaque, an "opaque range" is allocated with an independent FBA to the extent needed to hold the Synchronization Validation internal representation of these opaque resources. ### Memory Extent Definitions and Comparisons @@ -240,23 +240,23 @@ For convenience, the tables below show the pipeline stages and access masks aff | Vulkan 1.2 Pipeline Stage | Synchronization2 Pipeline Stages | | ---------------------------------- | ------------------------------------------------------------ | -| VK_PIPELINE_STAGE_TRANSFER_BIT | VK_PIPELINE_STAGE_2_COPY_BIT_KHR VK_PIPELINE_STAGE_2_RESOLVE_BIT_KHR VK_PIPELINE_STAGE_2_BLIT_BIT_KHR VK_PIPELINE_STAGE_2_CLEAR_BIT_KHR | -| VK_PIPELINE_STAGE_VERTEX_INPUT_BIT | VK_PIPELINE_STAGE_2_INDEX_INPUT_BIT_KHR VK_PIPELINE_STAGE_2_VERTEX_ATTRIBUTE_INPUT_BIT_KHR | +| VK_PIPELINE_STAGE_TRANSFER_BIT | VK_PIPELINE_STAGE_2_COPY_BIT VK_PIPELINE_STAGE_2_RESOLVE_BIT VK_PIPELINE_STAGE_2_BLIT_BIT VK_PIPELINE_STAGE_2_CLEAR_BIT | +| VK_PIPELINE_STAGE_VERTEX_INPUT_BIT | VK_PIPELINE_STAGE_2_INDEX_INPUT_BIT VK_PIPELINE_STAGE_2_VERTEX_ATTRIBUTE_INPUT_BIT | | Vulkan 1.2 Access Mask | Synchronization2 Access Masks | | -------------------------- | ------------------------------------------------------------ | -| VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_2_SHADER_SAMPLED_READ_BIT_KHR VK_ACCESS_2_SHADER_STORAGE_READ_BIT_KHR | -| VK_ACCESS_SHADER_WRITE_BIT | VK_ACCESS_2_SHADER_STORAGE_WRITE_BIT_KHR | +| VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_2_SHADER_SAMPLED_READ_BIT VK_ACCESS_2_SHADER_STORAGE_READ_BIT | +| VK_ACCESS_SHADER_WRITE_BIT | VK_ACCESS_2_SHADER_STORAGE_WRITE_BIT | These stages also affect the Stage / Access map described in the next section. - + ### Memory Usage Specification -Vulkan classifies memory access by pipeline stage and access. However for purposes of tracking specific access, availability, and visibility state changes the two masks would allow for aliasing that could hide hazards. In order to avoid that aliasing, the valid combinations of Stage and Access flags can be combined into memory usages-- with each represented by a unique index (currently 79 valid combinations) )and tracked with single bit within a mask(list in roughly pipeline order). +Vulkan classifies memory access by pipeline stage and access. However for purposes of tracking specific access, availability, and visibility state changes the two masks would allow for aliasing that could hide hazards. In order to avoid that aliasing, the valid combinations of Stage and Access flags can be combined into memory usages-- with each represented by a unique index (currently 79 valid combinations) )and tracked with single bit within a mask(list in roughly pipeline order). @@ -509,7 +509,7 @@ Stores: * Stage/Access of usage. Updated on stage read * Execution (read) barriers -- the union of destination execution scopes for synchronization operations affecting this read at this stage. Cleared at read operation for this stage. * Sync stages -- all read stages that have synchronously executed after this stage Cleared at read operation for this stage. - * Queue Id: The queue on which the access was made. Set at queue submit time. + * Queue Id: The queue on which the access was made. Set at queue submit time. * Usage Tag. Updated on on stage read Implements: @@ -520,9 +520,9 @@ Implements: Queue Id and Sync stages are used for semaphore, queue, and fence wait operations, and for synchronization operation replay at queue submit time. -#### ResourceAccessRangeMap +#### ResourceAccessRangeMap -#### ResourceAccessRangeMap +#### ResourceAccessRangeMap Interval tree of ResourceAccessState records within the unified "fake" address space, comprising VkDeviceMemory linear ranges and opaque ranges @@ -545,7 +545,7 @@ Implements: #### CommandBufferAccessContext -container for all access contexts for a specific command buffer, and state reflecting the current context. +container for all access contexts for a specific command buffer, and state reflecting the current context. Stores: @@ -602,11 +602,11 @@ The ResourceAccessState is the leaf level structure at which the synchronization * Update: Record the state change based an “ordinary” memory access * Read usages: add or update the current usage to the read usage list, clearing the stage barriers and updating the stage read tag. Updates the sync stages information of read stages with barriers to current read. * Write usages: erase read usages, update write usage and clear write barriers and update the write tag - + * Resolve: Combine access states from different contexts * If one write tag is strictly after another, the later state is preserved * If the write tags match, the pre-stage read information is resolved as a union of stages accessed, with most recent usage retained if stage present in both contexts. - + * Execution Barrier * Effect on read usage (per stage with usage) * If the _source execution scope_ includes the stage, or intersects with the mask of barriers, the _destination execution scope_ is OR’d with the barrier mask. @@ -651,7 +651,7 @@ The ResourceAccessState is the leaf level structure at which the synchronization * For write access * If there have been read accesses since the last write, test each per-stage read record, if any read does not have a barrier for the write access stage, report WAR hazard. * If there is a write recorded, and no read accesses since, test stage/access flag vs. write barriers. If there is no write barrier for stage/access, report WAW hazard - > Note: Excluding WAW checks when reads after last write reflect the MRA principle discussed. If those reads were not hazards, no WAW hazard would be possible unless a WAR hazard exists. + > Note: Excluding WAW checks when reads after last write reflect the MRA principle discussed. If those reads were not hazards, no WAW hazard would be possible unless a WAR hazard exists. * For accesses with Ordering Guarantees * Certain operations (rasterization, load, store, clear, resolve) have guaranteed ordering at the sample level. * Hazard check performed for these operations supply ordering execution and access scope masks, indicating the stages and accesses that have ordering guarantees. If the last write (for read access) or the last write and all last reads (for write accesses) are all with the access and execution scopes, there is no hazard. @@ -735,7 +735,7 @@ As noted above Image Layout Transition are typically implemented in the context ### Renderpass Operations -As within a renderpass instance subpasses may execute dependently or independently, and include implicit image layout transitions, barriers, load, store and resolve operations. These operations use the Access Context objects connected in the render pass dependency graph. All validation operations are performed on a backward-looking basis, with operations in higher index subpasses begin validated against previous access, without deferral or replay of earlier accesses. +As within a renderpass instance subpasses may execute dependently or independently, and include implicit image layout transitions, barriers, load, store and resolve operations. These operations use the Access Context objects connected in the render pass dependency graph. All validation operations are performed on a backward-looking basis, with operations in higher index subpasses begin validated against previous access, without deferral or replay of earlier accesses. #### Resource Access State Resolution @@ -751,7 +751,7 @@ Note: there is a bit of a complication arising from the following: #### Resource Stage/Access Validation and Update -For simple stage/access references, hazard detection operates on the state found in the Access Context, or failing that on the state returned by state resolution above. The detail is encapsulated within the Access Context, and for any given stage/access and address range, may be divided between state stored currently within Access Context and state resolved. +For simple stage/access references, hazard detection operates on the state found in the Access Context, or failing that on the state returned by state resolution above. The detail is encapsulated within the Access Context, and for any given stage/access and address range, may be divided between state stored currently within Access Context and state resolved. State update likewise operates on state either from the Access Context of the subpass, or resolved from the DAG, with the updated state stored into the subpass Access Context. This detail is also encapsulated in the Access Context, and Access Context objects _outside_ of a renderpass instance simply have an empty “previous” context graph. @@ -760,7 +760,7 @@ State update likewise operates on state either from the Access Context of the su For renderpass begin/next entry points, two types of accesses occur -- image layout transitions and load operations. As these operations and tests occur on the boundary between subpasses (or between “external” and a subpass) they are handled within the Begin/Next validate and record functions. If no implicit accesses (layout transition or load operation), no state update occurs, leaving the subpass barrier application to the lazy resolve operations described above. -**TODO/KNOWN LIMITATION: **First phase does not include implementation of multi-view renderpass support. +**TODO/KNOWN LIMITATION: **First phase does not include implementation of multi-view renderpass support. #### Subpass Image Layout Transitions @@ -886,7 +886,7 @@ Resolve operations export the state of the subpass access contexts to the access #### CmdPipelineBarrier -For each memory, buffer, and image barrier defined use the range traversal functions to update all accesses in source scope. For images, prior to update (i.e. in PreValidate…) test for image layout transition hazards as described above. +For each memory, buffer, and image barrier defined use the range traversal functions to update all accesses in source scope. For images, prior to update (i.e. in PreValidate…) test for image layout transition hazards as described above. Apply global execution barriers from the src/dstStageMask. @@ -904,12 +904,12 @@ CmdWaitEvent uses both the source execution scope map and the usage tag to deter Semaphore Operations synchronize accesses between submitted command buffers at submission "batch" granularity. Semaphores (unlike barriers and events) can synchronize both accesses within command buffers submitted to a single queue, and (more typically) between accesses within command buffers on different queues. Semaphores, like events, are two part synchronization operations. The first scope of the combined operation is defined relative to the signaling queue, and includes the usual chaining of the first scopes with prior accesses and synchronization operations. The second scope of the wait operation is applied to all accesses within the first scope of the signal operation. For semaphores synchronizing different queues, the second scope of the combined operation *replaces* the barrier state for access imported into the QueueBatchContext. -There are additional impacts to the application of barriers/event and hazard detection for accesses which are from different queues -- i.e. that are *not* in submission order. Since barriers and events are defined only to include operations that are earlier in submission order, barriers (and event) first scopes do not include accesses performed in other queues. For those accesses, only the chaining effects of earlier synchronization operations, such as semaphore, include a given access within the first scope of a barrier. Hazard detection is also affected in that implicit ordering guarantees are not applied to accesses not in submission order. +There are additional impacts to the application of barriers/event and hazard detection for accesses which are from different queues -- i.e. that are *not* in submission order. Since barriers and events are defined only to include operations that are earlier in submission order, barriers (and event) first scopes do not include accesses performed in other queues. For those accesses, only the chaining effects of earlier synchronization operations, such as semaphore, include a given access within the first scope of a barrier. Hazard detection is also affected in that implicit ordering guarantees are not applied to accesses not in submission order. ### Command Buffer Action Commands -Recorded action command describe compute, graphics, or transfer actions to be executed on a device when the containing command buffer is submitted to a queue of the appropriate capabilities. Validation of these consists (in the first phase of implementation) of hazard detection for all known <range, stage/access> pairs against the current access context. The access context is then updated for the same set of <range, stage/access> pair. Each update is tagged with the Usage Tag as described above +Recorded action command describe compute, graphics, or transfer actions to be executed on a device when the containing command buffer is submitted to a queue of the appropriate capabilities. Validation of these consists (in the first phase of implementation) of hazard detection for all known <range, stage/access> pairs against the current access context. The access context is then updated for the same set of <range, stage/access> pair. Each update is tagged with the Usage Tag as described above #### Commands @@ -1138,7 +1138,7 @@ Recording and validating `vkCmdExecuteCommands `which is more similar in scope t These are read only, but as the actual indices and vertices referenced are only known at shader execution time, the entire bound resource is treated as being read by draw commands that reference these bound resources Vertex - + Index ##### Bound Descriptor Set Access @@ -1313,11 +1313,11 @@ The stage/access for each bound descriptor referenced by a draw or dispatch call Color attachment use is controlled by the fragment shader output declarations and `VkPipelineRasterizationStateCreateInfo::rasterizerDiscardEnable`. Fragment shader output variables with Location decorations correspond to the pColorAttachments index for the current subpass. The renderArea portion of these attachments is treated as stage/access SYNC_COLOR_ATTACHMENT_OUTPUT_COLOR_ATTACHMENT_WRITE, unless `rasterizerDiscardEnable `is true -- in which case a operations on color attachments result in no memory accesses. -**TODO/KNOWN LIMITATION:** Memory access checks not suppressed for VK_CULL_MODE_FRONT_AND_BACK -- would need to ensure we have sufficient information to know TOPOLOGY being emitted to rasterization fixed function state. +**TODO/KNOWN LIMITATION:** Memory access checks not suppressed for VK_CULL_MODE_FRONT_AND_BACK -- would need to ensure we have sufficient information to know TOPOLOGY being emitted to rasterization fixed function state. **TODO/KNOWN LIMITATION: **First phase does not include component granularity access tracking. -> Designer’s note. Given the “inmost loop” nature of component read/write enable, it is likely the performance and memory use will be unacceptable unless the opaque range encoding changes the apparent memory organization of components to be at least just above the x, y, and z dimensions, s.t. the effective “run-length-compression” of the range maps is not lost. Storing access state byte-by-byte is likely not going to be acceptable. Whether this encoding should be adaptive (only present for images with component level information or globally present in the opaque range Synchronization Validation specific encoding) is a design detail TBD. For broadest application this may mean that non-aliased linear tiling images should also be given an an validation specific opaque encoding w.r.t. component granularity information. +> Designer’s note. Given the “inmost loop” nature of component read/write enable, it is likely the performance and memory use will be unacceptable unless the opaque range encoding changes the apparent memory organization of components to be at least just above the x, y, and z dimensions, s.t. the effective “run-length-compression” of the range maps is not lost. Storing access state byte-by-byte is likely not going to be acceptable. Whether this encoding should be adaptive (only present for images with component level information or globally present in the opaque range Synchronization Validation specific encoding) is a design detail TBD. For broadest application this may mean that non-aliased linear tiling images should also be given an an validation specific opaque encoding w.r.t. component granularity information. ##### Depth/Stencil Attachments diff --git a/layers/best_practices/best_practices_validation.h b/layers/best_practices/best_practices_validation.h index 81b21b73689..79589aa7a32 100644 --- a/layers/best_practices/best_practices_validation.h +++ b/layers/best_practices/best_practices_validation.h @@ -307,7 +307,7 @@ class BestPractices : public ValidationStateTracker { bool CheckPipelineStageFlags(const LogObjectList& objlist, const Location& loc, VkPipelineStageFlags flags) const; bool CheckPipelineStageFlags(const LogObjectList& objlist, const Location& loc, VkPipelineStageFlags2KHR flags) const; - bool CheckDependencyInfo(const LogObjectList& objlist, const Location& dep_loc, const VkDependencyInfoKHR& dep_info) const; + bool CheckDependencyInfo(const LogObjectList& objlist, const Location& dep_loc, const VkDependencyInfo& dep_info) const; bool PreCallValidateQueueSubmit(VkQueue queue, uint32_t submitCount, const VkSubmitInfo* pSubmits, VkFence fence, const ErrorObject& error_obj) const override; bool PreCallValidateQueueSubmit2KHR(VkQueue queue, uint32_t submitCount, const VkSubmitInfo2KHR* pSubmits, VkFence fence, @@ -414,7 +414,7 @@ class BestPractices : public ValidationStateTracker { void PostCallRecordCmdPushConstants(VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void* pValues, const RecordObject& record_obj) override; - void PostCallRecordCmdPushConstants2(VkCommandBuffer commandBuffer, const VkPushConstantsInfoKHR* pPushConstantsInfo, + void PostCallRecordCmdPushConstants2(VkCommandBuffer commandBuffer, const VkPushConstantsInfo* pPushConstantsInfo, const RecordObject& record_obj) override; void PostCallRecordCmdPushConstants2KHR(VkCommandBuffer commandBuffer, const VkPushConstantsInfoKHR* pPushConstantsInfo, const RecordObject& record_obj) override; diff --git a/layers/best_practices/bp_drawdispatch.cpp b/layers/best_practices/bp_drawdispatch.cpp index b358eda9ee1..8ce8e9c0e1e 100644 --- a/layers/best_practices/bp_drawdispatch.cpp +++ b/layers/best_practices/bp_drawdispatch.cpp @@ -256,7 +256,7 @@ bool BestPractices::ValidateIndexBufferArm(const bp_state::CommandBuffer& cmd_st for (const uint8_t* scan_ptr = scan_begin; scan_ptr < scan_end; scan_ptr += scan_stride) { uint32_t scan_index; uint32_t primitive_restart_value; - if (ib_type == VK_INDEX_TYPE_UINT8_KHR) { + if (ib_type == VK_INDEX_TYPE_UINT8) { scan_index = *reinterpret_cast(scan_ptr); primitive_restart_value = 0xFF; } else if (ib_type == VK_INDEX_TYPE_UINT16) { @@ -309,7 +309,7 @@ bool BestPractices::ValidateIndexBufferArm(const bp_state::CommandBuffer& cmd_st // Knowing the size from the last scan allows us to record index usage with bitsets for (const uint8_t* scan_ptr = scan_begin; scan_ptr < scan_end; scan_ptr += scan_stride) { uint32_t scan_index; - if (ib_type == VK_INDEX_TYPE_UINT8_KHR) { + if (ib_type == VK_INDEX_TYPE_UINT8) { scan_index = *reinterpret_cast(scan_ptr); } else if (ib_type == VK_INDEX_TYPE_UINT16) { scan_index = *reinterpret_cast(scan_ptr); diff --git a/layers/best_practices/bp_pipeline.cpp b/layers/best_practices/bp_pipeline.cpp index 963efc17c1f..0bea8b9766b 100644 --- a/layers/best_practices/bp_pipeline.cpp +++ b/layers/best_practices/bp_pipeline.cpp @@ -120,13 +120,13 @@ bool BestPractices::ValidateCreateGraphicsPipeline(const VkGraphicsPipelineCreat const auto* graphics_lib_info = vku::FindStructInPNextChain(create_info.pNext); if (create_info.renderPass == VK_NULL_HANDLE && - !vku::FindStructInPNextChain(create_info.pNext) && + !vku::FindStructInPNextChain(create_info.pNext) && (!graphics_lib_info || (graphics_lib_info->flags & (VK_GRAPHICS_PIPELINE_LIBRARY_FRAGMENT_SHADER_BIT_EXT | VK_GRAPHICS_PIPELINE_LIBRARY_FRAGMENT_OUTPUT_INTERFACE_BIT_EXT)) != 0)) { skip |= LogWarning( "BestPractices-Pipeline-NoRendering", device, create_info_loc, - "renderPass is VK_NULL_HANDLE and pNext chain does not contain an instance of VkPipelineRenderingCreateInfoKHR."); + "renderPass is VK_NULL_HANDLE and pNext chain does not contain an instance of VkPipelineRenderingCreateInfo."); } if (VendorCheckEnabled(kBPVendorArm)) { diff --git a/layers/best_practices/bp_render_pass.cpp b/layers/best_practices/bp_render_pass.cpp index b0c12b31e1c..2f663d676a1 100644 --- a/layers/best_practices/bp_render_pass.cpp +++ b/layers/best_practices/bp_render_pass.cpp @@ -405,8 +405,8 @@ void BestPractices::RecordCmdBeginRenderPass(bp_state::CommandBuffer& cb_state, } // If renderpass doesn't load attachment, no need to validate image in queue - if ((!vkuFormatIsStencilOnly(attachment.format) && attachment.loadOp == VK_ATTACHMENT_LOAD_OP_NONE_KHR) || - (vkuFormatHasStencil(attachment.format) && attachment.stencilLoadOp == VK_ATTACHMENT_LOAD_OP_NONE_KHR)) { + if ((!vkuFormatIsStencilOnly(attachment.format) && attachment.loadOp == VK_ATTACHMENT_LOAD_OP_NONE) || + (vkuFormatHasStencil(attachment.format) && attachment.stencilLoadOp == VK_ATTACHMENT_LOAD_OP_NONE)) { continue; } @@ -640,7 +640,7 @@ void BestPractices::PostCallRecordCmdPushConstants(VkCommandBuffer commandBuffer StateTracker::PostCallRecordCmdPushConstants(commandBuffer, layout, stageFlags, offset, size, pValues, record_obj); } -void BestPractices::PostCallRecordCmdPushConstants2(VkCommandBuffer commandBuffer, const VkPushConstantsInfoKHR* pPushConstantsInfo, +void BestPractices::PostCallRecordCmdPushConstants2(VkCommandBuffer commandBuffer, const VkPushConstantsInfo* pPushConstantsInfo, const RecordObject& record_obj) { StateTracker::PostCallRecordCmdPushConstants2(commandBuffer, pPushConstantsInfo, record_obj); } diff --git a/layers/best_practices/bp_synchronization.cpp b/layers/best_practices/bp_synchronization.cpp index be20d51277c..fb45a4efd80 100644 --- a/layers/best_practices/bp_synchronization.cpp +++ b/layers/best_practices/bp_synchronization.cpp @@ -38,19 +38,19 @@ bool BestPractices::CheckPipelineStageFlags(const LogObjectList& objlist, const VkPipelineStageFlags2KHR flags) const { bool skip = false; - if (flags & VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT_KHR) { - skip |= LogWarning("BestPractices-pipeline-stage-flags2-graphics", objlist, loc, - "using VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT_KHR"); - } else if (flags & VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT_KHR) { - skip |= LogWarning("BestPractices-pipeline-stage-flags2-compute", objlist, loc, - "using VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT_KHR"); + if (flags & VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT) { + skip |= + LogWarning("BestPractices-pipeline-stage-flags2-graphics", objlist, loc, "using VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT"); + } else if (flags & VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT) { + skip |= + LogWarning("BestPractices-pipeline-stage-flags2-compute", objlist, loc, "using VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT"); } return skip; } bool BestPractices::CheckDependencyInfo(const LogObjectList& objlist, const Location& dep_loc, - const VkDependencyInfoKHR& dep_info) const { + const VkDependencyInfo& dep_info) const { bool skip = false; auto stage_masks = sync_utils::GetGlobalStageMasks(dep_info); diff --git a/layers/chassis/chassis_manual.cpp b/layers/chassis/chassis_manual.cpp index d27ba2d6d79..a3b0d2c54fe 100644 --- a/layers/chassis/chassis_manual.cpp +++ b/layers/chassis/chassis_manual.cpp @@ -933,7 +933,7 @@ static const VkPhysicalDeviceToolPropertiesEXT khronos_layer_tool_props = { nullptr, "Khronos Validation Layer", STRINGIFY(VK_HEADER_VERSION), - VK_TOOL_PURPOSE_VALIDATION_BIT_EXT | VK_TOOL_PURPOSE_ADDITIONAL_FEATURES_BIT_EXT | VK_TOOL_PURPOSE_DEBUG_REPORTING_BIT_EXT | + VK_TOOL_PURPOSE_VALIDATION_BIT | VK_TOOL_PURPOSE_ADDITIONAL_FEATURES_BIT | VK_TOOL_PURPOSE_DEBUG_REPORTING_BIT_EXT | VK_TOOL_PURPOSE_DEBUG_MARKERS_BIT_EXT, "Khronos Validation Layer", OBJECT_LAYER_NAME}; diff --git a/layers/chassis/dispatch_object_manual.cpp b/layers/chassis/dispatch_object_manual.cpp index 7071080e1ff..e149dd3f4c2 100644 --- a/layers/chassis/dispatch_object_manual.cpp +++ b/layers/chassis/dispatch_object_manual.cpp @@ -301,9 +301,9 @@ void DispatchObject::ExportMetalObjectsEXT(VkDevice device, VkExportMetalObjects // The VK_EXT_pipeline_creation_feedback extension returns data from the driver -- we've created a copy of the pnext chain, so // copy the returned data to the caller before freeing the copy's data. void CopyCreatePipelineFeedbackData(const void *src_chain, const void *dst_chain) { - auto src_feedback_struct = vku::FindStructInPNextChain(src_chain); - auto dst_feedback_struct = const_cast( - vku::FindStructInPNextChain(dst_chain)); + auto src_feedback_struct = vku::FindStructInPNextChain(src_chain); + auto dst_feedback_struct = const_cast( + vku::FindStructInPNextChain(dst_chain)); if (!src_feedback_struct || !dst_feedback_struct) return; ASSERT_AND_RETURN(dst_feedback_struct->pPipelineCreationFeedback && src_feedback_struct->pPipelineCreationFeedback); @@ -724,7 +724,7 @@ VkResult DispatchObject::CreateDescriptorUpdateTemplate(VkDevice device, const V if (pCreateInfo->templateType == VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET) { local_pCreateInfo->descriptorSetLayout = Unwrap(pCreateInfo->descriptorSetLayout); } - if (pCreateInfo->templateType == VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR) { + if (pCreateInfo->templateType == VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS) { local_pCreateInfo->pipelineLayout = Unwrap(pCreateInfo->pipelineLayout); } } @@ -757,7 +757,7 @@ VkResult DispatchObject::CreateDescriptorUpdateTemplateKHR(VkDevice device, cons if (pCreateInfo->templateType == VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET) { local_pCreateInfo->descriptorSetLayout = Unwrap(pCreateInfo->descriptorSetLayout); } - if (pCreateInfo->templateType == VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR) { + if (pCreateInfo->templateType == VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS) { local_pCreateInfo->pipelineLayout = Unwrap(pCreateInfo->pipelineLayout); } } @@ -862,7 +862,7 @@ void *BuildUnwrappedUpdateTemplateBuffer(DispatchObject *layer_data, uint64_t de VkBufferView wrapped_entry = layer_data->Unwrap(*buffer_view_handle); template_entries.emplace_back(offset, kVulkanObjectTypeBufferView, CastToUint64(wrapped_entry), 0); } break; - case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT: { + case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK: { size_t numBytes = create_info.pDescriptorUpdateEntries[i].descriptorCount; allocation_size = std::max(allocation_size, offset + numBytes); // nothing to unwrap, just plain data @@ -1004,19 +1004,19 @@ void DispatchObject::CmdPushDescriptorSetWithTemplateKHR(VkCommandBuffer command } void DispatchObject::CmdPushDescriptorSetWithTemplate2( - VkCommandBuffer commandBuffer, const VkPushDescriptorSetWithTemplateInfoKHR *pPushDescriptorSetWithTemplateInfo) { + VkCommandBuffer commandBuffer, const VkPushDescriptorSetWithTemplateInfo *pPushDescriptorSetWithTemplateInfo) { if (!wrap_handles) return device_dispatch_table.CmdPushDescriptorSetWithTemplate2KHR(commandBuffer, pPushDescriptorSetWithTemplateInfo); uint64_t template_handle = CastToUint64(pPushDescriptorSetWithTemplateInfo->descriptorUpdateTemplate); void *unwrapped_buffer = nullptr; { ReadLockGuard lock(dispatch_lock); - const_cast(pPushDescriptorSetWithTemplateInfo)->descriptorUpdateTemplate = + const_cast(pPushDescriptorSetWithTemplateInfo)->descriptorUpdateTemplate = Unwrap(pPushDescriptorSetWithTemplateInfo->descriptorUpdateTemplate); - const_cast(pPushDescriptorSetWithTemplateInfo)->layout = + const_cast(pPushDescriptorSetWithTemplateInfo)->layout = Unwrap(pPushDescriptorSetWithTemplateInfo->layout); unwrapped_buffer = BuildUnwrappedUpdateTemplateBuffer(this, template_handle, pPushDescriptorSetWithTemplateInfo->pData); - const_cast(pPushDescriptorSetWithTemplateInfo)->pData = unwrapped_buffer; + const_cast(pPushDescriptorSetWithTemplateInfo)->pData = unwrapped_buffer; } device_dispatch_table.CmdPushDescriptorSetWithTemplate2(commandBuffer, pPushDescriptorSetWithTemplateInfo); free(unwrapped_buffer); diff --git a/layers/core_checks/cc_buffer.cpp b/layers/core_checks/cc_buffer.cpp index 2f2477c8418..6ad34b66136 100644 --- a/layers/core_checks/cc_buffer.cpp +++ b/layers/core_checks/cc_buffer.cpp @@ -106,7 +106,7 @@ bool CoreChecks::ValidateBufferViewBuffer(const vvl::Buffer &buffer_state, const const VkFormatProperties3KHR format_properties = GetPDFormatProperties(format); const VkBufferUsageFlags2KHR usage = buffer_state.usage; if ((usage & VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT) && - !(format_properties.bufferFeatures & VK_FORMAT_FEATURE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR)) { + !(format_properties.bufferFeatures & VK_FORMAT_FEATURE_2_UNIFORM_TEXEL_BUFFER_BIT)) { skip |= LogError("VUID-VkBufferViewCreateInfo-format-08778", buffer_state.Handle(), loc.dot(Field::buffer), "was created with usage (%s) containing VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT.\n" "Format (%s) doesn't support VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT.\n" @@ -115,7 +115,7 @@ bool CoreChecks::ValidateBufferViewBuffer(const vvl::Buffer &buffer_state, const string_VkFormatFeatureFlags2(format_properties.bufferFeatures).c_str()); } if ((usage & VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT) && - !(format_properties.bufferFeatures & VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_BIT_KHR)) { + !(format_properties.bufferFeatures & VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_BIT)) { skip |= LogError("VUID-VkBufferViewCreateInfo-format-08779", buffer_state.Handle(), loc.dot(Field::buffer), "was created with usage (%s) containing VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT.\n" "Format (%s) doesn't support VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT.\n" @@ -276,7 +276,7 @@ bool CoreChecks::PreCallValidateCreateBuffer(VkDevice device, const VkBufferCrea } } - const auto *usage_flags2 = vku::FindStructInPNextChain(pCreateInfo->pNext); + const auto *usage_flags2 = vku::FindStructInPNextChain(pCreateInfo->pNext); const VkBufferUsageFlags2KHR usage = usage_flags2 ? usage_flags2->usage : pCreateInfo->usage; const bool has_decode_usage = usage & (VK_BUFFER_USAGE_VIDEO_DECODE_SRC_BIT_KHR | VK_BUFFER_USAGE_VIDEO_DECODE_DST_BIT_KHR); @@ -431,9 +431,9 @@ bool CoreChecks::PreCallValidateCreateBufferView(VkDevice device, const VkBuffer } } - if (auto buffer_usage_flags2 = vku::FindStructInPNextChain(pCreateInfo->pNext)) { + if (auto buffer_usage_flags2 = vku::FindStructInPNextChain(pCreateInfo->pNext)) { const VkBufferUsageFlags2KHR usage = buffer_usage_flags2->usage; - if ((usage & ~(VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR | VK_BUFFER_USAGE_2_STORAGE_TEXEL_BUFFER_BIT_KHR)) != 0) { + if ((usage & ~(VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT | VK_BUFFER_USAGE_2_STORAGE_TEXEL_BUFFER_BIT)) != 0) { skip |= LogError("VUID-VkBufferViewCreateInfo-pNext-08780", objlist, create_info_loc.pNext(Struct::VkBufferUsageFlags2CreateInfo, Field::usage), "is %s.", string_VkBufferUsageFlags2(usage).c_str()); diff --git a/layers/core_checks/cc_cmd_buffer.cpp b/layers/core_checks/cc_cmd_buffer.cpp index 8fbbbea76ad..f25b1177331 100644 --- a/layers/core_checks/cc_cmd_buffer.cpp +++ b/layers/core_checks/cc_cmd_buffer.cpp @@ -158,7 +158,7 @@ bool CoreChecks::PreCallValidateBeginCommandBuffer(VkCommandBuffer commandBuffer const VkFormat attachment_format = p_inherited_rendering_info->pColorAttachmentFormats[i]; if (attachment_format != VK_FORMAT_UNDEFINED) { const VkFormatFeatureFlags2 potential_format_features = GetPotentialFormatFeatures(attachment_format); - if ((potential_format_features & (VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT_KHR | + if ((potential_format_features & (VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_2_LINEAR_COLOR_ATTACHMENT_BIT_NV)) == 0) { skip |= LogError("VUID-VkCommandBufferInheritanceRenderingInfo-pColorAttachmentFormats-06492", commandBuffer, @@ -171,7 +171,7 @@ bool CoreChecks::PreCallValidateBeginCommandBuffer(VkCommandBuffer commandBuffer } } - const VkFormatFeatureFlags2 valid_depth_stencil_format = VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT_KHR; + const VkFormatFeatureFlags2 valid_depth_stencil_format = VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT; const VkFormat depth_format = p_inherited_rendering_info->depthAttachmentFormat; if (depth_format != VK_FORMAT_UNDEFINED) { const VkFormatFeatureFlags2 potential_format_features = GetPotentialFormatFeatures(depth_format); @@ -859,14 +859,14 @@ bool CoreChecks::PreCallValidateCmdExecuteCommands(VkCommandBuffer commandBuffer if (cb_state.hasRenderPassInstance && cb_state.activeRenderPass->UsesDynamicRendering() && !((cb_state.activeRenderPass->use_dynamic_rendering && (cb_state.activeRenderPass->dynamic_rendering_begin_rendering_info.flags & - VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR)) || + VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT)) || (cb_state.activeRenderPass->use_dynamic_rendering_inherited && (cb_state.activeRenderPass->inheritance_rendering_info.flags & - VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR)))) { + VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT)))) { const LogObjectList objlist(commandBuffer, cb_state.activeRenderPass->Handle()); skip |= LogError("VUID-vkCmdExecuteCommands-flags-06024", objlist, error_obj.location, "VkRenderingInfo::flags must include " - "VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR when calling vkCmdExecuteCommands() within a " + "VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT when calling vkCmdExecuteCommands() within a " "render pass instance begun with vkCmdBeginRendering()."); } } @@ -887,13 +887,13 @@ bool CoreChecks::PreCallValidateCmdExecuteCommands(VkCommandBuffer commandBuffer if (cb_state.activeRenderPass) { if (cb_state.hasRenderPassInstance && cb_state.activeRenderPass->UsesDynamicRendering() && sub_cb_state.activeRenderPass->UsesDynamicRendering()) { - const auto *location_info = vku::FindStructInPNextChain( + const auto *location_info = vku::FindStructInPNextChain( sub_cb_state.activeRenderPass->inheritance_rendering_info.pNext); if (location_info) { const std::string vuid_090504 = "VUID-vkCmdExecuteCommands-pCommandBuffers-09504"; const LogObjectList objlist(commandBuffer, pCommandBuffers[i]); - skip |= ValidateRenderingAttachmentLocationsKHR(*location_info, objlist, cb_loc.dot(Field::pNext)); + skip |= ValidateRenderingAttachmentLocations(*location_info, objlist, cb_loc.dot(Field::pNext)); if (location_info->colorAttachmentCount != cb_state.rendering_attachments.color_indexes.size()) { skip |= LogError(vuid_090504, objlist, @@ -922,13 +922,13 @@ bool CoreChecks::PreCallValidateCmdExecuteCommands(VkCommandBuffer commandBuffer } } - const auto *index_info = vku::FindStructInPNextChain( + const auto *index_info = vku::FindStructInPNextChain( sub_cb_state.activeRenderPass->inheritance_rendering_info.pNext); if (index_info) { const std::string vuid_090505 = "VUID-vkCmdExecuteCommands-pCommandBuffers-09505"; const LogObjectList objlist(commandBuffer, pCommandBuffers[i]); - skip |= ValidateRenderingInputAttachmentIndicesKHR(*index_info, objlist, cb_loc.dot(Field::pNext)); + skip |= ValidateRenderingInputAttachmentIndices(*index_info, objlist, cb_loc.dot(Field::pNext)); if (index_info->colorAttachmentCount != cb_state.rendering_attachments.color_indexes.size()) { skip |= LogError(vuid_090505, objlist, @@ -1057,17 +1057,17 @@ bool CoreChecks::PreCallValidateCmdExecuteCommands(VkCommandBuffer commandBuffer const auto rendering_info = cb_state.activeRenderPass->dynamic_rendering_begin_rendering_info; const auto inheritance_rendering_info = sub_cb_state.activeRenderPass->inheritance_rendering_info; if ((inheritance_rendering_info.flags & - ~(VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR | VK_RENDERING_CONTENTS_INLINE_BIT_EXT)) != + ~(VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT | VK_RENDERING_CONTENTS_INLINE_BIT_KHR)) != (rendering_info.flags & - ~(VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR | VK_RENDERING_CONTENTS_INLINE_BIT_EXT))) { + ~(VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT | VK_RENDERING_CONTENTS_INLINE_BIT_KHR))) { const LogObjectList objlist(commandBuffer, pCommandBuffers[i], cb_state.activeRenderPass->Handle()); skip |= LogError("VUID-vkCmdExecuteCommands-flags-06026", objlist, cb_loc, "(%s) is executed within a dynamic renderpass instance scope begun " "by vkCmdBeginRendering(), but VkCommandBufferInheritanceRenderingInfo::flags (%s) does " "not match VkRenderingInfo::flags (%s) (excluding " - "VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR or " - "VK_RENDERING_CONTENTS_INLINE_BIT_EXT).", + "VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT or " + "VK_RENDERING_CONTENTS_INLINE_BIT_KHR).", FormatHandle(pCommandBuffers[i]).c_str(), string_VkRenderingFlags(inheritance_rendering_info.flags).c_str(), string_VkRenderingFlags(rendering_info.flags).c_str()); @@ -1222,7 +1222,7 @@ bool CoreChecks::PreCallValidateCmdExecuteCommands(VkCommandBuffer commandBuffer "VkAttachmentSampleCountInfo(AMD/NV)::pColorAttachmentSamples at index (%" PRIu32 ") " "does " - "not match the sample count of the imageView in VkRenderingInfoKHR::pColorAttachments.", + "not match the sample count of the imageView in VkRenderingInfo::pColorAttachments.", FormatHandle(pCommandBuffers[i]).c_str(), index); } } @@ -1241,7 +1241,7 @@ bool CoreChecks::PreCallValidateCmdExecuteCommands(VkCommandBuffer commandBuffer "scope begun " "by vkCmdBeginRenderingKHR(), but " "VkAttachmentSampleCountInfo(AMD/NV)::depthStencilAttachmentSamples does " - "not match the sample count of the imageView in VkRenderingInfoKHR::pDepthAttachment.", + "not match the sample count of the imageView in VkRenderingInfo::pDepthAttachment.", FormatHandle(pCommandBuffers[i]).c_str()); } } @@ -1260,7 +1260,7 @@ bool CoreChecks::PreCallValidateCmdExecuteCommands(VkCommandBuffer commandBuffer "scope begun " "by vkCmdBeginRenderingKHR(), but " "VkAttachmentSampleCountInfo(AMD/NV)::depthStencilAttachmentSamples does " - "not match the sample count of the imageView in VkRenderingInfoKHR::pStencilAttachment.", + "not match the sample count of the imageView in VkRenderingInfo::pStencilAttachment.", FormatHandle(pCommandBuffers[i]).c_str()); } } @@ -1281,7 +1281,7 @@ bool CoreChecks::PreCallValidateCmdExecuteCommands(VkCommandBuffer commandBuffer "scope begun " "by vkCmdBeginRenderingKHR(), but the sample count of the image view at index (%" PRIu32 ") of " - "VkRenderingInfoKHR::pColorAttachments does not match " + "VkRenderingInfo::pColorAttachments does not match " "VkCommandBufferInheritanceRenderingInfo::rasterizationSamples.", FormatHandle(pCommandBuffers[i]).c_str(), index); } @@ -1299,7 +1299,7 @@ bool CoreChecks::PreCallValidateCmdExecuteCommands(VkCommandBuffer commandBuffer "(%s) is executed within a dynamic renderpass " "instance scope begun " "by vkCmdBeginRenderingKHR(), but the sample count of the image view for " - "VkRenderingInfoKHR::pDepthAttachment does not match " + "VkRenderingInfo::pDepthAttachment does not match " "VkCommandBufferInheritanceRenderingInfo::rasterizationSamples.", FormatHandle(pCommandBuffers[i]).c_str()); } @@ -1317,7 +1317,7 @@ bool CoreChecks::PreCallValidateCmdExecuteCommands(VkCommandBuffer commandBuffer "(%s) is executed within a dynamic renderpass " "instance scope begun " "by vkCmdBeginRenderingKHR(), but the sample count of the image view for " - "VkRenderingInfoKHR::pStencilAttachment does not match " + "VkRenderingInfo::pStencilAttachment does not match " "VkCommandBufferInheritanceRenderingInfo::rasterizationSamples.", FormatHandle(pCommandBuffers[i]).c_str()); } diff --git a/layers/core_checks/cc_cmd_buffer_dynamic.cpp b/layers/core_checks/cc_cmd_buffer_dynamic.cpp index f7c5908056d..ecc364651bd 100644 --- a/layers/core_checks/cc_cmd_buffer_dynamic.cpp +++ b/layers/core_checks/cc_cmd_buffer_dynamic.cpp @@ -1276,7 +1276,7 @@ bool CoreChecks::ValidateDrawRenderingAttachmentLocation(const vvl::CommandBuffe uint32_t pipeline_color_count = 0; const uint32_t* pipeline_color_locations = nullptr; if (const auto* pipeline_location_info = - vku::FindStructInPNextChain(pipeline_state.GetCreateInfoPNext())) { + vku::FindStructInPNextChain(pipeline_state.GetCreateInfoPNext())) { pipeline_color_count = pipeline_location_info->colorAttachmentCount; pipeline_color_locations = pipeline_location_info->pColorAttachmentLocations; } else if (const auto* pipeline_rendering_create_info = pipeline_state.GetPipelineRenderingCreateInfo()) { @@ -1288,18 +1288,18 @@ bool CoreChecks::ValidateDrawRenderingAttachmentLocation(const vvl::CommandBuffe if (pipeline_color_count != color_attachment_count) { const LogObjectList objlist(cb_state.Handle(), pipeline_state.Handle()); skip = LogError(vuid.dynamic_rendering_local_location_09548, objlist, vuid.loc(), - "The pipeline VkRenderingAttachmentLocationInfoKHR::colorAttachmentCount is %" PRIu32 + "The pipeline VkRenderingAttachmentLocationInfo::colorAttachmentCount is %" PRIu32 " but vkCmdSetRenderingAttachmentLocations last set colorAttachmentCount to %" PRIu32 "", pipeline_color_count, color_attachment_count); } else if (pipeline_color_locations) { for (uint32_t i = 0; i < pipeline_color_count; i++) { if (pipeline_color_locations[i] != cb_state.rendering_attachments.color_locations[i]) { const LogObjectList objlist(cb_state.Handle(), pipeline_state.Handle()); - skip = LogError( - vuid.dynamic_rendering_local_location_09548, objlist, vuid.loc(), - "The pipeline VkRenderingAttachmentLocationInfoKHR::pColorAttachmentLocations[%" PRIu32 "] is %" PRIu32 - " but vkCmdSetRenderingAttachmentLocations last set pColorAttachmentLocations[%" PRIu32 "] to %" PRIu32 "", - i, pipeline_color_locations[i], i, cb_state.rendering_attachments.color_locations[i]); + skip = LogError(vuid.dynamic_rendering_local_location_09548, objlist, vuid.loc(), + "The pipeline VkRenderingAttachmentLocationInfo::pColorAttachmentLocations[%" PRIu32 "] is %" PRIu32 + " but vkCmdSetRenderingAttachmentLocations last set pColorAttachmentLocations[%" PRIu32 + "] to %" PRIu32 "", + i, pipeline_color_locations[i], i, cb_state.rendering_attachments.color_locations[i]); break; } } @@ -1322,7 +1322,7 @@ bool CoreChecks::ValidateDrawRenderingInputAttachmentIndex(const vvl::CommandBuf const uint32_t* pipeline_depth_index = nullptr; const uint32_t* pipeline_stencil_index = nullptr; if (const auto* pipeline_index_info = - vku::FindStructInPNextChain(pipeline_state.GetCreateInfoPNext())) { + vku::FindStructInPNextChain(pipeline_state.GetCreateInfoPNext())) { pipeline_color_count = pipeline_index_info->colorAttachmentCount; pipeline_color_indexes = pipeline_index_info->pColorAttachmentInputIndices; pipeline_depth_index = pipeline_index_info->pDepthInputAttachmentIndex; @@ -1336,7 +1336,7 @@ bool CoreChecks::ValidateDrawRenderingInputAttachmentIndex(const vvl::CommandBuf if (pipeline_color_count != color_index_count) { const LogObjectList objlist(cb_state.Handle(), pipeline_state.Handle()); skip = LogError(vuid.dynamic_rendering_local_index_09549, objlist, vuid.loc(), - "The pipeline VkRenderingInputAttachmentIndexInfoKHR::colorAttachmentCount is %" PRIu32 + "The pipeline VkRenderingInputAttachmentIndexInfo::colorAttachmentCount is %" PRIu32 " but vkCmdSetRenderingInputAttachmentIndices last set colorAttachmentCount to %" PRIu32 "", pipeline_color_count, color_index_count); } else if (pipeline_color_indexes) { @@ -1344,7 +1344,7 @@ bool CoreChecks::ValidateDrawRenderingInputAttachmentIndex(const vvl::CommandBuf if (pipeline_color_indexes[i] != cb_state.rendering_attachments.color_indexes[i]) { const LogObjectList objlist(cb_state.Handle(), pipeline_state.Handle()); skip = LogError(vuid.dynamic_rendering_local_index_09549, objlist, vuid.loc(), - "The pipeline VkRenderingInputAttachmentIndexInfoKHR::pColorAttachmentInputIndices[%" PRIu32 + "The pipeline VkRenderingInputAttachmentIndexInfo::pColorAttachmentInputIndices[%" PRIu32 "] is %" PRIu32 " but vkCmdSetRenderingInputAttachmentIndices last set pColorAttachmentInputIndices[%" PRIu32 "] to %" PRIu32 "", @@ -1358,14 +1358,14 @@ bool CoreChecks::ValidateDrawRenderingInputAttachmentIndex(const vvl::CommandBuf (pipeline_depth_index != cb_state.rendering_attachments.depth_index)) { const LogObjectList objlist(cb_state.Handle(), pipeline_state.Handle()); skip = LogError(vuid.dynamic_rendering_local_index_09549, objlist, vuid.loc(), - "The pipeline VkRenderingInputAttachmentIndexInfoKHR::pDepthInputAttachmentIndex is 0x%p but " + "The pipeline VkRenderingInputAttachmentIndexInfo::pDepthInputAttachmentIndex is 0x%p but " "vkCmdSetRenderingInputAttachmentIndices last set pDepthInputAttachmentIndex to 0x%p", pipeline_depth_index, cb_state.rendering_attachments.depth_index); } else if (pipeline_depth_index && cb_state.rendering_attachments.depth_index && (*pipeline_depth_index != *cb_state.rendering_attachments.depth_index)) { const LogObjectList objlist(cb_state.Handle(), pipeline_state.Handle()); skip = LogError(vuid.dynamic_rendering_local_index_09549, objlist, vuid.loc(), - "The pipeline VkRenderingInputAttachmentIndexInfoKHR::pDepthInputAttachmentIndex value is %" PRIu32 + "The pipeline VkRenderingInputAttachmentIndexInfo::pDepthInputAttachmentIndex value is %" PRIu32 " but vkCmdSetRenderingInputAttachmentIndices last set pDepthInputAttachmentIndex value to %" PRIu32 "", *pipeline_depth_index, *cb_state.rendering_attachments.depth_index); } @@ -1374,14 +1374,14 @@ bool CoreChecks::ValidateDrawRenderingInputAttachmentIndex(const vvl::CommandBuf (pipeline_stencil_index != cb_state.rendering_attachments.stencil_index)) { const LogObjectList objlist(cb_state.Handle(), pipeline_state.Handle()); skip = LogError(vuid.dynamic_rendering_local_index_09549, objlist, vuid.loc(), - "The pipeline VkRenderingInputAttachmentIndexInfoKHR::pStencilInputAttachmentIndex is 0x%p but " + "The pipeline VkRenderingInputAttachmentIndexInfo::pStencilInputAttachmentIndex is 0x%p but " "vkCmdSetRenderingInputAttachmentIndices last set pStencilInputAttachmentIndex to 0x%p", pipeline_stencil_index, cb_state.rendering_attachments.stencil_index); } else if (pipeline_stencil_index && cb_state.rendering_attachments.stencil_index && (*pipeline_stencil_index != *cb_state.rendering_attachments.stencil_index)) { const LogObjectList objlist(cb_state.Handle(), pipeline_state.Handle()); skip = LogError(vuid.dynamic_rendering_local_index_09549, objlist, vuid.loc(), - "The pipeline VkRenderingInputAttachmentIndexInfoKHR::pStencilInputAttachmentIndex value is %" PRIu32 + "The pipeline VkRenderingInputAttachmentIndexInfo::pStencilInputAttachmentIndex value is %" PRIu32 " but vkCmdSetRenderingInputAttachmentIndices last set pStencilInputAttachmentIndex value to %" PRIu32 "", *pipeline_stencil_index, *cb_state.rendering_attachments.stencil_index); } @@ -2630,21 +2630,21 @@ bool CoreChecks::PreCallValidateCmdSetLineRasterizationModeEXT(VkCommandBuffer c } skip |= ValidateCmd(*cb_state, error_obj.location); - if (lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR && !enabled_features.rectangularLines) { + if (lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_RECTANGULAR && !enabled_features.rectangularLines) { skip |= LogError("VUID-vkCmdSetLineRasterizationModeEXT-lineRasterizationMode-07418", commandBuffer, error_obj.location.dot(Field::lineRasterizationMode), - "is VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR " + "is VK_LINE_RASTERIZATION_MODE_RECTANGULAR " "but the rectangularLines feature was not enabled."); - } else if (lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR && !enabled_features.bresenhamLines) { + } else if (lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_BRESENHAM && !enabled_features.bresenhamLines) { skip |= LogError("VUID-vkCmdSetLineRasterizationModeEXT-lineRasterizationMode-07419", commandBuffer, error_obj.location.dot(Field::lineRasterizationMode), - "is VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR " + "is VK_LINE_RASTERIZATION_MODE_BRESENHAM " "but the bresenhamLines feature was not enabled."); - } else if (lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR && !enabled_features.smoothLines) { + } else if (lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH && !enabled_features.smoothLines) { skip |= LogError("VUID-vkCmdSetLineRasterizationModeEXT-lineRasterizationMode-07420", commandBuffer, error_obj.location.dot(Field::lineRasterizationMode), "is " - "VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR but the smoothLines feature was not enabled."); + "VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH but the smoothLines feature was not enabled."); } return skip; } diff --git a/layers/core_checks/cc_descriptor.cpp b/layers/core_checks/cc_descriptor.cpp index 80d0d38462f..69a07ac4aa8 100644 --- a/layers/core_checks/cc_descriptor.cpp +++ b/layers/core_checks/cc_descriptor.cpp @@ -441,7 +441,7 @@ bool CoreChecks::PreCallValidateCmdBindDescriptorSets(VkCommandBuffer commandBuf } bool CoreChecks::PreCallValidateCmdBindDescriptorSets2(VkCommandBuffer commandBuffer, - const VkBindDescriptorSetsInfoKHR *pBindDescriptorSetsInfo, + const VkBindDescriptorSetsInfo *pBindDescriptorSetsInfo, const ErrorObject &error_obj) const { auto cb_state = GetRead(commandBuffer); bool skip = false; @@ -572,13 +572,13 @@ bool CoreChecks::ValidateDescriptorSetLayoutBindingFlags(const VkDescriptorSetLa i, string_VkDescriptorType(binding_info.descriptorType)); } - if (binding_info.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT && + if (binding_info.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK && !enabled_features.descriptorBindingInlineUniformBlockUpdateAfterBind) { skip |= LogError( "VUID-VkDescriptorSetLayoutBindingFlagsCreateInfo-descriptorBindingInlineUniformBlockUpdateAfterBind-02211", device, binding_flags_loc, "includes VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT but pBindings[%" PRIu32 - "].descriptorType is VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT " + "].descriptorType is VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK " "but descriptorBindingInlineUniformBlockUpdateAfterBind was not enabled.", i); } @@ -637,7 +637,7 @@ bool CoreChecks::ValidateDescriptorSetLayoutBindingFlags(const VkDescriptorSetLa } } - const bool push_descriptor_set = (create_info.flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR) != 0; + const bool push_descriptor_set = (create_info.flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT) != 0; if (push_descriptor_set && (flags_info->pBindingFlags[i] & (VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT | VK_DESCRIPTOR_BINDING_UPDATE_UNUSED_WHILE_PENDING_BIT | VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT))) { @@ -656,7 +656,7 @@ bool CoreChecks::ValidateDescriptorSetLayoutCreateInfo(const VkDescriptorSetLayo vvl::unordered_set bindings; uint64_t total_descriptors = 0; - const bool push_descriptor_set = (create_info.flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR) != 0; + const bool push_descriptor_set = (create_info.flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT) != 0; uint32_t max_binding = 0; @@ -674,15 +674,15 @@ bool CoreChecks::ValidateDescriptorSetLayoutCreateInfo(const VkDescriptorSetLayo "is duplicated at pBindings[%" PRIu32 "].binding.", binding_info.binding); } - if (binding_info.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) { + if (binding_info.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { if (!enabled_features.inlineUniformBlock) { - skip |= LogError( - "VUID-VkDescriptorSetLayoutBinding-descriptorType-04604", device, binding_loc.dot(Field::descriptorType), - "is VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT, but the inlineUniformBlock feature was not enabled."); + skip |= LogError("VUID-VkDescriptorSetLayoutBinding-descriptorType-04604", device, + binding_loc.dot(Field::descriptorType), + "is VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, but the inlineUniformBlock feature was not enabled."); } else if (push_descriptor_set) { skip |= LogError("VUID-VkDescriptorSetLayoutCreateInfo-flags-02208", device, binding_loc.dot(Field::descriptorType), - "is VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT but " - "pCreateInfo->flags includes VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR."); + "is VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK but " + "pCreateInfo->flags includes VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT."); } else { if ((binding_info.descriptorCount % 4) != 0) { skip |= LogError("VUID-VkDescriptorSetLayoutBinding-descriptorType-02209", device, @@ -705,14 +705,14 @@ bool CoreChecks::ValidateDescriptorSetLayoutCreateInfo(const VkDescriptorSetLayo if (push_descriptor_set) { skip |= LogError("VUID-VkDescriptorSetLayoutCreateInfo-flags-00280", device, binding_loc.dot(Field::descriptorType), "is VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, but pCreateInfo->flags includes " - "VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR."); + "VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT."); } } else if (binding_info.descriptorType == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC) { storage_buffer_dynamic = i; if (push_descriptor_set) { skip |= LogError("VUID-VkDescriptorSetLayoutCreateInfo-flags-00280", device, binding_loc.dot(Field::descriptorType), "is VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC, but pCreateInfo->flags includes " - "VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR."); + "VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT."); } } @@ -785,7 +785,7 @@ bool CoreChecks::ValidateDescriptorSetLayoutCreateInfo(const VkDescriptorSetLayo if ((push_descriptor_set) && (total_descriptors > phys_dev_props_core14.maxPushDescriptors)) { skip |= LogError( "VUID-VkDescriptorSetLayoutCreateInfo-flags-00281", device, create_info_loc.dot(Field::flags), - "contains VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR, but the total descriptor count in layout (%" PRIu64 + "contains VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT, but the total descriptor count in layout (%" PRIu64 ") must not be greater than maxPushDescriptors (%" PRIu32 ").", total_descriptors, phys_dev_props_core14.maxPushDescriptors); } @@ -1044,19 +1044,19 @@ bool CoreChecks::ValidateCopyUpdate(const VkCopyDescriptorSet &update, const Loc } } - if (src_type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT && ((update.srcArrayElement % 4) != 0)) { + if (src_type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK && ((update.srcArrayElement % 4) != 0)) { const LogObjectList objlist(update.srcSet, src_layout->Handle()); skip |= LogError("VUID-VkCopyDescriptorSet-srcBinding-02223", objlist, copy_loc.dot(Field::srcArrayElement), - "is %" PRIu32 ", but srcBinding (%" PRIu32 ") type is VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT.", + "is %" PRIu32 ", but srcBinding (%" PRIu32 ") type is VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK.", update.srcArrayElement, update.srcBinding); } - if (dst_type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT && ((update.dstArrayElement % 4) != 0)) { + if (dst_type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK && ((update.dstArrayElement % 4) != 0)) { const LogObjectList objlist(update.dstSet, dst_layout->Handle()); skip |= LogError("VUID-VkCopyDescriptorSet-dstBinding-02224", objlist, copy_loc.dot(Field::dstArrayElement), - "is %" PRIu32 ", but dstBinding (%" PRIu32 ") type is VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT.", + "is %" PRIu32 ", but dstBinding (%" PRIu32 ") type is VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK.", update.dstArrayElement, update.dstBinding); } - if (src_type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT || dst_type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) { + if (src_type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK || dst_type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { if ((update.descriptorCount % 4) != 0) { const LogObjectList objlist(update.srcSet, update.dstSet, src_layout->Handle(), dst_layout->Handle()); skip |= LogError("VUID-VkCopyDescriptorSet-srcBinding-02225", objlist, copy_loc.dot(Field::descriptorCount), @@ -1320,12 +1320,12 @@ bool CoreChecks::ValidateImageUpdate(const vvl::ImageView &view_state, VkImageLa {VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR, &DeviceExtensions::vk_khr_shared_presentable_image}, {VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, &DeviceExtensions::vk_khr_maintenance2}, {VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL, &DeviceExtensions::vk_khr_maintenance2}, - {VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR, &DeviceExtensions::vk_khr_synchronization2}, - {VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR, &DeviceExtensions::vk_khr_synchronization2}, + {VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL, &DeviceExtensions::vk_khr_synchronization2}, + {VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL, &DeviceExtensions::vk_khr_synchronization2}, {VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL, &DeviceExtensions::vk_khr_separate_depth_stencil_layouts}, {VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL, &DeviceExtensions::vk_khr_separate_depth_stencil_layouts}, {VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT, &DeviceExtensions::vk_ext_attachment_feedback_loop_layout}, - {VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR, &DeviceExtensions::vk_khr_dynamic_rendering_local_read}, + {VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ, &DeviceExtensions::vk_khr_dynamic_rendering_local_read}, }}; auto is_layout = [image_layout, this](const ExtensionLayout &ext_layout) { return IsExtEnabled(device_extensions.*(ext_layout.extension)) && (ext_layout.layout == image_layout); @@ -1507,7 +1507,7 @@ vvl::DecodedTemplateUpdate::DecodedTemplateUpdate(const ValidationStateTracker & case VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER: write_entry.pTexelBufferView = reinterpret_cast(update_entry); break; - case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT: { + case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK: { VkWriteDescriptorSetInlineUniformBlock *inline_info = &inline_infos[i]; inline_info->sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET_INLINE_UNIFORM_BLOCK_EXT; inline_info->pNext = nullptr; @@ -1851,31 +1851,31 @@ bool CoreChecks::ValidateWriteUpdate(const DescriptorSet &dst_set, const VkWrite string_VkDescriptorType(update.descriptorType), update.dstBinding, string_VkDescriptorType(dest->type), dst_set.StringifySetAndLayout().c_str()); } - if (dest->type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) { + if (dest->type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { if ((update.dstArrayElement % 4) != 0) { - skip |= LogError("VUID-VkWriteDescriptorSet-descriptorType-02219", objlist, dst_binding_loc, - "(%" PRIu32 ") is of type VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT, but dstArrayElement is %" PRIu32 - ".", - update.dstBinding, update.dstArrayElement); + skip |= + LogError("VUID-VkWriteDescriptorSet-descriptorType-02219", objlist, dst_binding_loc, + "(%" PRIu32 ") is of type VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, but dstArrayElement is %" PRIu32 ".", + update.dstBinding, update.dstArrayElement); } if ((update.descriptorCount % 4) != 0) { - skip |= LogError("VUID-VkWriteDescriptorSet-descriptorType-02220", objlist, dst_binding_loc, - "(%" PRIu32 ") is of type VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT, but descriptorCount is %" PRIu32 - ".", - update.dstBinding, update.descriptorCount); + skip |= + LogError("VUID-VkWriteDescriptorSet-descriptorType-02220", objlist, dst_binding_loc, + "(%" PRIu32 ") is of type VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, but descriptorCount is %" PRIu32 ".", + update.dstBinding, update.descriptorCount); } const auto *write_inline_info = vku::FindStructInPNextChain(update.pNext); if (!write_inline_info) { skip |= LogError("VUID-VkWriteDescriptorSet-descriptorType-02221", objlist, dst_binding_loc, "(%" PRIu32 - ") is of type VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT, but there is no " + ") is of type VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, but there is no " "VkWriteDescriptorSetInlineUniformBlock in the pNext chain.", update.dstBinding); } else if (write_inline_info->dataSize != update.descriptorCount) { skip |= LogError("VUID-VkWriteDescriptorSet-descriptorType-02221", objlist, write_loc.pNext(Struct::VkWriteDescriptorSetInlineUniformBlock, Field::dataSize), "(%" PRIu32 ") is different then descriptorCount (%" PRIu32 "), but dstBinding (%" PRIu32 - ") is of type VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT.", + ") is of type VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK.", write_inline_info->dataSize, update.descriptorCount, update.dstBinding); } else if ((write_inline_info->dataSize % 4) != 0) { skip |= LogError("VUID-VkWriteDescriptorSetInlineUniformBlock-dataSize-02222", objlist, @@ -2127,7 +2127,7 @@ bool CoreChecks::VerifyWriteUpdateContents(const DescriptorSet &dst_set, const V } break; } - case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT: + case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK: break; case VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV: { const auto *acc_info = vku::FindStructInPNextChain(update.pNext); @@ -3298,7 +3298,7 @@ bool CoreChecks::PreCallValidateAllocateDescriptorSets(VkDevice device, const Vk if (ds_layout_state->IsPushDescriptor()) { skip |= LogError("VUID-VkDescriptorSetAllocateInfo-pSetLayouts-00308", pAllocateInfo->pSetLayouts[i], set_layout_loc, - "(%s) was created with VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR.", + "(%s) was created with VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT.", FormatHandle(pAllocateInfo->pSetLayouts[i]).c_str()); } if (ds_layout_state->GetCreateFlags() & VK_DESCRIPTOR_SET_LAYOUT_CREATE_DESCRIPTOR_BUFFER_BIT_EXT) { @@ -3524,7 +3524,7 @@ bool CoreChecks::PreCallValidateCmdPushDescriptorSetKHR(VkCommandBuffer commandB } bool CoreChecks::PreCallValidateCmdPushDescriptorSet2(VkCommandBuffer commandBuffer, - const VkPushDescriptorSetInfoKHR *pPushDescriptorSetInfo, + const VkPushDescriptorSetInfo *pPushDescriptorSetInfo, const ErrorObject &error_obj) const { auto cb_state = GetRead(commandBuffer); bool skip = false; @@ -3565,7 +3565,7 @@ bool CoreChecks::PreCallValidateCreateDescriptorUpdateTemplate(VkDevice device, skip |= LogError("VUID-VkDescriptorUpdateTemplateCreateInfo-templateType-00350", pCreateInfo->descriptorSetLayout, create_info_loc.dot(Field::descriptorSetLayout), "(%s) is invalid.", FormatHandle(pCreateInfo->descriptorSetLayout).c_str()); - } else if (VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR == pCreateInfo->templateType) { + } else if (VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS == pCreateInfo->templateType) { auto bind_point = pCreateInfo->pipelineBindPoint; const bool valid_bp = (bind_point == VK_PIPELINE_BIND_POINT_GRAPHICS) || (bind_point == VK_PIPELINE_BIND_POINT_COMPUTE) || (bind_point == VK_PIPELINE_BIND_POINT_RAY_TRACING_KHR); @@ -3602,11 +3602,11 @@ bool CoreChecks::PreCallValidateCreateDescriptorUpdateTemplate(VkDevice device, } for (uint32_t i = 0; i < pCreateInfo->descriptorUpdateEntryCount; ++i) { const auto &descriptor_update = pCreateInfo->pDescriptorUpdateEntries[i]; - if (descriptor_update.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) { + if (descriptor_update.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { if (descriptor_update.dstArrayElement & 3) { skip |= LogError("VUID-VkDescriptorUpdateTemplateEntry-descriptor-02226", pCreateInfo->pipelineLayout, create_info_loc.dot(Field::pDescriptorUpdateEntries, i), - "has descriptorType VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT, but dstArrayElement (%" PRIu32 + "has descriptorType VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, but dstArrayElement (%" PRIu32 ") is not a " "multiple of 4).", descriptor_update.dstArrayElement); @@ -3614,7 +3614,7 @@ bool CoreChecks::PreCallValidateCreateDescriptorUpdateTemplate(VkDevice device, if (descriptor_update.descriptorCount & 3) { skip |= LogError("VUID-VkDescriptorUpdateTemplateEntry-descriptor-02227", pCreateInfo->pipelineLayout, create_info_loc.dot(Field::pDescriptorUpdateEntries, i), - "has descriptorType VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT, but descriptorCount (%" PRIu32 + "has descriptorType VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, but descriptorCount (%" PRIu32 ") is not a " "multiple of 4).", descriptor_update.descriptorCount); @@ -3693,12 +3693,12 @@ bool CoreChecks::ValidateCmdPushDescriptorSetWithTemplate(VkCommandBuffer comman skip |= ValidatePipelineBindPoint(*cb_state, template_ci.pipelineBindPoint, loc); - if (template_ci.templateType != VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR) { + if (template_ci.templateType != VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS) { const char *vuid = is_2 ? "VUID-VkPushDescriptorSetWithTemplateInfo-descriptorUpdateTemplate-07994" : "VUID-vkCmdPushDescriptorSetWithTemplate-descriptorUpdateTemplate-07994"; skip |= LogError(vuid, commandBuffer, loc.dot(Field::descriptorUpdateTemplate), "%s was not created with flag " - "VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR.", + "VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS.", FormatHandle(descriptorUpdateTemplate).c_str()); } if (template_ci.set != set) { @@ -3761,7 +3761,7 @@ bool CoreChecks::PreCallValidateCmdPushDescriptorSetWithTemplateKHR(VkCommandBuf } bool CoreChecks::PreCallValidateCmdPushDescriptorSetWithTemplate2( - VkCommandBuffer commandBuffer, const VkPushDescriptorSetWithTemplateInfoKHR *pPushDescriptorSetWithTemplateInfo, + VkCommandBuffer commandBuffer, const VkPushDescriptorSetWithTemplateInfo *pPushDescriptorSetWithTemplateInfo, const ErrorObject &error_obj) const { bool skip = false; skip |= ValidateCmdPushDescriptorSetWithTemplate( @@ -3871,7 +3871,7 @@ std::valarray GetDescriptorCountMaxPerStage( case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT: stage_sum[DSL_TYPE_INPUT_ATTACHMENTS] += binding->descriptorCount; break; - case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT: + case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK: // count one block per binding. descriptorCount is number of bytes stage_sum[DSL_TYPE_INLINE_UNIFORM_BLOCK]++; break; @@ -3933,7 +3933,7 @@ uint32_t GetInlineUniformBlockBindingCount(const std::vectorGetBindingCount(); binding_idx++) { const VkDescriptorSetLayoutBinding *binding = dsl->GetDescriptorSetLayoutBindingPtrFromIndex(binding_idx); // Bindings with a descriptorCount of 0 are "reserved" and should be skipped - if (binding->descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT && binding->descriptorCount > 0) { + if (binding->descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK && binding->descriptorCount > 0) { ++sum; } } @@ -4188,13 +4188,12 @@ bool CoreChecks::PreCallValidateCreatePipelineLayout(VkDevice device, const VkPi inline_uniform_block_bindings_all_stages, phys_dev_props_core13.maxDescriptorSetInlineUniformBlocks); } if (api_version >= VK_API_VERSION_1_3 && - sum_all_stages[VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT] > phys_dev_props_core13.maxInlineUniformTotalSize) { - skip |= - LogError("VUID-VkPipelineLayoutCreateInfo-descriptorType-06531", device, error_obj.location, - "sum of inline uniform block bytes among all stages (%" PRIu32 - ") exceeds device " - "maxInlineUniformTotalSize limit (%" PRIu32 ").", - sum_all_stages[VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT], phys_dev_props_core13.maxInlineUniformTotalSize); + sum_all_stages[VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK] > phys_dev_props_core13.maxInlineUniformTotalSize) { + skip |= LogError("VUID-VkPipelineLayoutCreateInfo-descriptorType-06531", device, error_obj.location, + "sum of inline uniform block bytes among all stages (%" PRIu32 + ") exceeds device " + "maxInlineUniformTotalSize limit (%" PRIu32 ").", + sum_all_stages[VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK], phys_dev_props_core13.maxInlineUniformTotalSize); } // Acceleration structures @@ -4574,7 +4573,7 @@ bool CoreChecks::PreCallValidateCmdPushConstants(VkCommandBuffer commandBuffer, return ValidateCmdPushConstants(commandBuffer, layout, stageFlags, offset, size, error_obj.location); } -bool CoreChecks::PreCallValidateCmdPushConstants2(VkCommandBuffer commandBuffer, const VkPushConstantsInfoKHR *pPushConstantsInfo, +bool CoreChecks::PreCallValidateCmdPushConstants2(VkCommandBuffer commandBuffer, const VkPushConstantsInfo *pPushConstantsInfo, const ErrorObject &error_obj) const { bool skip = false; skip |= ValidateCmdPushConstants(commandBuffer, pPushConstantsInfo->layout, pPushConstantsInfo->stageFlags, @@ -4610,7 +4609,7 @@ bool CoreChecks::PreCallValidateCreateSampler(VkDevice device, const VkSamplerCr const VkSamplerYcbcrConversion sampler_ycbcr_conversion = conversion_info->conversion; auto ycbcr_state = Get(sampler_ycbcr_conversion); if (ycbcr_state && (ycbcr_state->format_features & - VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT_KHR) == 0) { + VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT) == 0) { const VkFilter chroma_filter = ycbcr_state->chromaFilter; if (pCreateInfo->minFilter != chroma_filter) { skip |= LogError( diff --git a/layers/core_checks/cc_device.cpp b/layers/core_checks/cc_device.cpp index 032b59d5628..cf3e8088adf 100644 --- a/layers/core_checks/cc_device.cpp +++ b/layers/core_checks/cc_device.cpp @@ -189,7 +189,7 @@ bool CoreChecks::ValidateDeviceQueueCreateInfos(const vvl::PhysicalDevice &pd_st create_flags(uint32_t a, uint32_t b) : unprocted_index(a), protected_index(b) {} }; vvl::unordered_map queue_family_map; - vvl::unordered_map global_priorities; + vvl::unordered_map global_priorities; std::vector queue_counts; for (uint32_t i = 0; i < info_count; ++i) { @@ -251,8 +251,8 @@ bool CoreChecks::ValidateDeviceQueueCreateInfos(const vvl::PhysicalDevice &pd_st } } - VkQueueGlobalPriorityKHR global_priority = VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_KHR; // Implicit default value - const auto *global_priority_ci = vku::FindStructInPNextChain(infos[i].pNext); + VkQueueGlobalPriority global_priority = VK_QUEUE_GLOBAL_PRIORITY_MEDIUM; // Implicit default value + const auto *global_priority_ci = vku::FindStructInPNextChain(infos[i].pNext); if (global_priority_ci) { global_priority = global_priority_ci->globalPriority; } @@ -502,13 +502,13 @@ bool CoreChecks::ValidateGetPhysicalDeviceImageFormatProperties2(const VkPhysica VkImageFormatProperties2 *pImageFormatProperties, const ErrorObject &error_obj) const { bool skip = false; - const auto *copy_perf_query = vku::FindStructInPNextChain(pImageFormatProperties->pNext); + const auto *copy_perf_query = vku::FindStructInPNextChain(pImageFormatProperties->pNext); if (copy_perf_query) { - if ((pImageFormatInfo->usage & VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT) == 0) { + if ((pImageFormatInfo->usage & VK_IMAGE_USAGE_HOST_TRANSFER_BIT) == 0) { skip |= LogError("VUID-vkGetPhysicalDeviceImageFormatProperties2-pNext-09004", physical_device, error_obj.location, "pImageFormatProperties includes a chained " - "VkHostImageCopyDevicePerformanceQueryEXT struct, but pImageFormatInfo->usage (%s) does not contain " - "VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT", + "VkHostImageCopyDevicePerformanceQuery struct, but pImageFormatInfo->usage (%s) does not contain " + "VK_IMAGE_USAGE_HOST_TRANSFER_BIT", string_VkBufferUsageFlags(pImageFormatInfo->usage).c_str()); } } @@ -855,7 +855,7 @@ bool CoreChecks::PreCallValidateCreatePipelineBinariesKHR(VkDevice device, const skip |= LogError("VUID-VkPipelineBinaryCreateInfoKHR-pipeline-09607", pipeline, create_info_loc.dot(Field::pipeline), "called on a pipeline created without the " "VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR flag set. (Make sure you set it with " - "VkPipelineCreateFlags2CreateInfoKHR)"); + "VkPipelineCreateFlags2CreateInfo)"); } if (pipeline_state->binary_data_released) { diff --git a/layers/core_checks/cc_device_generated_commands.cpp b/layers/core_checks/cc_device_generated_commands.cpp index b95c0e772e1..7c78ae8fe7e 100644 --- a/layers/core_checks/cc_device_generated_commands.cpp +++ b/layers/core_checks/cc_device_generated_commands.cpp @@ -247,7 +247,7 @@ bool CoreChecks::ValidateIndirectExecutionSetPipelineInfo(const VkIndirectExecut skip |= LogError("VUID-VkIndirectExecutionSetPipelineInfoEXT-initialPipeline-11153", initial_pipeline->Handle(), pipeline_info_loc.dot(Field::initialPipeline), "is missing VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT, was created with flags %s. (Make sure you " - "set it with VkPipelineCreateFlags2CreateInfoKHR)", + "set it with VkPipelineCreateFlags2CreateInfo)", string_VkPipelineCreateFlags2(initial_pipeline->create_flags).c_str()); } @@ -504,7 +504,7 @@ bool CoreChecks::ValidateGeneratedCommandsInfo(const vvl::CommandBuffer& cb_stat BufferAddressValidation<2> buffer_address_validator = {{{ {"VUID-VkGeneratedCommandsInfoEXT-sequenceCountAddress-11072", [](vvl::Buffer* const buffer_state, std::string* out_error_msg) { - if ((buffer_state->usage & VK_BUFFER_USAGE_2_INDIRECT_BUFFER_BIT_KHR) == 0) { + if ((buffer_state->usage & VK_BUFFER_USAGE_2_INDIRECT_BUFFER_BIT) == 0) { if (out_error_msg) { *out_error_msg += "buffer has usage " + string_VkBufferUsageFlags2(buffer_state->usage); } @@ -512,7 +512,7 @@ bool CoreChecks::ValidateGeneratedCommandsInfo(const vvl::CommandBuffer& cb_stat } return true; }, - []() { return "The following buffers are missing VK_BUFFER_USAGE_2_INDIRECT_BUFFER_BIT_KHR"; }}, + []() { return "The following buffers are missing VK_BUFFER_USAGE_2_INDIRECT_BUFFER_BIT"; }}, {"VUID-VkGeneratedCommandsInfoEXT-sequenceCountAddress-11075", [this](vvl::Buffer* const buffer_state, std::string* out_error_msg) { return BufferAddressValidation<1>::ValidateMemoryBoundToBuffer(*this, buffer_state, out_error_msg); @@ -840,7 +840,7 @@ bool CoreChecks::PreCallValidateUpdateIndirectExecutionSetPipelineEXT( skip |= LogError("VUID-VkWriteIndirectExecutionSetPipelineEXT-pipeline-11027", update_pipeline->Handle(), set_write_loc.dot(Field::pipeline), "is missing VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT, was created with flags %s. (Make sure you " - "set it with VkPipelineCreateFlags2CreateInfoKHR)", + "set it with VkPipelineCreateFlags2CreateInfo)", string_VkPipelineCreateFlags2(update_pipeline->create_flags).c_str()); } diff --git a/layers/core_checks/cc_device_memory.cpp b/layers/core_checks/cc_device_memory.cpp index f92d80df8ff..4015e1c6a78 100644 --- a/layers/core_checks/cc_device_memory.cpp +++ b/layers/core_checks/cc_device_memory.cpp @@ -358,7 +358,7 @@ bool CoreChecks::IgnoreAllocationSize(const VkMemoryAllocateInfo &allocate_info) bool CoreChecks::HasExternalMemoryImportSupport(const vvl::Buffer &buffer, VkExternalMemoryHandleTypeFlagBits handle_type) const { VkPhysicalDeviceExternalBufferInfo info = vku::InitStructHelper(); info.flags = buffer.create_info.flags; - // TODO - Add VkBufferUsageFlags2CreateInfoKHR support + // TODO - Add VkBufferUsageFlags2CreateInfo support info.usage = buffer.create_info.usage; info.handleType = handle_type; VkExternalBufferProperties properties = vku::InitStructHelper(); diff --git a/layers/core_checks/cc_drawdispatch.cpp b/layers/core_checks/cc_drawdispatch.cpp index 1ec74e7dd3e..1cab1a5592f 100644 --- a/layers/core_checks/cc_drawdispatch.cpp +++ b/layers/core_checks/cc_drawdispatch.cpp @@ -58,14 +58,14 @@ bool CoreChecks::ValidateCmdDrawInstance(const vvl::CommandBuffer &cb_state, uin } if (pipeline_state && pipeline_state->GraphicsCreateInfo().pVertexInputState) { - const auto *vertex_input_divisor_state = vku::FindStructInPNextChain( + const auto *vertex_input_divisor_state = vku::FindStructInPNextChain( pipeline_state->GraphicsCreateInfo().pVertexInputState->pNext); if (vertex_input_divisor_state && phys_dev_props_core14.supportsNonZeroFirstInstance == VK_FALSE && firstInstance != 0u) { for (uint32_t i = 0; i < vertex_input_divisor_state->vertexBindingDivisorCount; ++i) { if (vertex_input_divisor_state->pVertexBindingDivisors[i].divisor != 1u) { const LogObjectList objlist(cb_state.Handle(), pipeline_state->Handle()); skip |= LogError(vuid.vertex_input_09461, objlist, loc, - "VkPipelineVertexInputDivisorStateCreateInfoKHR::pVertexBindingDivisors[%" PRIu32 + "VkPipelineVertexInputDivisorStateCreateInfo::pVertexBindingDivisors[%" PRIu32 "].divisor is %" PRIu32 " and firstInstance is %" PRIu32 ", but supportsNonZeroFirstInstance is VK_FALSE.", i, vertex_input_divisor_state->pVertexBindingDivisors[i].divisor, firstInstance); diff --git a/layers/core_checks/cc_image.cpp b/layers/core_checks/cc_image.cpp index afc027051e2..bf9d730753d 100644 --- a/layers/core_checks/cc_image.cpp +++ b/layers/core_checks/cc_image.cpp @@ -105,7 +105,7 @@ bool CoreChecks::ValidateImageFormatFeatures(const VkImageCreateInfo &create_inf // Lack of disjoint format feature support while using the flag if (vkuFormatIsMultiplane(image_format) && ((create_info.flags & VK_IMAGE_CREATE_DISJOINT_BIT) != 0) && - ((tiling_features & VK_FORMAT_FEATURE_2_DISJOINT_BIT_KHR) == 0)) { + ((tiling_features & VK_FORMAT_FEATURE_2_DISJOINT_BIT) == 0)) { skip |= LogError("VUID-VkImageCreateInfo-imageCreateFormatFeatures-02260", device, loc.dot(Field::usage), "includes VK_IMAGE_CREATE_DISJOINT_BIT, but %s doesn't support " "VK_FORMAT_FEATURE_DISJOINT_BIT.\n" @@ -113,11 +113,11 @@ bool CoreChecks::ValidateImageFormatFeatures(const VkImageCreateInfo &create_inf string_VkFormat(create_info.format), string_VkFormatFeatureFlags2(tiling_features).c_str()); } - if (((tiling_features & VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT_EXT) == 0) && - (create_info.usage & VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT)) { + if (((tiling_features & VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT) == 0) && + (create_info.usage & VK_IMAGE_USAGE_HOST_TRANSFER_BIT)) { skip |= LogError("VUID-VkImageCreateInfo-imageCreateFormatFeatures-09048", device, loc.dot(Field::usage), - "includes VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT, but %s doesn't support " - "VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT_EXT.\n" + "includes VK_IMAGE_USAGE_HOST_TRANSFER_BIT, but %s doesn't support " + "VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT.\n" "(supported features: %s)", string_VkFormat(create_info.format), string_VkFormatFeatureFlags2(tiling_features).c_str()); } @@ -986,7 +986,7 @@ bool CoreChecks::PreCallValidateCmdClearColorImage(VkCommandBuffer commandBuffer skip |= ValidateMemoryIsBoundToImage(objlist, image_state, image_loc, "VUID-vkCmdClearColorImage-image-00003"); skip |= ValidateCmd(cb_state, error_obj.location); if (IsExtEnabled(device_extensions.vk_khr_maintenance1)) { - skip |= ValidateImageFormatFeatureFlags(commandBuffer, image_state, VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT_KHR, image_loc, + skip |= ValidateImageFormatFeatureFlags(commandBuffer, image_state, VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT, image_loc, "VUID-vkCmdClearColorImage-image-01993"); } skip |= ValidateProtectedImage(cb_state, image_state, image_loc, "VUID-vkCmdClearColorImage-commandBuffer-01805"); @@ -1078,7 +1078,7 @@ bool CoreChecks::PreCallValidateCmdClearDepthStencilImage(VkCommandBuffer comman skip |= ValidateMemoryIsBoundToImage(objlist, image_state, image_loc, "VUID-vkCmdClearDepthStencilImage-image-00010"); skip |= ValidateCmd(cb_state, error_obj.location); if (IsExtEnabled(device_extensions.vk_khr_maintenance1)) { - skip |= ValidateImageFormatFeatureFlags(commandBuffer, image_state, VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT_KHR, image_loc, + skip |= ValidateImageFormatFeatureFlags(commandBuffer, image_state, VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT, image_loc, "VUID-vkCmdClearDepthStencilImage-image-01994"); } skip |= ValidateClearDepthStencilValue(commandBuffer, *pDepthStencil, error_obj.location.dot(Field::pDepthStencil)); @@ -1251,11 +1251,10 @@ bool CoreChecks::PreCallValidateCmdClearAttachments(VkCommandBuffer commandBuffe colorAttachment < cb_state.rendering_attachments.color_locations.size() && cb_state.rendering_attachments.color_locations[colorAttachment] == VK_ATTACHMENT_UNUSED) { const LogObjectList objlist(commandBuffer, cb_state.activeRenderPass->VkHandle()); - skip |= - LogError("VUID-vkCmdClearAttachments-colorAttachment-09503", objlist, attachment_loc, - "cannot be cleared because VkRenderingAttachmentLocationInfoKHR::pColorAttachmentLocations[%" PRIu32 - "] is VK_ATTACHMENT_UNUSED.", - colorAttachment); + skip |= LogError("VUID-vkCmdClearAttachments-colorAttachment-09503", objlist, attachment_loc, + "cannot be cleared because VkRenderingAttachmentLocationInfo::pColorAttachmentLocations[%" PRIu32 + "] is VK_ATTACHMENT_UNUSED.", + colorAttachment); } color_view_state = cb_state.GetActiveAttachmentImageViewState(cb_state.GetDynamicColorAttachmentImageIndex(colorAttachment)); @@ -2677,9 +2676,8 @@ bool CoreChecks::PreCallValidateGetImageSubresourceLayout(VkDevice device, VkIma return skip; } -bool CoreChecks::PreCallValidateGetImageSubresourceLayout2(VkDevice device, VkImage image, - const VkImageSubresource2KHR *pSubresource, - VkSubresourceLayout2KHR *pLayout, const ErrorObject &error_obj) const { +bool CoreChecks::PreCallValidateGetImageSubresourceLayout2(VkDevice device, VkImage image, const VkImageSubresource2 *pSubresource, + VkSubresourceLayout2 *pLayout, const ErrorObject &error_obj) const { bool skip = false; auto image_state = Get(image); if (pSubresource && pLayout && image_state) { @@ -2718,7 +2716,7 @@ bool CoreChecks::PreCallValidateGetImageDrmFormatModifierPropertiesEXT(VkDevice } bool CoreChecks::PreCallValidateTransitionImageLayout(VkDevice device, uint32_t transitionCount, - const VkHostImageLayoutTransitionInfoEXT *pTransitions, + const VkHostImageLayoutTransitionInfo *pTransitions, const ErrorObject &error_obj) const { bool skip = false; @@ -2732,11 +2730,11 @@ bool CoreChecks::PreCallValidateTransitionImageLayout(VkDevice device, uint32_t const bool has_depth_mask = (aspect_mask & VK_IMAGE_ASPECT_DEPTH_BIT) != 0; const bool has_stencil_mask = (aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT) != 0; - if ((image_state->create_info.usage & VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT) == 0) { + if ((image_state->create_info.usage & VK_IMAGE_USAGE_HOST_TRANSFER_BIT) == 0) { const LogObjectList objlist(device, image_state->Handle()); skip |= LogError("VUID-VkHostImageLayoutTransitionInfo-image-09055", objlist, transition_loc.dot(Field::image), "was created with usage (%s) which does not contain " - "VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT.", + "VK_IMAGE_USAGE_HOST_TRANSFER_BIT.", string_VkImageUsageFlags(image_state->create_info.usage).c_str()); } @@ -2845,7 +2843,7 @@ bool CoreChecks::PreCallValidateTransitionImageLayoutEXT(VkDevice device, uint32 } void CoreChecks::PostCallRecordTransitionImageLayout(VkDevice device, uint32_t transitionCount, - const VkHostImageLayoutTransitionInfoEXT *pTransitions, + const VkHostImageLayoutTransitionInfo *pTransitions, const RecordObject &record_obj) { ValidationStateTracker::PostCallRecordTransitionImageLayout(device, transitionCount, pTransitions, record_obj); diff --git a/layers/core_checks/cc_image_layout.cpp b/layers/core_checks/cc_image_layout.cpp index efa4767990b..aee8668c128 100644 --- a/layers/core_checks/cc_image_layout.cpp +++ b/layers/core_checks/cc_image_layout.cpp @@ -420,7 +420,7 @@ bool CoreChecks::ValidateRenderPassLayoutAgainstFramebufferImageUsage(VkImageLay !(image_usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT)) { vuid = use_rp2 ? "VUID-vkCmdBeginRenderPass2-initialLayout-03096" : "VUID-vkCmdBeginRenderPass-initialLayout-01758"; skip = true; - } else if (layout == VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR && !IsShaderTileImageUsageValid(image_usage)) { + } else if (layout == VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ && !IsShaderTileImageUsageValid(image_usage)) { vuid = use_rp2 ? "VUID-vkCmdBeginRenderPass2-initialLayout-09538" : "VUID-vkCmdBeginRenderPass-initialLayout-09537"; skip = true; } else if ((IsImageLayoutDepthOnly(layout) || IsImageLayoutStencilOnly(layout)) && diff --git a/layers/core_checks/cc_pipeline.cpp b/layers/core_checks/cc_pipeline.cpp index c0050e61267..e4d65b621a5 100644 --- a/layers/core_checks/cc_pipeline.cpp +++ b/layers/core_checks/cc_pipeline.cpp @@ -46,7 +46,7 @@ bool CoreChecks::ValidatePipelineCacheControlFlags(VkPipelineCreateFlags2KHR fla bool skip = false; if (enabled_features.pipelineCreationCacheControl == VK_FALSE) { const VkPipelineCreateFlags invalid_flags = - VK_PIPELINE_CREATE_2_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_KHR | VK_PIPELINE_CREATE_2_EARLY_RETURN_ON_FAILURE_BIT_KHR; + VK_PIPELINE_CREATE_2_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT | VK_PIPELINE_CREATE_2_EARLY_RETURN_ON_FAILURE_BIT; if ((flags & invalid_flags) != 0) { skip |= LogError(vuid, device, loc, "is %s but pipelineCreationCacheControl feature was not enabled.", string_VkPipelineCreateFlags2(flags).c_str()); @@ -71,14 +71,14 @@ bool CoreChecks::ValidatePipelineProtectedAccessFlags(VkPipelineCreateFlags2KHR bool skip = false; if (enabled_features.pipelineProtectedAccess == VK_FALSE) { const VkPipelineCreateFlags invalid_flags = - VK_PIPELINE_CREATE_2_NO_PROTECTED_ACCESS_BIT_EXT | VK_PIPELINE_CREATE_2_PROTECTED_ACCESS_ONLY_BIT_EXT; + VK_PIPELINE_CREATE_2_NO_PROTECTED_ACCESS_BIT | VK_PIPELINE_CREATE_2_PROTECTED_ACCESS_ONLY_BIT; if ((flags & invalid_flags) != 0) { skip |= LogError("VUID-VkGraphicsPipelineCreateInfo-pipelineProtectedAccess-07368", device, loc, "is %s, but pipelineProtectedAccess feature was not enabled.", string_VkPipelineCreateFlags2(flags).c_str()); } } - if ((flags & VK_PIPELINE_CREATE_2_NO_PROTECTED_ACCESS_BIT_EXT) && (flags & VK_PIPELINE_CREATE_2_PROTECTED_ACCESS_ONLY_BIT_EXT)) { + if ((flags & VK_PIPELINE_CREATE_2_NO_PROTECTED_ACCESS_BIT) && (flags & VK_PIPELINE_CREATE_2_PROTECTED_ACCESS_ONLY_BIT)) { skip |= LogError("VUID-VkGraphicsPipelineCreateInfo-flags-07369", device, loc, "is %s (contains both NO_PROTECTED_ACCESS_BIT and PROTECTED_ACCESS_ONLY_BIT).", string_VkPipelineCreateFlags2(flags).c_str()); @@ -88,30 +88,30 @@ bool CoreChecks::ValidatePipelineProtectedAccessFlags(VkPipelineCreateFlags2KHR // This can be chained in the vkCreate*Pipelines() function or the VkPipelineShaderStageCreateInfo bool CoreChecks::ValidatePipelineRobustnessCreateInfo(const vvl::Pipeline &pipeline, - const VkPipelineRobustnessCreateInfoEXT &pipeline_robustness_info, + const VkPipelineRobustnessCreateInfo &pipeline_robustness_info, const Location &loc) const { bool skip = false; if (!enabled_features.pipelineRobustness) { - if (pipeline_robustness_info.storageBuffers != VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DEVICE_DEFAULT_EXT) { + if (pipeline_robustness_info.storageBuffers != VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DEVICE_DEFAULT) { skip |= LogError("VUID-VkPipelineRobustnessCreateInfo-pipelineRobustness-06926", device, loc.pNext(Struct::VkPipelineRobustnessCreateInfo, Field::storageBuffers), "is %s but the pipelineRobustness feature was not enabled.", string_VkPipelineRobustnessBufferBehavior(pipeline_robustness_info.storageBuffers)); } - if (pipeline_robustness_info.uniformBuffers != VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DEVICE_DEFAULT_EXT) { + if (pipeline_robustness_info.uniformBuffers != VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DEVICE_DEFAULT) { skip |= LogError("VUID-VkPipelineRobustnessCreateInfo-pipelineRobustness-06927", device, loc.pNext(Struct::VkPipelineRobustnessCreateInfo, Field::uniformBuffers), "is %s but the pipelineRobustness feature was not enabled.", string_VkPipelineRobustnessBufferBehavior(pipeline_robustness_info.uniformBuffers)); } - if (pipeline_robustness_info.vertexInputs != VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DEVICE_DEFAULT_EXT) { + if (pipeline_robustness_info.vertexInputs != VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_DEVICE_DEFAULT) { skip |= LogError("VUID-VkPipelineRobustnessCreateInfo-pipelineRobustness-06928", device, loc.pNext(Struct::VkPipelineRobustnessCreateInfo, Field::vertexInputs), "is %s but the pipelineRobustness feature was not enabled.", string_VkPipelineRobustnessBufferBehavior(pipeline_robustness_info.vertexInputs)); } - if (pipeline_robustness_info.images != VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DEVICE_DEFAULT_EXT) { + if (pipeline_robustness_info.images != VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_DEVICE_DEFAULT) { skip |= LogError("VUID-VkPipelineRobustnessCreateInfo-pipelineRobustness-06929", device, loc.pNext(Struct::VkPipelineRobustnessCreateInfo, Field::images), "is %s but the pipelineRobustness feature was not enabled.", @@ -120,11 +120,10 @@ bool CoreChecks::ValidatePipelineRobustnessCreateInfo(const vvl::Pipeline &pipel } // These validation depend if the features are exposed (not just enabled) - if (!has_robust_image_access && - pipeline_robustness_info.images == VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_EXT) { + if (!has_robust_image_access && pipeline_robustness_info.images == VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS) { skip |= LogError("VUID-VkPipelineRobustnessCreateInfo-robustImageAccess-06930", device, loc.pNext(Struct::VkPipelineRobustnessCreateInfo, Field::images), - "is VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_EXT " + "is VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS " "but robustImageAccess2 is not supported."); } return skip; @@ -390,17 +389,17 @@ bool CoreChecks::PreCallValidateCmdBindPipeline(VkCommandBuffer commandBuffer, V if (enabled_features.pipelineProtectedAccess) { if (cb_state->unprotected) { const LogObjectList objlist(cb_state->Handle(), pipeline); - if (pipeline_state.create_flags & VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT_EXT) { + if (pipeline_state.create_flags & VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT) { skip |= LogError("VUID-vkCmdBindPipeline-pipelineProtectedAccess-07409", objlist, error_obj.location, "Binding pipeline created with " - "VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT_EXT in an unprotected command buffer."); + "VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT in an unprotected command buffer."); } } else { const LogObjectList objlist(cb_state->Handle(), pipeline); - if (pipeline_state.create_flags & VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT_EXT) { + if (pipeline_state.create_flags & VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT) { skip |= LogError("VUID-vkCmdBindPipeline-pipelineProtectedAccess-07408", objlist, error_obj.location, "Binding pipeline created with " - "VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT_EXT in a protected command buffer."); + "VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT in a protected command buffer."); } } } @@ -491,25 +490,24 @@ bool CoreChecks::ValidateShaderSubgroupSizeControl(VkShaderStageFlagBits stage, if (stage_state.HasPipeline()) { const auto flags = stage_state.pipeline_create_info->flags; - if ((flags & VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT_EXT) != 0 && + if ((flags & VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT) != 0 && !enabled_features.subgroupSizeControl) { skip |= LogError("VUID-VkPipelineShaderStageCreateInfo-flags-02784", device, loc.dot(Field::flags), "includes " - "VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT_EXT, " + "VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT, " "but the subgroupSizeControl feature was not enabled."); } - if ((flags & VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT_EXT) != 0) { + if ((flags & VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT) != 0) { if (!enabled_features.computeFullSubgroups) { - skip |= - LogError("VUID-VkPipelineShaderStageCreateInfo-flags-02785", device, loc.dot(Field::flags), - "includes " - "VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT_EXT, but the computeFullSubgroups feature " - "was not enabled"); + skip |= LogError("VUID-VkPipelineShaderStageCreateInfo-flags-02785", device, loc.dot(Field::flags), + "includes " + "VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT, but the computeFullSubgroups feature " + "was not enabled"); } else if ((stage & (VK_SHADER_STAGE_MESH_BIT_EXT | VK_SHADER_STAGE_TASK_BIT_EXT | VK_SHADER_STAGE_COMPUTE_BIT)) == 0) { skip |= LogError("VUID-VkPipelineShaderStageCreateInfo-flags-08988", device, loc.dot(Field::flags), "includes " - "VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT_EXT, but the stage is %s.", + "VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT, but the stage is %s.", string_VkShaderStageFlagBits(stage)); } } @@ -518,7 +516,7 @@ bool CoreChecks::ValidateShaderSubgroupSizeControl(VkShaderStageFlagBits stage, if ((flags & VK_SHADER_CREATE_REQUIRE_FULL_SUBGROUPS_BIT_EXT) != 0) { if ((stage & (VK_SHADER_STAGE_MESH_BIT_EXT | VK_SHADER_STAGE_TASK_BIT_EXT | VK_SHADER_STAGE_COMPUTE_BIT)) == 0) { skip |= LogError("VUID-VkShaderCreateInfoEXT-flags-08992", device, loc.dot(Field::flags), - "includes VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT_EXT, but the stage is %s.", + "includes VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT, but the stage is %s.", string_VkShaderStageFlagBits(stage)); } } @@ -655,7 +653,7 @@ bool CoreChecks::ValidatePipelineShaderStage(const vvl::Pipeline &pipeline, "struct in the pNext chain but the shaderModuleIdentifier feature was not enabled. (stage %s)", string_VkShaderStageFlagBits(stage_ci.stage)); } - if (!(pipeline.create_flags & VK_PIPELINE_CREATE_2_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_KHR)) { + if (!(pipeline.create_flags & VK_PIPELINE_CREATE_2_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT)) { skip |= LogError("VUID-VkPipelineShaderStageModuleIdentifierCreateInfoEXT-pNext-06851", pipeline.Handle(), loc.pNext(Struct::VkPipelineShaderStageModuleIdentifierCreateInfoEXT, Field::identifierSize), "(%" PRIu32 "), but the pipeline was created with %s. (stage %s)", @@ -743,9 +741,11 @@ bool CoreChecks::PreCallValidateReleaseCapturedPipelineDataKHR(VkDevice device, ASSERT_AND_RETURN_SKIP(pipeline_state); if (!(pipeline_state->create_flags & VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR)) { - skip |= LogError("VUID-VkReleaseCapturedPipelineDataInfoKHR-pipeline-09613", pInfo->pipeline, error_obj.location.dot(Field::pInfo).dot(Field::pipeline), - "called on a pipeline created without the " - "VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR flag set. (Make sure you set it with VkPipelineCreateFlags2CreateInfoKHR)"); + skip |= LogError( + "VUID-VkReleaseCapturedPipelineDataInfoKHR-pipeline-09613", pInfo->pipeline, + error_obj.location.dot(Field::pInfo).dot(Field::pipeline), + "called on a pipeline created without the " + "VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR flag set. (Make sure you set it with VkPipelineCreateFlags2CreateInfo)"); } if (pipeline_state->binary_data_released) { diff --git a/layers/core_checks/cc_pipeline_compute.cpp b/layers/core_checks/cc_pipeline_compute.cpp index 486b4faacd8..b73b6c7fb6a 100644 --- a/layers/core_checks/cc_pipeline_compute.cpp +++ b/layers/core_checks/cc_pipeline_compute.cpp @@ -50,7 +50,7 @@ bool CoreChecks::PreCallValidateCreateComputePipelines(VkDevice device, VkPipeli "VUID-VkComputePipelineCreateInfo-flags-09007"); if (const auto *pipeline_robustness_info = - vku::FindStructInPNextChain(pCreateInfos[i].pNext)) { + vku::FindStructInPNextChain(pCreateInfos[i].pNext)) { skip |= ValidatePipelineRobustnessCreateInfo(*pipeline, *pipeline_robustness_info, create_info_loc); } @@ -72,7 +72,7 @@ bool CoreChecks::ValidateComputePipelineDerivatives(PipelineStates &pipeline_sta // If create derivative bit is set, check that we've specified a base // pipeline correctly, and that the base pipeline was created to allow // derivatives. - if (pipeline.create_flags & VK_PIPELINE_CREATE_2_DERIVATIVE_BIT_KHR) { + if (pipeline.create_flags & VK_PIPELINE_CREATE_2_DERIVATIVE_BIT) { std::shared_ptr base_pipeline; const auto &pipeline_ci = pipeline.ComputeCreateInfo(); const VkPipeline base_handle = pipeline_ci.basePipelineHandle; @@ -90,7 +90,7 @@ bool CoreChecks::ValidateComputePipelineDerivatives(PipelineStates &pipeline_sta base_pipeline = Get(base_handle); } - if (base_pipeline && !(base_pipeline->create_flags & VK_PIPELINE_CREATE_2_ALLOW_DERIVATIVES_BIT_KHR)) { + if (base_pipeline && !(base_pipeline->create_flags & VK_PIPELINE_CREATE_2_ALLOW_DERIVATIVES_BIT)) { skip |= LogError("VUID-vkCreateComputePipelines-flags-00696", base_pipeline->Handle(), loc, "base pipeline does not allow derivatives."); } diff --git a/layers/core_checks/cc_pipeline_graphics.cpp b/layers/core_checks/cc_pipeline_graphics.cpp index d57104f1db6..04129cd3b15 100644 --- a/layers/core_checks/cc_pipeline_graphics.cpp +++ b/layers/core_checks/cc_pipeline_graphics.cpp @@ -160,7 +160,7 @@ bool CoreChecks::ValidateGraphicsPipeline(const vvl::Pipeline &pipeline, const v skip |= ValidatePipelineAttachmentSampleCountInfo(pipeline, *attachment_sample_count_info, create_info_loc); } - if (const auto *pipeline_robustness_info = vku::FindStructInPNextChain(pipeline_pnext)) { + if (const auto *pipeline_robustness_info = vku::FindStructInPNextChain(pipeline_pnext)) { skip |= ValidatePipelineRobustnessCreateInfo(pipeline, *pipeline_robustness_info, create_info_loc); } @@ -357,7 +357,7 @@ bool CoreChecks::ValidatePipelineLibraryCreateInfo(const vvl::Pipeline &pipeline } } - if ((lib->uses_shader_module_id) && !(pipeline_flags & VK_PIPELINE_CREATE_2_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_KHR)) { + if ((lib->uses_shader_module_id) && !(pipeline_flags & VK_PIPELINE_CREATE_2_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT)) { const LogObjectList objlist(device); skip |= LogError("VUID-VkPipelineLibraryCreateInfoKHR-pLibraries-06855", objlist, library_loc, "(%s) was created with %s but VkPipelineShaderStageModuleIdentifierCreateInfoEXT::identifierSize was " @@ -366,14 +366,14 @@ bool CoreChecks::ValidatePipelineLibraryCreateInfo(const vvl::Pipeline &pipeline string_VkPipelineCreateFlags2(lib_pipeline_flags).c_str()); } struct check_struct { - VkPipelineCreateFlagBits2KHR bit; + VkPipelineCreateFlagBits2 bit; std::string first_vuid; std::string second_vuid; }; static const std::array check_infos = { - {{VK_PIPELINE_CREATE_2_NO_PROTECTED_ACCESS_BIT_EXT, "VUID-VkPipelineLibraryCreateInfoKHR-pipeline-07404", + {{VK_PIPELINE_CREATE_2_NO_PROTECTED_ACCESS_BIT, "VUID-VkPipelineLibraryCreateInfoKHR-pipeline-07404", "VUID-VkPipelineLibraryCreateInfoKHR-pipeline-07405"}, - {VK_PIPELINE_CREATE_2_PROTECTED_ACCESS_ONLY_BIT_EXT, "VUID-VkPipelineLibraryCreateInfoKHR-pipeline-07406", + {VK_PIPELINE_CREATE_2_PROTECTED_ACCESS_ONLY_BIT, "VUID-VkPipelineLibraryCreateInfoKHR-pipeline-07406", "VUID-VkPipelineLibraryCreateInfoKHR-pipeline-07407"}}}; for (const auto &check_info : check_infos) { if ((pipeline_flags & check_info.bit)) { @@ -1182,7 +1182,7 @@ bool CoreChecks::ValidateGraphicsPipelineBlendEnable(const vvl::Pipeline &pipeli VkFormatFeatureFlags2KHR format_features = GetPotentialFormatFeatures(attachment_desc.format); if (!pipeline.RasterizationDisabled() && pipeline.AttachmentStates()[i].blendEnable && - !(format_features & VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT_KHR)) { + !(format_features & VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT)) { skip |= LogError("VUID-VkGraphicsPipelineCreateInfo-renderPass-06041", device, color_loc.dot(Field::pAttachments, i).dot(Field::blendEnable), "is VK_TRUE but format %s of the corresponding attachment description (subpass %" PRIu32 @@ -3051,10 +3051,9 @@ bool CoreChecks::ValidateGraphicsPipelineDynamicRendering(const vvl::Pipeline &p } } if (pipeline.fragment_shader_state && pipeline.fragment_output_state) { - const auto input_attachment_index = - vku::FindStructInPNextChain(pipeline_ci.pNext); + const auto input_attachment_index = vku::FindStructInPNextChain(pipeline_ci.pNext); if (input_attachment_index) { - skip |= ValidateRenderingInputAttachmentIndicesKHR( + skip |= ValidateRenderingInputAttachmentIndices( *input_attachment_index, device, create_info_loc.pNext(Struct::VkRenderingInputAttachmentIndexInfo)); if (input_attachment_index->colorAttachmentCount != rendering_struct->colorAttachmentCount) { const Location loc = @@ -3066,9 +3065,9 @@ bool CoreChecks::ValidateGraphicsPipelineDynamicRendering(const vvl::Pipeline &p } } - const auto attachment_location = vku::FindStructInPNextChain(pipeline_ci.pNext); + const auto attachment_location = vku::FindStructInPNextChain(pipeline_ci.pNext); if (attachment_location) { - skip |= ValidateRenderingAttachmentLocationsKHR(*attachment_location, device, + skip |= ValidateRenderingAttachmentLocations(*attachment_location, device, create_info_loc.pNext(Struct::VkRenderingAttachmentLocationInfo)); if (attachment_location->colorAttachmentCount != rendering_struct->colorAttachmentCount) { const Location loc = @@ -3361,7 +3360,8 @@ bool CoreChecks::ValidateDrawPipelineRenderpass(const LastBound &last_bound_stat if (!all_keep_op && write_mask_enabled) { const bool is_stencil_layout_read_only = [&]() { // Look for potential dedicated stencil layout - if (const auto *stencil_layout = vku::FindStructInPNextChain(ds_attachment->pNext); + if (const auto *stencil_layout = + vku::FindStructInPNextChain(ds_attachment->pNext); stencil_layout) return IsImageLayoutStencilReadOnly(stencil_layout->stencilLayout); // Else depth and stencil share same layout @@ -3917,7 +3917,7 @@ bool CoreChecks::ValidatePipelineVertexDivisors(const vvl::Pipeline &pipeline, c if (!input_state) { return skip; } - const auto divisor_state_info = vku::FindStructInPNextChain(input_state->pNext); + const auto divisor_state_info = vku::FindStructInPNextChain(input_state->pNext); if (!divisor_state_info) { return skip; } @@ -4028,7 +4028,7 @@ bool CoreChecks::ValidateGraphicsPipelineDerivatives(PipelineStates &pipeline_st // If create derivative bit is set, check that we've specified a base // pipeline correctly, and that the base pipeline was created to allow // derivatives. - if (pipeline.create_flags & VK_PIPELINE_CREATE_2_DERIVATIVE_BIT_KHR) { + if (pipeline.create_flags & VK_PIPELINE_CREATE_2_DERIVATIVE_BIT) { std::shared_ptr base_pipeline; const auto &pipeline_ci = pipeline.GraphicsCreateInfo(); const VkPipeline base_handle = pipeline_ci.basePipelineHandle; @@ -4046,7 +4046,7 @@ bool CoreChecks::ValidateGraphicsPipelineDerivatives(PipelineStates &pipeline_st base_pipeline = Get(base_handle); } - if (base_pipeline && !(base_pipeline->create_flags & VK_PIPELINE_CREATE_2_ALLOW_DERIVATIVES_BIT_KHR)) { + if (base_pipeline && !(base_pipeline->create_flags & VK_PIPELINE_CREATE_2_ALLOW_DERIVATIVES_BIT)) { skip |= LogError("VUID-vkCreateGraphicsPipelines-flags-00721", base_pipeline->Handle(), loc, "base pipeline does not allow derivatives."); } @@ -4285,7 +4285,7 @@ bool CoreChecks::ValidateDrawPipelineRasterizationState(const LastBound &last_bo const auto *imageview_state = cb_state.GetActiveAttachmentImageViewState(attachment); const auto *color_blend_state = pipeline.ColorBlendState(); if (imageview_state && color_blend_state && (attachment < color_blend_state->attachmentCount)) { - if ((imageview_state->format_features & VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT_KHR) == 0 && + if ((imageview_state->format_features & VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT) == 0 && color_blend_state->pAttachments[i].blendEnable != VK_FALSE) { const LogObjectList objlist(cb_state.Handle(), pipeline.Handle(), cb_state.activeRenderPass->Handle()); skip |= LogError(vuid.blend_enable_04727, objlist, vuid.loc(), @@ -4319,48 +4319,47 @@ bool CoreChecks::ValidateDrawPipelineRasterizationState(const LastBound &last_bo const bool dynamic_line_stipple_enable = pipeline.IsDynamic(CB_DYNAMIC_STATE_LINE_STIPPLE_ENABLE_EXT); if (dynamic_line_stipple_enable || dynamic_line_raster_mode) { const auto raster_line_state = - vku::FindStructInPNextChain(pipeline.RasterizationStatePNext()); + vku::FindStructInPNextChain(pipeline.RasterizationStatePNext()); - const VkLineRasterizationModeKHR line_rasterization_mode = (dynamic_line_raster_mode) - ? cb_state.dynamic_state_value.line_rasterization_mode - : raster_line_state->lineRasterizationMode; + const VkLineRasterizationMode line_rasterization_mode = (dynamic_line_raster_mode) + ? cb_state.dynamic_state_value.line_rasterization_mode + : raster_line_state->lineRasterizationMode; const bool stippled_line_enable = (dynamic_line_stipple_enable) ? cb_state.dynamic_state_value.stippled_line_enable : raster_line_state->stippledLineEnable; if (stippled_line_enable) { - if (line_rasterization_mode == VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR && + if (line_rasterization_mode == VK_LINE_RASTERIZATION_MODE_RECTANGULAR && (!enabled_features.stippledRectangularLines)) { const LogObjectList objlist(cb_state.Handle(), pipeline.Handle(), cb_state.activeRenderPass->Handle()); skip |= LogError(vuid.stippled_rectangular_lines_07495, objlist, vuid.loc(), - "lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR (set %s) with " + "lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_RECTANGULAR (set %s) with " "stippledLineEnable (set %s) but the stippledRectangularLines feature is not enabled.", dynamic_line_raster_mode ? "dynamically" : "in pipeline", dynamic_line_stipple_enable ? "dynamically" : "in pipeline"); } - if (line_rasterization_mode == VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR && - (!enabled_features.stippledBresenhamLines)) { + if (line_rasterization_mode == VK_LINE_RASTERIZATION_MODE_BRESENHAM && (!enabled_features.stippledBresenhamLines)) { const LogObjectList objlist(cb_state.Handle(), pipeline.Handle(), cb_state.activeRenderPass->Handle()); skip |= LogError(vuid.stippled_bresenham_lines_07496, objlist, vuid.loc(), - "lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR (set %s) with " + "lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_BRESENHAM (set %s) with " "stippledLineEnable (set %s) but the stippledBresenhamLines feature is not enabled.", dynamic_line_raster_mode ? "dynamically" : "in pipeline", dynamic_line_stipple_enable ? "dynamically" : "in pipeline"); } - if (line_rasterization_mode == VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR && + if (line_rasterization_mode == VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH && (!enabled_features.stippledSmoothLines)) { const LogObjectList objlist(cb_state.Handle(), pipeline.Handle(), cb_state.activeRenderPass->Handle()); skip |= LogError(vuid.stippled_smooth_lines_07497, objlist, vuid.loc(), - "lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR (set %s) with " + "lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH (set %s) with " "stippledLineEnable (set %s) but the stippledSmoothLines feature is not enabled.", dynamic_line_raster_mode ? "dynamically" : "in pipeline", dynamic_line_stipple_enable ? "dynamically" : "in pipeline"); } - if (line_rasterization_mode == VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR && + if (line_rasterization_mode == VK_LINE_RASTERIZATION_MODE_DEFAULT && (!enabled_features.stippledRectangularLines || !phys_dev_props.limits.strictLines)) { const LogObjectList objlist(cb_state.Handle(), pipeline.Handle(), cb_state.activeRenderPass->Handle()); skip |= LogError(vuid.stippled_default_strict_07498, objlist, vuid.loc(), - "lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR (set %s) with " + "lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_DEFAULT (set %s) with " "stippledLineEnable (set %s), the stippledRectangularLines features is %s and strictLines is %s.", dynamic_line_raster_mode ? "dynamically" : "in pipeline", dynamic_line_stipple_enable ? "dynamically" : "in pipeline", diff --git a/layers/core_checks/cc_pipeline_ray_tracing.cpp b/layers/core_checks/cc_pipeline_ray_tracing.cpp index 1c21e0f7e51..f15136fd780 100644 --- a/layers/core_checks/cc_pipeline_ray_tracing.cpp +++ b/layers/core_checks/cc_pipeline_ray_tracing.cpp @@ -95,7 +95,7 @@ bool CoreChecks::ValidateRayTracingPipeline(const vvl::Pipeline &pipeline, skip |= ValidateShaderStage(pipeline.stage_states[i], &pipeline, create_info_loc.dot(Field::pStages, i)); } - if (const auto *pipeline_robustness_info = vku::FindStructInPNextChain(create_info.pNext)) { + if (const auto *pipeline_robustness_info = vku::FindStructInPNextChain(create_info.pNext)) { skip |= ValidatePipelineRobustnessCreateInfo(pipeline, *pipeline_robustness_info, create_info_loc); } diff --git a/layers/core_checks/cc_query.cpp b/layers/core_checks/cc_query.cpp index f3ac1316c15..e6310e11685 100644 --- a/layers/core_checks/cc_query.cpp +++ b/layers/core_checks/cc_query.cpp @@ -452,7 +452,7 @@ bool CoreChecks::ValidateBeginQuery(const vvl::CommandBuffer &cb_state, const Qu const LogObjectList objlist(cb_state.Handle(), query_obj.pool); skip |= LogError(vuid, objlist, loc.dot(Field::queryPool), "(%s) was created with a counter of scope " - "VK_QUERY_SCOPE_COMMAND_BUFFER_KHR but %s is not the first recorded " + "VK_PERFORMANCE_COUNTER_SCOPE_COMMAND_BUFFER_KHR but %s is not the first recorded " "command in the command buffer.", FormatHandle(query_obj.pool).c_str(), loc.StringFunc()); } @@ -463,7 +463,7 @@ bool CoreChecks::ValidateBeginQuery(const vvl::CommandBuffer &cb_state, const Qu const LogObjectList objlist(cb_state.Handle(), query_obj.pool); skip |= LogError(vuid, objlist, loc.dot(Field::queryPool), "(%s) was created with a counter of scope " - "VK_QUERY_SCOPE_RENDER_PASS_KHR but %s is inside a render pass.", + "VK_PERFORMANCE_COUNTER_SCOPE_RENDER_PASS_KHR but %s is inside a render pass.", FormatHandle(query_obj.pool).c_str(), loc.StringFunc()); } @@ -890,7 +890,7 @@ void CoreChecks::EnqueueVerifyEndQuery(vvl::CommandBuffer &cb_state, const Query const Location loc(command); skip |= LogError("VUID-vkCmdEndQuery-queryPool-03227", objlist, loc, "Query pool %s was created with a counter of scope " - "VK_QUERY_SCOPE_COMMAND_BUFFER_KHR but the end of the query is not the last " + "VK_PERFORMANCE_COUNTER_SCOPE_COMMAND_BUFFER_KHR but the end of the query is not the last " "command in the command buffer %s.", FormatHandle(query_obj.pool).c_str(), FormatHandle(cb_state_arg).c_str()); } @@ -918,7 +918,7 @@ bool CoreChecks::ValidateCmdEndQuery(const vvl::CommandBuffer &cb_state, VkQuery const LogObjectList objlist(cb_state.Handle(), queryPool); skip |= LogError("VUID-vkCmdEndQuery-queryPool-03228", objlist, loc, "Query pool %s was created with a counter of scope " - "VK_QUERY_SCOPE_RENDER_PASS_KHR but %s is inside a render pass.", + "VK_PERFORMANCE_COUNTER_SCOPE_RENDER_PASS_KHR but %s is inside a render pass.", FormatHandle(queryPool).c_str(), loc.StringFunc()); } } diff --git a/layers/core_checks/cc_queue.cpp b/layers/core_checks/cc_queue.cpp index fba8f551851..84db3e77bfb 100644 --- a/layers/core_checks/cc_queue.cpp +++ b/layers/core_checks/cc_queue.cpp @@ -292,7 +292,7 @@ bool CoreChecks::ValidateRenderPassStripeSubmitInfo(VkQueue queue, const vvl::Co return skip; } -bool CoreChecks::ValidateQueueSubmit2(VkQueue queue, uint32_t submitCount, const VkSubmitInfo2KHR *pSubmits, VkFence fence, +bool CoreChecks::ValidateQueueSubmit2(VkQueue queue, uint32_t submitCount, const VkSubmitInfo2 *pSubmits, VkFence fence, const ErrorObject &error_obj) const { bool skip = false; if (auto fence_state = Get(fence)) { @@ -317,13 +317,13 @@ bool CoreChecks::ValidateQueueSubmit2(VkQueue queue, uint32_t submitCount, const // Now verify each individual submit for (uint32_t submit_idx = 0; submit_idx < submitCount; submit_idx++) { const Location submit_loc = error_obj.location.dot(Struct::VkSubmitInfo2, Field::pSubmits, submit_idx); - const VkSubmitInfo2KHR &submit = pSubmits[submit_idx]; + const VkSubmitInfo2 &submit = pSubmits[submit_idx]; const auto perf_submit = vku::FindStructInPNextChain(submit.pNext); const uint32_t perf_pass = perf_submit ? perf_submit->counterPassIndex : 0; skip |= ValidateSemaphoresForSubmit(sem_submit_state, submit, submit_loc); - const bool protected_submit = (submit.flags & VK_SUBMIT_PROTECTED_BIT_KHR) != 0; + const bool protected_submit = (submit.flags & VK_SUBMIT_PROTECTED_BIT) != 0; if ((protected_submit == true) && ((queue_state->create_flags & VK_DEVICE_QUEUE_CREATE_PROTECTED_BIT)) == 0) { skip |= LogError("VUID-vkQueueSubmit2-queue-06447", queue, submit_loc, "contains a protected submission to %s which was not created with " @@ -351,13 +351,13 @@ bool CoreChecks::ValidateQueueSubmit2(VkQueue queue, uint32_t submitCount, const if ((cb_state->unprotected == true) && (protected_submit == true)) { const LogObjectList objlist(cb_state->Handle(), queue); skip |= LogError("VUID-VkSubmitInfo2-flags-03886", objlist, cb_loc, - "is unprotected while %s.flags (%s) has VK_SUBMIT_PROTECTED_BIT_KHR set", - submit_loc.Fields().c_str(), string_VkSubmitFlags(submit.flags).c_str()); + "is unprotected while %s.flags (%s) has VK_SUBMIT_PROTECTED_BIT set", submit_loc.Fields().c_str(), + string_VkSubmitFlags(submit.flags).c_str()); } if ((cb_state->unprotected == false) && (protected_submit == false)) { const LogObjectList objlist(cb_state->Handle(), queue); skip |= LogError("VUID-VkSubmitInfo2-flags-03887", objlist, cb_loc, - "is protected while %s.flags (%s) has VK_SUBMIT_PROTECTED_BIT_KHR not set", + "is protected while %s.flags (%s) has VK_SUBMIT_PROTECTED_BIT not set", submit_loc.Fields().c_str(), string_VkSubmitFlags(submit.flags).c_str()); } diff --git a/layers/core_checks/cc_render_pass.cpp b/layers/core_checks/cc_render_pass.cpp index e22638d8c60..e84e0229c82 100644 --- a/layers/core_checks/cc_render_pass.cpp +++ b/layers/core_checks/cc_render_pass.cpp @@ -254,14 +254,13 @@ bool CoreChecks::ValidateDependencyCompatibility(const VulkanTypedHandle &rp1_ob VkAccessFlags2 secondary_src_access_mask = secondary_dep.srcAccessMask; VkAccessFlags2 secondary_dst_access_mask = secondary_dep.dstAccessMask; - if (const auto primary_barrier = vku::FindStructInPNextChain(rp1_state.create_info.pNext); - primary_barrier) { + if (const auto primary_barrier = vku::FindStructInPNextChain(rp1_state.create_info.pNext); primary_barrier) { primary_src_stage_mask = primary_barrier->srcStageMask; primary_dst_stage_mask = primary_barrier->dstStageMask; primary_src_access_mask = primary_barrier->srcAccessMask; primary_dst_access_mask = primary_barrier->dstAccessMask; } - if (const auto secondary_barrier = vku::FindStructInPNextChain(rp2_state.create_info.pNext); + if (const auto secondary_barrier = vku::FindStructInPNextChain(rp2_state.create_info.pNext); secondary_barrier) { secondary_src_stage_mask = secondary_barrier->srcStageMask; secondary_dst_stage_mask = secondary_barrier->dstStageMask; @@ -1339,8 +1338,8 @@ bool CoreChecks::ValidateAttachmentReference(VkAttachmentReference2 reference, c } } break; - case VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR: - case VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR: + case VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL: + case VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL: if (!enabled_features.synchronization2) { vuid = (use_rp2) ? "VUID-VkAttachmentReference2-synchronization2-06910" : "VUID-VkAttachmentReference-synchronization2-06910"; @@ -1357,12 +1356,12 @@ bool CoreChecks::ValidateAttachmentReference(VkAttachmentReference2 reference, c "attachmentFeedbackLoopLayout feature was not enabled."); } break; - case VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR: + case VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ: if (!enabled_features.dynamicRenderingLocalRead) { vuid = (use_rp2) ? "VUID-VkAttachmentReference2-dynamicRenderingLocalRead-09546" : "VUID-VkAttachmentReference-dynamicRenderingLocalRead-09546"; skip |= LogError(vuid, device, loc, - "is VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR, but the " + "is VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ, but the " "dynamicRenderingLocalRead feature was not enabled."); } break; @@ -1448,7 +1447,7 @@ bool CoreChecks::ValidateRenderpassAttachmentUsage(const VkRenderPassCreateInfo2 skip |= LogError(vuid, device, input_loc.dot(Field::layout), "(%s) is invalid.", string_VkImageLayout(attachment_layout)); } - if (attachment_layout == VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR) { + if (attachment_layout == VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL) { const char *vuid = use_rp2 ? "VUID-VkSubpassDescription2-attachment-06921" : "VUID-VkSubpassDescription-attachment-06921"; skip |= LogError(vuid, device, input_loc.dot(Field::layout), "(%s) is invalid.", @@ -1501,7 +1500,7 @@ bool CoreChecks::ValidateRenderpassAttachmentUsage(const VkRenderPassCreateInfo2 attach_first_use[attachment_index] = false; const VkFormatFeatureFlags2 valid_flags = - VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT_KHR | VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT_KHR; + VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT; const VkFormatFeatureFlags2 format_features = GetPotentialFormatFeatures(attachment_format); const void *pNext = (use_rp2) ? attachment_description.pNext : nullptr; if ((format_features & valid_flags) == 0 && GetExternalFormat(pNext) == 0) { @@ -1610,7 +1609,7 @@ bool CoreChecks::ValidateRenderpassAttachmentUsage(const VkRenderPassCreateInfo2 skip |= LogError(vuid, device, resolve_loc.dot(Field::layout), "(%s) is invalid.", string_VkImageLayout(attachment_layout)); } - if (attachment_layout == VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR) { + if (attachment_layout == VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL) { const char *vuid = use_rp2 ? "VUID-VkSubpassDescription2-attachment-06923" : "VUID-VkSubpassDescription-attachment-06923"; skip |= LogError(vuid, device, resolve_loc.dot(Field::layout), "(%s) is invalid.", @@ -1646,8 +1645,7 @@ bool CoreChecks::ValidateRenderpassAttachmentUsage(const VkRenderPassCreateInfo2 const VkFormatFeatureFlags2 format_features = GetPotentialFormatFeatures(attachment_format); // Can be VK_FORMAT_UNDEFINED with VK_ANDROID_external_format_resolve - if ((format_features & VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT_KHR) == 0 && - attachment_format != VK_FORMAT_UNDEFINED) { + if ((format_features & VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT) == 0 && attachment_format != VK_FORMAT_UNDEFINED) { if (!enabled_features.linearColorAttachment) { const char *vuid = use_rp2 ? "VUID-VkSubpassDescription2-pResolveAttachments-09343" : "VUID-VkSubpassDescription-pResolveAttachments-02649"; @@ -1726,7 +1724,7 @@ bool CoreChecks::ValidateRenderpassAttachmentUsage(const VkRenderPassCreateInfo2 attach_first_use[attachment] = false; const VkFormatFeatureFlags2 format_features = GetPotentialFormatFeatures(attachment_format); - if ((format_features & VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT_KHR) == 0) { + if ((format_features & VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT) == 0) { const char *vuid = use_rp2 ? "VUID-VkSubpassDescription2-pDepthStencilAttachment-02900" : "VUID-VkSubpassDescription-pDepthStencilAttachment-02650"; skip |= LogError(vuid, device, attachment_loc.dot(Field::format), @@ -1889,7 +1887,7 @@ bool CoreChecks::ValidateRenderpassAttachmentUsage(const VkRenderPassCreateInfo2 skip |= LogError(vuid, device, color_loc.dot(Field::layout), "(%s) is invalid.", string_VkImageLayout(attachment_layout)); } - if (attachment_layout == VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR) { + if (attachment_layout == VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL) { const char *vuid = use_rp2 ? "VUID-VkSubpassDescription2-attachment-06922" : "VUID-VkSubpassDescription-attachment-06922"; skip |= LogError(vuid, device, color_loc.dot(Field::layout), "(%s) is invalid.", @@ -1995,7 +1993,7 @@ bool CoreChecks::ValidateRenderpassAttachmentUsage(const VkRenderPassCreateInfo2 const VkFormatFeatureFlags2 format_features = GetPotentialFormatFeatures(attachment_format); // Can be VK_FORMAT_UNDEFINED with VK_ANDROID_external_format_resolve - if ((format_features & VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT_KHR) == 0 && + if ((format_features & VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT) == 0 && attachment_format != VK_FORMAT_UNDEFINED) { if (!enabled_features.linearColorAttachment) { const char *vuid = use_rp2 ? "VUID-VkSubpassDescription2-pColorAttachments-02898" @@ -2631,7 +2629,7 @@ bool CoreChecks::ValidateDepthStencilResolve(const VkRenderPassCreateInfo2 *pCre } const VkFormatFeatureFlags2 potential_format_features = GetPotentialFormatFeatures(resolve_attachment_format); - if ((potential_format_features & VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT_KHR) == 0) { + if ((potential_format_features & VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT) == 0) { skip |= LogError("VUID-VkSubpassDescriptionDepthStencilResolve-pDepthStencilResolveAttachment-02651", device, ds_resolve_loc, "has a format (%s) whose features do not contain VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT.", @@ -3025,9 +3023,9 @@ bool CoreChecks::ValidateRenderingAttachmentInfo(VkCommandBuffer commandBuffer, "must not be VK_IMAGE_LAYOUT_FRAGMENT_DENSITY_MAP_OPTIMAL_EXT"); } - if (attachment_info.resolveImageLayout == VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR) { + if (attachment_info.resolveImageLayout == VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL) { skip |= LogError("VUID-VkRenderingAttachmentInfo-imageView-06142", commandBuffer, - attachment_loc.dot(Field::resolveImageLayout), "must not be VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR"); + attachment_loc.dot(Field::resolveImageLayout), "must not be VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL"); } if (resolve_view_state && (image_view_format != resolve_view_state->create_info.format)) { @@ -3565,10 +3563,10 @@ bool CoreChecks::PreCallValidateCmdBeginRendering(VkCommandBuffer commandBuffer, const Location rendering_info_loc = error_obj.location.dot(Field::pRenderingInfo); - if (cb_state->IsSecondary() && ((pRenderingInfo->flags & VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR) != 0) && + if (cb_state->IsSecondary() && ((pRenderingInfo->flags & VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT) != 0) && !enabled_features.nestedCommandBuffer) { skip |= LogError("VUID-vkCmdBeginRendering-commandBuffer-06068", commandBuffer, rendering_info_loc.dot(Field::flags), - "must not include VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR in a secondary command buffer."); + "must not include VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT in a secondary command buffer."); } if (!(IsExtEnabled(device_extensions.vk_amd_mixed_attachment_samples) || @@ -5040,8 +5038,8 @@ bool CoreChecks::ValidateInheritanceInfoFramebuffer(VkCommandBuffer primaryBuffe return skip; } -bool CoreChecks::ValidateRenderingAttachmentLocationsKHR(const VkRenderingAttachmentLocationInfoKHR &location_info, - const LogObjectList objlist, const Location &loc_info) const { +bool CoreChecks::ValidateRenderingAttachmentLocations(const VkRenderingAttachmentLocationInfo &location_info, + const LogObjectList objlist, const Location &loc_info) const { bool skip = false; if (location_info.pColorAttachmentLocations) { @@ -5086,7 +5084,7 @@ bool CoreChecks::ValidateRenderingAttachmentLocationsKHR(const VkRenderingAttach } bool CoreChecks::PreCallValidateCmdSetRenderingAttachmentLocations(VkCommandBuffer commandBuffer, - const VkRenderingAttachmentLocationInfoKHR *pLocationInfo, + const VkRenderingAttachmentLocationInfo *pLocationInfo, const ErrorObject &error_obj) const { const auto &cb_state = *GetRead(commandBuffer); const Location loc_info = error_obj.location; @@ -5120,7 +5118,7 @@ bool CoreChecks::PreCallValidateCmdSetRenderingAttachmentLocations(VkCommandBuff pLocationInfo->colorAttachmentCount, rp_state.dynamic_rendering_begin_rendering_info.colorAttachmentCount); } - skip |= ValidateRenderingAttachmentLocationsKHR(*pLocationInfo, commandBuffer, loc_info.dot(Field::pLocationInfo)); + skip |= ValidateRenderingAttachmentLocations(*pLocationInfo, commandBuffer, loc_info.dot(Field::pLocationInfo)); return skip; } @@ -5131,8 +5129,8 @@ bool CoreChecks::PreCallValidateCmdSetRenderingAttachmentLocationsKHR(VkCommandB return PreCallValidateCmdSetRenderingAttachmentLocations(commandBuffer, pLocationInfo, error_obj); } -bool CoreChecks::ValidateRenderingInputAttachmentIndicesKHR(const VkRenderingInputAttachmentIndexInfoKHR &index_info, - const LogObjectList objlist, const Location &loc_info) const { +bool CoreChecks::ValidateRenderingInputAttachmentIndices(const VkRenderingInputAttachmentIndexInfo &index_info, + const LogObjectList objlist, const Location &loc_info) const { bool skip = false; if (!enabled_features.dynamicRenderingLocalRead) { @@ -5203,7 +5201,7 @@ bool CoreChecks::ValidateRenderingInputAttachmentIndicesKHR(const VkRenderingInp } bool CoreChecks::PreCallValidateCmdSetRenderingInputAttachmentIndices(VkCommandBuffer commandBuffer, - const VkRenderingInputAttachmentIndexInfoKHR *pLocationInfo, + const VkRenderingInputAttachmentIndexInfo *pLocationInfo, const ErrorObject &error_obj) const { const auto &cb_state = *GetRead(commandBuffer); bool skip = false; @@ -5236,7 +5234,7 @@ bool CoreChecks::PreCallValidateCmdSetRenderingInputAttachmentIndices(VkCommandB pLocationInfo->colorAttachmentCount, rp_state.create_info.attachmentCount); } - skip |= ValidateRenderingInputAttachmentIndicesKHR(*pLocationInfo, commandBuffer, error_obj.location); + skip |= ValidateRenderingInputAttachmentIndices(*pLocationInfo, commandBuffer, error_obj.location); return skip; } diff --git a/layers/core_checks/cc_spirv.cpp b/layers/core_checks/cc_spirv.cpp index aa6debc7416..ee261840621 100644 --- a/layers/core_checks/cc_spirv.cpp +++ b/layers/core_checks/cc_spirv.cpp @@ -201,7 +201,7 @@ static void TypeToDescriptorTypeSet(const spirv::Module &module_state, uint32_t } else { descriptor_type_set.insert(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER); descriptor_type_set.insert(VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC); - descriptor_type_set.insert(VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT); + descriptor_type_set.insert(VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK); } } else if (insn->Word(2) == spv::DecorationBufferBlock) { descriptor_type_set.insert(VK_DESCRIPTOR_TYPE_STORAGE_BUFFER); @@ -2351,7 +2351,7 @@ bool CoreChecks::ValidateShaderStage(const ShaderStageState &stage_state, const if (pipeline) { skip |= ValidateShaderStageMaxResources(stage, *pipeline, loc); if (const auto *pipeline_robustness_info = - vku::FindStructInPNextChain(stage_state.GetPNext())) { + vku::FindStructInPNextChain(stage_state.GetPNext())) { skip |= ValidatePipelineRobustnessCreateInfo(*pipeline, *pipeline_robustness_info, loc); } } @@ -2885,8 +2885,8 @@ bool CoreChecks::ValidateComputeWorkGroupSizes(const spirv::Module &module_state } if (stage_state.pipeline_create_info) { - const auto subgroup_flags = VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT_EXT | - VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT_EXT; + const auto subgroup_flags = VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT | + VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT; if ((stage_state.pipeline_create_info->flags & subgroup_flags) == subgroup_flags) { if (SafeModulo(local_size_x, phys_dev_props_core13.maxSubgroupSize) != 0) { skip |= LogError( @@ -2896,9 +2896,9 @@ bool CoreChecks::ValidateComputeWorkGroupSizes(const spirv::Module &module_state string_VkPipelineShaderStageCreateFlags(stage_state.pipeline_create_info->flags).c_str(), local_size_x, phys_dev_props_core13.maxSubgroupSize); } - } else if ((stage_state.pipeline_create_info->flags & VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT_EXT) && - (stage_state.pipeline_create_info->flags & - VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT_EXT) == 0) { + } else if ((stage_state.pipeline_create_info->flags & VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT) && + (stage_state.pipeline_create_info->flags & VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT) == + 0) { if (!vku::FindStructInPNextChain(stage_state.GetPNext())) { if (SafeModulo(local_size_x, phys_dev_props_core11.subgroupSize) != 0) { skip |= diff --git a/layers/core_checks/cc_synchronization.cpp b/layers/core_checks/cc_synchronization.cpp index 345d8d08a96..93db7b676b7 100644 --- a/layers/core_checks/cc_synchronization.cpp +++ b/layers/core_checks/cc_synchronization.cpp @@ -412,7 +412,7 @@ bool CoreChecks::ValidateSemaphoresForSubmit(SemaphoreSubmitState &state, const return skip; } -bool CoreChecks::ValidateSemaphoresForSubmit(SemaphoreSubmitState &state, const VkSubmitInfo2KHR &submit, +bool CoreChecks::ValidateSemaphoresForSubmit(SemaphoreSubmitState &state, const VkSubmitInfo2 &submit, const Location &submit_loc) const { bool skip = false; for (uint32_t i = 0; i < submit.waitSemaphoreInfoCount; ++i) { @@ -696,8 +696,8 @@ bool CoreChecks::PreCallValidateCmdSetEvent(VkCommandBuffer commandBuffer, VkEve return skip; } -bool CoreChecks::PreCallValidateCmdSetEvent2(VkCommandBuffer commandBuffer, VkEvent event, - const VkDependencyInfoKHR *pDependencyInfo, const ErrorObject &error_obj) const { +bool CoreChecks::PreCallValidateCmdSetEvent2(VkCommandBuffer commandBuffer, VkEvent event, const VkDependencyInfo *pDependencyInfo, + const ErrorObject &error_obj) const { const LogObjectList objlist(commandBuffer, event); auto cb_state = GetRead(commandBuffer); @@ -940,7 +940,7 @@ bool CoreChecks::ValidateRenderPassPipelineBarriers(const Location &outer_loc, c } bool CoreChecks::ValidateRenderPassPipelineBarriers(const Location &outer_loc, const vvl::CommandBuffer &cb_state, - const VkDependencyInfoKHR &dep_info) const { + const VkDependencyInfo &dep_info) const { bool skip = false; const auto &rp_state = cb_state.activeRenderPass; if (rp_state->UsesDynamicRendering()) { @@ -1005,17 +1005,17 @@ bool CoreChecks::ValidateStageMasksAgainstQueueCapabilities(const LogObjectList VkQueueFlags queue_flags, VkPipelineStageFlags2KHR stage_mask) const { bool skip = false; // these are always allowed by queues, calls that restrict them have dedicated VUs. - stage_mask &= ~(VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT_KHR | VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT_KHR | - VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT_KHR | VK_PIPELINE_STAGE_2_HOST_BIT_KHR); + stage_mask &= ~(VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT | VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT | + VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT | VK_PIPELINE_STAGE_2_HOST_BIT); if (stage_mask == 0) { return skip; } static const std::array, 4> metaFlags{ - {{VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT_KHR, VK_QUEUE_GRAPHICS_BIT}, - {VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT_KHR, VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT}, - {VK_PIPELINE_STAGE_2_PRE_RASTERIZATION_SHADERS_BIT_KHR, VK_QUEUE_GRAPHICS_BIT}, - {VK_PIPELINE_STAGE_2_VERTEX_INPUT_BIT_KHR, VK_QUEUE_GRAPHICS_BIT}}}; + {{VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT, VK_QUEUE_GRAPHICS_BIT}, + {VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT, VK_QUEUE_GRAPHICS_BIT | VK_QUEUE_COMPUTE_BIT | VK_QUEUE_TRANSFER_BIT}, + {VK_PIPELINE_STAGE_2_PRE_RASTERIZATION_SHADERS_BIT, VK_QUEUE_GRAPHICS_BIT}, + {VK_PIPELINE_STAGE_2_VERTEX_INPUT_BIT, VK_QUEUE_GRAPHICS_BIT}}}; for (const auto &entry : metaFlags) { if (((entry.first & stage_mask) != 0) && ((entry.second & queue_flags) == 0)) { @@ -1030,7 +1030,7 @@ bool CoreChecks::ValidateStageMasksAgainstQueueCapabilities(const LogObjectList return skip; } - auto supported_flags = sync_utils::ExpandPipelineStages(VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT_KHR, queue_flags); + auto supported_flags = sync_utils::ExpandPipelineStages(VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT, queue_flags); auto bad_flags = stage_mask & ~supported_flags; @@ -1098,10 +1098,10 @@ bool CoreChecks::ValidateAccessMask(const LogObjectList &objlist, const Location } // Early out if all commands set - if ((stage_mask & VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT_KHR) != 0) return skip; + if ((stage_mask & VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT) != 0) return skip; // or if only generic memory accesses are specified (or we got a 0 mask) - access_mask &= ~(VK_ACCESS_2_MEMORY_READ_BIT_KHR | VK_ACCESS_2_MEMORY_WRITE_BIT_KHR); + access_mask &= ~(VK_ACCESS_2_MEMORY_READ_BIT | VK_ACCESS_2_MEMORY_WRITE_BIT); if (access_mask == 0) return skip; const auto valid_accesses = sync_utils::CompatibleAccessMask(expanded_pipeline_stages); @@ -1409,9 +1409,9 @@ bool CoreChecks::PreCallValidateSetEvent(VkDevice device, VkEvent event, const E skip |= LogError("VUID-vkSetEvent-event-09543", event, error_obj.location.dot(Field::event), "(%s) that is already in use by a command buffer.", FormatHandle(event).c_str()); } - if (event_state->flags & VK_EVENT_CREATE_DEVICE_ONLY_BIT_KHR) { + if (event_state->flags & VK_EVENT_CREATE_DEVICE_ONLY_BIT) { skip |= LogError("VUID-vkSetEvent-event-03941", event, error_obj.location.dot(Field::event), - "(%s) was created with VK_EVENT_CREATE_DEVICE_ONLY_BIT_KHR.", FormatHandle(event).c_str()); + "(%s) was created with VK_EVENT_CREATE_DEVICE_ONLY_BIT.", FormatHandle(event).c_str()); } } return skip; @@ -1420,9 +1420,9 @@ bool CoreChecks::PreCallValidateSetEvent(VkDevice device, VkEvent event, const E bool CoreChecks::PreCallValidateResetEvent(VkDevice device, VkEvent event, const ErrorObject &error_obj) const { bool skip = false; if (auto event_state = Get(event)) { - if (event_state->flags & VK_EVENT_CREATE_DEVICE_ONLY_BIT_KHR) { + if (event_state->flags & VK_EVENT_CREATE_DEVICE_ONLY_BIT) { skip |= LogError("VUID-vkResetEvent-event-03823", event, error_obj.location.dot(Field::event), - "(%s) was created with VK_EVENT_CREATE_DEVICE_ONLY_BIT_KHR.", FormatHandle(event).c_str()); + "(%s) was created with VK_EVENT_CREATE_DEVICE_ONLY_BIT.", FormatHandle(event).c_str()); } } return skip; @@ -1431,9 +1431,9 @@ bool CoreChecks::PreCallValidateResetEvent(VkDevice device, VkEvent event, const bool CoreChecks::PreCallValidateGetEventStatus(VkDevice device, VkEvent event, const ErrorObject &error_obj) const { bool skip = false; if (auto event_state = Get(event)) { - if (event_state->flags & VK_EVENT_CREATE_DEVICE_ONLY_BIT_KHR) { + if (event_state->flags & VK_EVENT_CREATE_DEVICE_ONLY_BIT) { skip |= LogError("VUID-vkGetEventStatus-event-03940", event, error_obj.location.dot(Field::event), - "(%s) was created with VK_EVENT_CREATE_DEVICE_ONLY_BIT_KHR.", FormatHandle(event).c_str()); + "(%s) was created with VK_EVENT_CREATE_DEVICE_ONLY_BIT.", FormatHandle(event).c_str()); } } return skip; @@ -1524,8 +1524,8 @@ static inline VkQueueFlags SubpassToQueueFlags(uint32_t subpass) { bool CoreChecks::ValidateSubpassDependency(const ErrorObject &error_obj, const Location &in_loc, const VkSubpassDependency2 &dependency) const { bool skip = false; - VkMemoryBarrier2KHR converted_barrier; - const auto *mem_barrier = vku::FindStructInPNextChain(dependency.pNext); + VkMemoryBarrier2 converted_barrier; + const auto *mem_barrier = vku::FindStructInPNextChain(dependency.pNext); const Location loc = mem_barrier ? in_loc.dot(Field::pNext) : in_loc; if (mem_barrier) { @@ -1589,7 +1589,7 @@ bool CoreChecks::ValidateBarrierLayoutToImageUsage(const Location &layout_loc, V is_error |= ((usage_flags & (VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT)) == 0); is_error |= ((usage_flags & VK_IMAGE_USAGE_ATTACHMENT_FEEDBACK_LOOP_BIT_EXT) == 0); break; - case VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR: + case VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ: is_error = !IsShaderTileImageUsageValid(usage_flags); break; case VK_IMAGE_LAYOUT_VIDEO_DECODE_SRC_KHR: @@ -1741,12 +1741,12 @@ bool CoreChecks::ValidateBarriersToImages(const Location &barrier_loc, const vvl } if (!enabled_features.dynamicRenderingLocalRead) { - if (img_barrier.newLayout == VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR) { + if (img_barrier.newLayout == VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ) { auto vuid = GetImageBarrierVUID(barrier_loc, ImageError::kDynamicRenderingLocalReadNew); skip |= LogError(vuid, img_barrier.image, image_loc, "(%s) cannot have newLayout = %s.", FormatHandle(img_barrier.image).c_str(), string_VkImageLayout(img_barrier.newLayout)); } - if (img_barrier.oldLayout == VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR) { + if (img_barrier.oldLayout == VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ) { auto vuid = GetImageBarrierVUID(barrier_loc, ImageError::kDynamicRenderingLocalReadOld); skip |= LogError(vuid, img_barrier.image, image_loc, "(%s) cannot have oldLayout = %s.", FormatHandle(img_barrier.image).c_str(), string_VkImageLayout(img_barrier.oldLayout)); @@ -1781,7 +1781,7 @@ bool CoreChecks::ValidateBarriersToImages(const Location &barrier_loc, const vvl auto guard = image_view_image_state->layout_range_map->ReadLock(); for (const auto &entry : *image_view_image_state->layout_range_map) { - if (entry.second != VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR && entry.second != VK_IMAGE_LAYOUT_GENERAL) { + if (entry.second != VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ && entry.second != VK_IMAGE_LAYOUT_GENERAL) { const auto &vuid = sync_vuid_maps::GetShaderTileImageVUID( barrier_loc, sync_vuid_maps::ShaderTileImageError::kShaderTileImageLayout); skip |= LogError(vuid, img_barrier.image, barrier_loc, "image layout is %s.", @@ -2043,7 +2043,7 @@ void CoreChecks::RecordBarriers(Func func_name, vvl::CommandBuffer &cb_state, Vk } } -void CoreChecks::RecordBarriers(Func func_name, vvl::CommandBuffer &cb_state, const VkDependencyInfoKHR &dep_info) { +void CoreChecks::RecordBarriers(Func func_name, vvl::CommandBuffer &cb_state, const VkDependencyInfo &dep_info) { for (uint32_t i = 0; i < dep_info.bufferMemoryBarrierCount; i++) { Location barrier_loc(func_name, Struct::VkBufferMemoryBarrier2, Field::pBufferMemoryBarriers, i); const BufferBarrier barrier(dep_info.pBufferMemoryBarriers[i]); @@ -2449,7 +2449,7 @@ bool CoreChecks::ValidateBarriers(const Location &outer_loc, const vvl::CommandB } bool CoreChecks::ValidateDependencyInfo(const LogObjectList &objects, const Location &dep_info_loc, - const vvl::CommandBuffer &cb_state, const VkDependencyInfoKHR &dep_info) const { + const vvl::CommandBuffer &cb_state, const VkDependencyInfo &dep_info) const { bool skip = false; // Tracks duplicate layout transition for image barriers. diff --git a/layers/core_checks/cc_wsi.cpp b/layers/core_checks/cc_wsi.cpp index 03c4b14f6c4..bd3e33303e9 100644 --- a/layers/core_checks/cc_wsi.cpp +++ b/layers/core_checks/cc_wsi.cpp @@ -593,14 +593,14 @@ bool CoreChecks::ValidateCreateSwapchain(const VkSwapchainCreateInfoKHR &create_ string_VkFormat(create_info.imageFormat))) { return true; } - } else if ((image_usage & VK_IMAGE_USAGE_SAMPLED_BIT) && !(tiling_features & VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT_KHR)) { + } else if ((image_usage & VK_IMAGE_USAGE_SAMPLED_BIT) && !(tiling_features & VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT)) { if (LogError("VUID-VkSwapchainCreateInfoKHR-imageFormat-01778", device, create_info_loc.dot(Field::imageFormat), "%s with tiling VK_IMAGE_TILING_OPTIMAL does not support usage that includes " "VK_IMAGE_USAGE_SAMPLED_BIT.", string_VkFormat(create_info.imageFormat))) { return true; } - } else if ((image_usage & VK_IMAGE_USAGE_STORAGE_BIT) && !(tiling_features & VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT_KHR)) { + } else if ((image_usage & VK_IMAGE_USAGE_STORAGE_BIT) && !(tiling_features & VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT)) { if (LogError("VUID-VkSwapchainCreateInfoKHR-imageFormat-01778", device, create_info_loc.dot(Field::imageFormat), "%s with tiling VK_IMAGE_TILING_OPTIMAL does not support usage that includes " "VK_IMAGE_USAGE_STORAGE_BIT.", @@ -608,7 +608,7 @@ bool CoreChecks::ValidateCreateSwapchain(const VkSwapchainCreateInfoKHR &create_ return true; } } else if ((image_usage & VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT) && - !(tiling_features & VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT_KHR)) { + !(tiling_features & VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT)) { if (LogError("VUID-VkSwapchainCreateInfoKHR-imageFormat-01778", device, create_info_loc.dot(Field::imageFormat), "%s with tiling VK_IMAGE_TILING_OPTIMAL does not support usage that includes " "VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT.", @@ -616,7 +616,7 @@ bool CoreChecks::ValidateCreateSwapchain(const VkSwapchainCreateInfoKHR &create_ return true; } } else if ((image_usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) && - !(tiling_features & VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT_KHR)) { + !(tiling_features & VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT)) { if (LogError("VUID-VkSwapchainCreateInfoKHR-imageFormat-01778", device, create_info_loc.dot(Field::imageFormat), "%s with tiling VK_IMAGE_TILING_OPTIMAL does not support usage that includes " "VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT.", @@ -624,8 +624,7 @@ bool CoreChecks::ValidateCreateSwapchain(const VkSwapchainCreateInfoKHR &create_ return true; } } else if ((image_usage & VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT) && - !(tiling_features & - (VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT_KHR | VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT_KHR))) { + !(tiling_features & (VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT | VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT))) { if (LogError("VUID-VkSwapchainCreateInfoKHR-imageFormat-01778", device, create_info_loc.dot(Field::imageFormat), "%s with tiling VK_IMAGE_TILING_OPTIMAL does not support usage that includes " "VK_FORMAT_FEATURE_COLOR_ATTACHMENT_BIT or VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT.", diff --git a/layers/core_checks/cc_ycbcr.cpp b/layers/core_checks/cc_ycbcr.cpp index 7506ab677bf..0b241b07637 100644 --- a/layers/core_checks/cc_ycbcr.cpp +++ b/layers/core_checks/cc_ycbcr.cpp @@ -73,14 +73,14 @@ bool CoreChecks::PreCallValidateCreateSamplerYcbcrConversion(VkDevice device, co // Check all VUID that are based off of VkFormatFeatureFlags // These can't be in StatelessValidation due to needing possible External AHB state for feature support - if (((format_features & VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT_KHR) == 0) && - ((format_features & VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT_KHR) == 0)) { + if (((format_features & VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT) == 0) && + ((format_features & VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT) == 0)) { skip |= LogError("VUID-VkSamplerYcbcrConversionCreateInfo-format-01650", device, create_info_loc.dot(Field::format), "(%s) does not support either VK_FORMAT_FEATURE_MIDPOINT_CHROMA_SAMPLES_BIT or " "VK_FORMAT_FEATURE_COSITED_CHROMA_SAMPLES_BIT", string_VkFormat(conversion_format)); } - if ((format_features & VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT_KHR) == 0) { + if ((format_features & VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT) == 0) { if (vkuFormatIsXChromaSubsampled(conversion_format) && pCreateInfo->xChromaOffset == VK_CHROMA_LOCATION_COSITED_EVEN) { skip |= LogError("VUID-VkSamplerYcbcrConversionCreateInfo-xChromaOffset-01651", device, create_info_loc.dot(Field::format), @@ -96,7 +96,7 @@ bool CoreChecks::PreCallValidateCreateSamplerYcbcrConversion(VkDevice device, co string_VkFormat(conversion_format)); } } - if ((format_features & VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT_KHR) == 0) { + if ((format_features & VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT) == 0) { if (vkuFormatIsXChromaSubsampled(conversion_format) && pCreateInfo->xChromaOffset == VK_CHROMA_LOCATION_MIDPOINT) { skip |= LogError("VUID-VkSamplerYcbcrConversionCreateInfo-xChromaOffset-01652", device, create_info_loc.dot(Field::format), @@ -112,7 +112,7 @@ bool CoreChecks::PreCallValidateCreateSamplerYcbcrConversion(VkDevice device, co string_VkFormat(conversion_format)); } } - if (((format_features & VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT_KHR) == + if (((format_features & VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT) == 0) && (pCreateInfo->forceExplicitReconstruction == VK_TRUE)) { skip |= LogError("VUID-VkSamplerYcbcrConversionCreateInfo-forceExplicitReconstruction-01656", device, @@ -122,7 +122,7 @@ bool CoreChecks::PreCallValidateCreateSamplerYcbcrConversion(VkDevice device, co "forceExplicitReconstruction must be VK_FALSE", string_VkFormat(conversion_format)); } - if (((format_features & VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT_KHR) == 0) && + if (((format_features & VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT) == 0) && (pCreateInfo->chromaFilter == VK_FILTER_LINEAR)) { skip |= LogError("VUID-VkSamplerYcbcrConversionCreateInfo-chromaFilter-01657", device, create_info_loc.dot(Field::format), "(%s) does not support VK_FORMAT_FEATURE_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT so " diff --git a/layers/core_checks/core_validation.h b/layers/core_checks/core_validation.h index f9227953fed..03e0e10dd45 100644 --- a/layers/core_checks/core_validation.h +++ b/layers/core_checks/core_validation.h @@ -208,7 +208,7 @@ class CoreChecks : public ValidationStateTracker { bool ValidateSubpassDependency(const ErrorObject& error_obj, const Location& loc, const VkSubpassDependency2& barrier) const; bool ValidateDependencyInfo(const LogObjectList& objlist, const Location& dep_info_loc, const vvl::CommandBuffer& cb_state, - const VkDependencyInfoKHR& dep_info) const; + const VkDependencyInfo& dep_info) const; bool ValidateHostStage(const LogObjectList& objlist, const Location& barrier_loc, const OwnershipTransferBarrier& barrier) const; @@ -302,7 +302,7 @@ class CoreChecks : public ValidationStateTracker { const VkBufferMemoryBarrier* buffer_mem_barriers, uint32_t image_mem_barrier_count, const VkImageMemoryBarrier* image_barriers) const; bool ValidateRenderPassPipelineBarriers(const Location& loc, const vvl::CommandBuffer& cb_state, - const VkDependencyInfoKHR& dep_info) const; + const VkDependencyInfo& dep_info) const; bool ValidateStageMasksAgainstQueueCapabilities(const LogObjectList& objlist, const Location& stage_mask_loc, VkQueueFlags queue_flags, VkPipelineStageFlags2KHR stage_mask) const; @@ -685,7 +685,7 @@ class CoreChecks : public ValidationStateTracker { const VkAttachmentSampleCountInfoAMD& attachment_sample_count_info, const Location& create_info_loc) const; bool ValidatePipelineRobustnessCreateInfo(const vvl::Pipeline& pipeline, - const VkPipelineRobustnessCreateInfoEXT& pipeline_robustness_info, + const VkPipelineRobustnessCreateInfo& pipeline_robustness_info, const Location& loc) const; uint32_t CalcShaderStageCount(const vvl::Pipeline& pipeline, VkShaderStageFlagBits stageBit) const; bool GroupHasValidIndex(const vvl::Pipeline& pipeline, uint32_t group, uint32_t stage) const; @@ -958,7 +958,7 @@ class CoreChecks : public ValidationStateTracker { VkPipelineStageFlags dst_stage_mask, uint32_t bufferBarrierCount, const VkBufferMemoryBarrier* pBufferMemBarriers, uint32_t imageMemBarrierCount, const VkImageMemoryBarrier* pImageMemBarriers); - void RecordBarriers(Func func_name, vvl::CommandBuffer& cb_state, const VkDependencyInfoKHR& dep_info); + void RecordBarriers(Func func_name, vvl::CommandBuffer& cb_state, const VkDependencyInfo& dep_info); void TransitionFinalSubpassLayouts(vvl::CommandBuffer& cb_state); @@ -1358,13 +1358,13 @@ class CoreChecks : public ValidationStateTracker { const RecordObject& record_obj) override; bool ValidateRenderPassStripeSubmitInfo(VkQueue queue, const vvl::CommandBuffer& cb_state, const void* pNext, const Location& loc) const; - bool ValidateQueueSubmit2(VkQueue queue, uint32_t submitCount, const VkSubmitInfo2KHR* pSubmits, VkFence fence, + bool ValidateQueueSubmit2(VkQueue queue, uint32_t submitCount, const VkSubmitInfo2* pSubmits, VkFence fence, const ErrorObject& error_obj) const; bool PreCallValidateQueueSubmit2KHR(VkQueue queue, uint32_t submitCount, const VkSubmitInfo2KHR* pSubmits, VkFence fence, const ErrorObject& error_obj) const override; bool PreCallValidateQueueSubmit2(VkQueue queue, uint32_t submitCount, const VkSubmitInfo2* pSubmits, VkFence fence, const ErrorObject& error_obj) const override; - void RecordQueueSubmit2(VkQueue queue, uint32_t submitCount, const VkSubmitInfo2KHR* pSubmits, VkFence fence, + void RecordQueueSubmit2(VkQueue queue, uint32_t submitCount, const VkSubmitInfo2* pSubmits, VkFence fence, const RecordObject& record_obj); void PostCallRecordQueueSubmit2KHR(VkQueue queue, uint32_t submitCount, const VkSubmitInfo2KHR* pSubmits, VkFence fence, const RecordObject& record_obj) override; @@ -1638,8 +1638,7 @@ class CoreChecks : public ValidationStateTracker { VkPipelineLayout layout, uint32_t set, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites, const ErrorObject& error_obj) const override; - bool PreCallValidateCmdPushDescriptorSet2(VkCommandBuffer commandBuffer, - const VkPushDescriptorSetInfoKHR* pPushDescriptorSetInfo, + bool PreCallValidateCmdPushDescriptorSet2(VkCommandBuffer commandBuffer, const VkPushDescriptorSetInfo* pPushDescriptorSetInfo, const ErrorObject& error_obj) const override; bool PreCallValidateCmdPushDescriptorSet2KHR(VkCommandBuffer commandBuffer, const VkPushDescriptorSetInfoKHR* pPushDescriptorSetInfo, @@ -1784,7 +1783,7 @@ class CoreChecks : public ValidationStateTracker { VkQueryResultFlags flags, const RecordObject& record_obj) override; bool ValidateCmdPushConstants(VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const Location& loc) const; - bool PreCallValidateCmdPushConstants2(VkCommandBuffer commandBuffer, const VkPushConstantsInfoKHR* pPushConstantsInfo, + bool PreCallValidateCmdPushConstants2(VkCommandBuffer commandBuffer, const VkPushConstantsInfo* pPushConstantsInfo, const ErrorObject& error_obj) const override; bool PreCallValidateCmdPushConstants2KHR(VkCommandBuffer commandBuffer, const VkPushConstantsInfoKHR* pPushConstantsInfo, const ErrorObject& error_obj) const override; @@ -2004,7 +2003,7 @@ class CoreChecks : public ValidationStateTracker { VkDescriptorUpdateTemplate descriptorUpdateTemplate, VkPipelineLayout layout, uint32_t set, const void* pData, const Location& loc) const; bool PreCallValidateCmdPushDescriptorSetWithTemplate2( - VkCommandBuffer commandBuffer, const VkPushDescriptorSetWithTemplateInfoKHR* pPushDescriptorSetWithTemplateInfo, + VkCommandBuffer commandBuffer, const VkPushDescriptorSetWithTemplateInfo* pPushDescriptorSetWithTemplateInfo, const ErrorObject& error_obj) const override; bool PreCallValidateCmdPushDescriptorSetWithTemplate2KHR( VkCommandBuffer commandBuffer, const VkPushDescriptorSetWithTemplateInfoKHR* pPushDescriptorSetWithTemplateInfo, @@ -2623,19 +2622,19 @@ class CoreChecks : public ValidationStateTracker { const VkGeneratedCommandsInfoEXT& generated_commands_info, bool preprocessed, const Location& info_loc) const; - bool ValidateRenderingAttachmentLocationsKHR(const VkRenderingAttachmentLocationInfoKHR& location_info, - const LogObjectList objlist, const Location& loc_info) const; + bool ValidateRenderingAttachmentLocations(const VkRenderingAttachmentLocationInfo& location_info, const LogObjectList objlist, + const Location& loc_info) const; bool PreCallValidateCmdSetRenderingAttachmentLocations(VkCommandBuffer commandBuffer, - const VkRenderingAttachmentLocationInfoKHR* pLocationInfo, + const VkRenderingAttachmentLocationInfo* pLocationInfo, const ErrorObject& error_obj) const override; bool PreCallValidateCmdSetRenderingAttachmentLocationsKHR(VkCommandBuffer commandBuffer, const VkRenderingAttachmentLocationInfoKHR* pLocationInfo, const ErrorObject& error_obj) const override; - bool ValidateRenderingInputAttachmentIndicesKHR(const VkRenderingInputAttachmentIndexInfoKHR& index_info, - const LogObjectList objlist, const Location& loc_info) const; + bool ValidateRenderingInputAttachmentIndices(const VkRenderingInputAttachmentIndexInfo& index_info, const LogObjectList objlist, + const Location& loc_info) const; bool PreCallValidateCmdSetRenderingInputAttachmentIndices(VkCommandBuffer commandBuffer, - const VkRenderingInputAttachmentIndexInfoKHR* pLocationInfo, + const VkRenderingInputAttachmentIndexInfo* pLocationInfo, const ErrorObject& error_obj) const override; bool PreCallValidateCmdSetRenderingInputAttachmentIndicesKHR(VkCommandBuffer commandBuffer, const VkRenderingInputAttachmentIndexInfoKHR* pLocationInfo, diff --git a/layers/drawdispatch/descriptor_validator.cpp b/layers/drawdispatch/descriptor_validator.cpp index 6a75db37780..4dd9157667e 100644 --- a/layers/drawdispatch/descriptor_validator.cpp +++ b/layers/drawdispatch/descriptor_validator.cpp @@ -977,12 +977,12 @@ bool DescriptorValidator::ValidateDescriptor(const spirv::ResourceInterfaceVaria } if ((resource_variable.info.is_write_without_format) && - !(buffer_format_features & VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT_KHR)) { + !(buffer_format_features & VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT)) { auto set = descriptor_set.Handle(); const LogObjectList objlist(set, buffer_view); return dev_state.LogError(vuids.storage_texel_buffer_write_without_format_07029, objlist, loc, "the descriptor %s has %s with format of %s which is missing " - "VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT_KHR.\n" + "VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT.\n" "(supported features: %s).", DescribeDescriptor(resource_variable, index).c_str(), dev_state.FormatHandle(buffer_view).c_str(), string_VkFormat(buffer_view_format), diff --git a/layers/gpu/core/gpuav.h b/layers/gpu/core/gpuav.h index 7dd6bbd3a30..c42e0d3d3b6 100644 --- a/layers/gpu/core/gpuav.h +++ b/layers/gpu/core/gpuav.h @@ -128,7 +128,7 @@ class Validator : public GpuShaderInstrumentor { void PostCallRecordCmdBindPipeline(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipeline pipeline, const RecordObject& record_obj) final; void PostCallRecordCmdBindDescriptorSets2(VkCommandBuffer commandBuffer, - const VkBindDescriptorSetsInfoKHR* pBindDescriptorSetsInfo, + const VkBindDescriptorSetsInfo* pBindDescriptorSetsInfo, const RecordObject& record_obj) final; void PostCallRecordCmdBindDescriptorSets2KHR(VkCommandBuffer commandBuffer, const VkBindDescriptorSetsInfoKHR* pBindDescriptorSetsInfo, @@ -143,7 +143,7 @@ class Validator : public GpuShaderInstrumentor { void PreCallRecordCmdPushDescriptorSetKHR(VkCommandBuffer commandBuffer, VkPipelineBindPoint pipelineBindPoint, VkPipelineLayout layout, uint32_t set, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites, const RecordObject&) final; - void PreCallRecordCmdPushDescriptorSet2(VkCommandBuffer commandBuffer, const VkPushDescriptorSetInfoKHR* pPushDescriptorSetInfo, + void PreCallRecordCmdPushDescriptorSet2(VkCommandBuffer commandBuffer, const VkPushDescriptorSetInfo* pPushDescriptorSetInfo, const RecordObject& record_obj) final; void PreCallRecordCmdPushDescriptorSet2KHR(VkCommandBuffer commandBuffer, const VkPushDescriptorSetInfoKHR* pPushDescriptorSetInfo, diff --git a/layers/gpu/core/gpuav_record.cpp b/layers/gpu/core/gpuav_record.cpp index 5d3d2789758..a13f9318b6d 100644 --- a/layers/gpu/core/gpuav_record.cpp +++ b/layers/gpu/core/gpuav_record.cpp @@ -207,7 +207,7 @@ void Validator::PostCallRecordCmdBindDescriptorSets(VkCommandBuffer commandBuffe } void Validator::PostCallRecordCmdBindDescriptorSets2(VkCommandBuffer commandBuffer, - const VkBindDescriptorSetsInfoKHR *pBindDescriptorSetsInfo, + const VkBindDescriptorSetsInfo *pBindDescriptorSetsInfo, const RecordObject &record_obj) { BaseClass::PostCallRecordCmdBindDescriptorSets2(commandBuffer, pBindDescriptorSetsInfo, record_obj); @@ -257,7 +257,7 @@ void Validator::PreCallRecordCmdPushDescriptorSetKHR(VkCommandBuffer commandBuff } void Validator::PreCallRecordCmdPushDescriptorSet2(VkCommandBuffer commandBuffer, - const VkPushDescriptorSetInfoKHR *pPushDescriptorSetInfo, + const VkPushDescriptorSetInfo *pPushDescriptorSetInfo, const RecordObject &record_obj) { BaseClass::PreCallRecordCmdPushDescriptorSet2(commandBuffer, pPushDescriptorSetInfo, record_obj); auto cb_state = GetWrite(commandBuffer); diff --git a/layers/gpu/descriptor_validation/gpuav_descriptor_set.cpp b/layers/gpu/descriptor_validation/gpuav_descriptor_set.cpp index 93ec343c133..9cf1e9d181c 100644 --- a/layers/gpu/descriptor_validation/gpuav_descriptor_set.cpp +++ b/layers/gpu/descriptor_validation/gpuav_descriptor_set.cpp @@ -53,7 +53,7 @@ void DescriptorSet::BuildBindingLayouts() { binding_layouts_.resize(binding_count); uint32_t start = 0; for (const BindingPtr &binding : bindings_) { - if (binding->type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) { + if (binding->type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { binding_layouts_[binding->binding] = {start, 1}; start++; } else { @@ -341,7 +341,7 @@ DescriptorHeap::DescriptorHeap(Validator &gpuav, uint32_t max_descriptors, const VkBufferCreateInfo buffer_info = vku::InitStruct(); buffer_info.size = BitBufferSize(max_descriptors_ + 1); // add extra entry since 0 is the invalid id. - buffer_info.usage = VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR; + buffer_info.usage = VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT; VmaAllocationCreateInfo alloc_info{}; alloc_info.requiredFlags = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; diff --git a/layers/gpu/instrumentation/gpuav_shader_instrumentor.cpp b/layers/gpu/instrumentation/gpuav_shader_instrumentor.cpp index 8543d6d7916..48cf4727646 100644 --- a/layers/gpu/instrumentation/gpuav_shader_instrumentor.cpp +++ b/layers/gpu/instrumentation/gpuav_shader_instrumentor.cpp @@ -554,10 +554,10 @@ void GpuShaderInstrumentor::PreCallRecordCreateRayTracingPipelinesKHR( template static void UtilCopyCreatePipelineFeedbackData(CreateInfos &create_info, SafeCreateInfos &safe_create_info) { - auto src_feedback_struct = vku::FindStructInPNextChain(safe_create_info.pNext); + auto src_feedback_struct = vku::FindStructInPNextChain(safe_create_info.pNext); if (!src_feedback_struct) return; - auto dst_feedback_struct = const_cast( - vku::FindStructInPNextChain(create_info.pNext)); + auto dst_feedback_struct = const_cast( + vku::FindStructInPNextChain(create_info.pNext)); *dst_feedback_struct->pPipelineCreationFeedback = *src_feedback_struct->pPipelineCreationFeedback; for (uint32_t j = 0; j < src_feedback_struct->pipelineStageCreationFeedbackCount; j++) { dst_feedback_struct->pPipelineStageCreationFeedbacks[j] = src_feedback_struct->pPipelineStageCreationFeedbacks[j]; @@ -850,7 +850,7 @@ void GpuShaderInstrumentor::BuildDescriptorSetLayoutInfo(const vvl::DescriptorSe auto dsl_bindings = set_layout_state.GetBindings(); for (uint32_t binding_index = 0; binding_index < dsl_bindings.size(); binding_index++) { auto &dsl_binding = dsl_bindings[binding_index]; - if (dsl_binding.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) { + if (dsl_binding.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { binding_layouts[dsl_binding.binding] = {start, 1}; start += 1; } else { diff --git a/layers/gpu/resources/gpuav_state_trackers.cpp b/layers/gpu/resources/gpuav_state_trackers.cpp index 599a92a32e0..3f741c45b6a 100644 --- a/layers/gpu/resources/gpuav_state_trackers.cpp +++ b/layers/gpu/resources/gpuav_state_trackers.cpp @@ -571,8 +571,8 @@ void Queue::SubmitBarrier(const Location &loc, uint64_t seq) { return; } - VkSemaphoreTypeCreateInfoKHR semaphore_type_create_info = vku::InitStructHelper(); - semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE_KHR; + VkSemaphoreTypeCreateInfo semaphore_type_create_info = vku::InitStructHelper(); + semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE; semaphore_type_create_info.initialValue = 0; VkSemaphoreCreateInfo semaphore_create_info = vku::InitStructHelper(&semaphore_type_create_info); @@ -604,7 +604,7 @@ void Queue::SubmitBarrier(const Location &loc, uint64_t seq) { } if (barrier_command_buffer_ != VK_NULL_HANDLE) { - VkTimelineSemaphoreSubmitInfoKHR timeline_semaphore_submit_info = vku::InitStructHelper(); + VkTimelineSemaphoreSubmitInfo timeline_semaphore_submit_info = vku::InitStructHelper(); timeline_semaphore_submit_info.signalSemaphoreValueCount = 1; timeline_semaphore_submit_info.pSignalSemaphoreValues = &seq; diff --git a/layers/object_tracker/object_tracker_utils.cpp b/layers/object_tracker/object_tracker_utils.cpp index 817f2de5ffc..647884058ad 100644 --- a/layers/object_tracker/object_tracker_utils.cpp +++ b/layers/object_tracker/object_tracker_utils.cpp @@ -399,7 +399,7 @@ bool ObjectLifetimes::PreCallValidateCmdPushDescriptorSetKHR(VkCommandBuffer com } bool ObjectLifetimes::PreCallValidateCmdPushDescriptorSet2(VkCommandBuffer commandBuffer, - const VkPushDescriptorSetInfoKHR *pPushDescriptorSetInfo, + const VkPushDescriptorSetInfo *pPushDescriptorSetInfo, const ErrorObject &error_obj) const { bool skip = false; // Checked by chassis: commandBuffer: "VUID-vkCmdPushDescriptorSet2-commandBuffer-parameter" @@ -1227,7 +1227,7 @@ bool ObjectLifetimes::PreCallValidateCreateDescriptorUpdateTemplate(VkDevice dev "VUID-VkDescriptorUpdateTemplateCreateInfo-commonparent", create_info_loc.dot(Field::descriptorSetLayout)); } - if (pCreateInfo->templateType == VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR) { + if (pCreateInfo->templateType == VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS) { skip |= ValidateObject(pCreateInfo->pipelineLayout, kVulkanObjectTypePipelineLayout, false, "VUID-VkDescriptorUpdateTemplateCreateInfo-templateType-00352", "VUID-VkDescriptorUpdateTemplateCreateInfo-commonparent", diff --git a/layers/state_tracker/buffer_state.cpp b/layers/state_tracker/buffer_state.cpp index d20a322b08f..82691c32140 100644 --- a/layers/state_tracker/buffer_state.cpp +++ b/layers/state_tracker/buffer_state.cpp @@ -33,7 +33,7 @@ static VkMemoryRequirements GetMemoryRequirements(ValidationStateTracker &dev_da } static VkBufferUsageFlags2KHR GetBufferUsageFlags(const VkBufferCreateInfo &create_info) { - const auto *usage_flags2 = vku::FindStructInPNextChain(create_info.pNext); + const auto *usage_flags2 = vku::FindStructInPNextChain(create_info.pNext); return usage_flags2 ? usage_flags2->usage : create_info.usage; } diff --git a/layers/state_tracker/buffer_state.h b/layers/state_tracker/buffer_state.h index 9bdb0417ac8..f0456c40b94 100644 --- a/layers/state_tracker/buffer_state.h +++ b/layers/state_tracker/buffer_state.h @@ -35,7 +35,7 @@ class Buffer : public Bindable { const VkMemoryRequirements requirements; VkDeviceAddress deviceAddress = 0; - // VkBufferUsageFlags2CreateInfoKHR can be used instead over the VkBufferCreateInfo::usage + // VkBufferUsageFlags2CreateInfo can be used instead over the VkBufferCreateInfo::usage const VkBufferUsageFlags2KHR usage; unordered_set> supported_video_profiles; diff --git a/layers/state_tracker/cmd_buffer_state.cpp b/layers/state_tracker/cmd_buffer_state.cpp index 95ea057e1ac..406c1213fee 100644 --- a/layers/state_tracker/cmd_buffer_state.cpp +++ b/layers/state_tracker/cmd_buffer_state.cpp @@ -704,7 +704,7 @@ void CommandBuffer::BeginRendering(Func command, const VkRenderingInfo *pRenderi striped_count += rp_striped_begin->stripeInfoCount; } - activeSubpassContents = ((pRenderingInfo->flags & VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR) + activeSubpassContents = ((pRenderingInfo->flags & VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT) ? VK_SUBPASS_CONTENTS_SECONDARY_COMMAND_BUFFERS : VK_SUBPASS_CONTENTS_INLINE); @@ -1578,7 +1578,7 @@ void CommandBuffer::RecordBarriers(uint32_t memoryBarrierCount, const VkMemoryBa } } -void CommandBuffer::RecordBarriers(const VkDependencyInfoKHR &dep_info) { +void CommandBuffer::RecordBarriers(const VkDependencyInfo &dep_info) { if (dev_data.disabled[command_buffer_state]) return; for (uint32_t i = 0; i < dep_info.bufferMemoryBarrierCount; i++) { diff --git a/layers/state_tracker/cmd_buffer_state.h b/layers/state_tracker/cmd_buffer_state.h index a8d2a2f4aaa..72fe508ee2e 100644 --- a/layers/state_tracker/cmd_buffer_state.h +++ b/layers/state_tracker/cmd_buffer_state.h @@ -251,7 +251,7 @@ class CommandBuffer : public RefcountedStateObject { // VK_DYNAMIC_STATE_SAMPLE_MASK_EXT VkSampleCountFlagBits samples_mask_samples; // VK_DYNAMIC_STATE_LINE_RASTERIZATION_MODE_KHR - VkLineRasterizationModeKHR line_rasterization_mode; + VkLineRasterizationMode line_rasterization_mode; // VK_DYNAMIC_STATE_LINE_STIPPLE_ENABLE_EXT bool stippled_line_enable; // VK_DYNAMIC_STATE_COVERAGE_TO_COLOR_ENABLE_NV @@ -458,10 +458,10 @@ class CommandBuffer : public RefcountedStateObject { // VK_KHR_dynamic_rendering_local_read works like dynamic state, but lives for the rendering lifetime only struct RenderingAttachment { - // VkRenderingAttachmentLocationInfoKHR + // VkRenderingAttachmentLocationInfo bool set_color_locations = false; std::vector color_locations; - // VkRenderingInputAttachmentIndexInfoKHR + // VkRenderingInputAttachmentIndexInfo bool set_color_indexes = false; std::vector color_indexes; const uint32_t *depth_index = nullptr; @@ -665,7 +665,7 @@ class CommandBuffer : public RefcountedStateObject { void RecordBarriers(uint32_t memoryBarrierCount, const VkMemoryBarrier *pMemoryBarriers, uint32_t bufferMemoryBarrierCount, const VkBufferMemoryBarrier *pBufferMemoryBarriers, uint32_t imageMemoryBarrierCount, const VkImageMemoryBarrier *pImageMemoryBarriers); - void RecordBarriers(const VkDependencyInfoKHR &dep_info); + void RecordBarriers(const VkDependencyInfo &dep_info); void SetImageViewLayout(const vvl::ImageView &view_state, VkImageLayout layout, VkImageLayout layoutStencil); void SetImageViewInitialLayout(const vvl::ImageView &view_state, VkImageLayout layout); diff --git a/layers/state_tracker/descriptor_sets.cpp b/layers/state_tracker/descriptor_sets.cpp index c835e3717cf..b9dd0c21e23 100644 --- a/layers/state_tracker/descriptor_sets.cpp +++ b/layers/state_tracker/descriptor_sets.cpp @@ -340,7 +340,7 @@ vvl::DescriptorSetLayoutDef::DescriptorSetLayoutDef(const VkDescriptorSetLayoutC } non_inline_descriptor_count_ += - (binding_info.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT) ? 1 : binding_info.descriptorCount; + (binding_info.descriptorType == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) ? 1 : binding_info.descriptorCount; if (IsDynamicDescriptor(binding_info.descriptorType)) { dynamic_descriptor_count_ += binding_info.descriptorCount; diff --git a/layers/state_tracker/descriptor_sets.h b/layers/state_tracker/descriptor_sets.h index 73bda7d5e80..68de04d2246 100644 --- a/layers/state_tracker/descriptor_sets.h +++ b/layers/state_tracker/descriptor_sets.h @@ -213,7 +213,7 @@ class DescriptorSetLayoutDef { // Helper function to get the next valid binding for a descriptor uint32_t GetNextValidBinding(const uint32_t) const; - bool IsPushDescriptor() const { return GetCreateFlags() & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR; }; + bool IsPushDescriptor() const { return GetCreateFlags() & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT; }; struct BindingTypeStats { uint32_t dynamic_buffer_count; @@ -766,7 +766,7 @@ using MutableBinding = DescriptorBindingImpl; // Helper class to encapsulate the descriptor update template decoding logic struct DecodedTemplateUpdate { std::vector desc_writes; - std::vector inline_infos; + std::vector inline_infos; std::vector inline_infos_khr; std::vector inline_infos_nv; DecodedTemplateUpdate(const ValidationStateTracker &device_data, VkDescriptorSet descriptorSet, diff --git a/layers/state_tracker/pipeline_state.cpp b/layers/state_tracker/pipeline_state.cpp index 83d4d8ecfe8..c71140e8fe7 100644 --- a/layers/state_tracker/pipeline_state.cpp +++ b/layers/state_tracker/pipeline_state.cpp @@ -253,7 +253,7 @@ static CBDynamicFlags GetGraphicsDynamicState(Pipeline &pipe_state) { case VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE: case VK_DYNAMIC_STATE_DEPTH_CLAMP_ENABLE_EXT: case VK_DYNAMIC_STATE_POLYGON_MODE_EXT: - case VK_DYNAMIC_STATE_LINE_STIPPLE_KHR: + case VK_DYNAMIC_STATE_LINE_STIPPLE: case VK_DYNAMIC_STATE_LINE_RASTERIZATION_MODE_EXT: case VK_DYNAMIC_STATE_LINE_STIPPLE_ENABLE_EXT: case VK_DYNAMIC_STATE_RASTERIZATION_STREAM_EXT: @@ -391,24 +391,24 @@ static CBDynamicFlags GetRayTracingDynamicState(Pipeline &pipe_state) { static bool UsesPipelineRobustness(const void *pNext, const Pipeline &pipe_state) { bool result = false; - const auto robustness_info = vku::FindStructInPNextChain(pNext); + const auto robustness_info = vku::FindStructInPNextChain(pNext); if (!robustness_info) { return false; } - result |= (robustness_info->storageBuffers == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT) || - (robustness_info->storageBuffers == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_EXT); - result |= (robustness_info->uniformBuffers == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT) || - (robustness_info->uniformBuffers == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_EXT); + result |= (robustness_info->storageBuffers == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2) || + (robustness_info->storageBuffers == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS); + result |= (robustness_info->uniformBuffers == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2) || + (robustness_info->uniformBuffers == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS); if (!result) { for (const auto &stage_ci : pipe_state.shader_stages_ci) { - const auto stage_robustness_info = vku::FindStructInPNextChain(stage_ci.pNext); + const auto stage_robustness_info = vku::FindStructInPNextChain(stage_ci.pNext); if (stage_robustness_info) { result |= - (stage_robustness_info->storageBuffers == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT) || - (stage_robustness_info->storageBuffers == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_EXT); + (stage_robustness_info->storageBuffers == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2) || + (stage_robustness_info->storageBuffers == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS); result |= - (stage_robustness_info->uniformBuffers == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT) || - (stage_robustness_info->uniformBuffers == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_EXT); + (stage_robustness_info->uniformBuffers == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2) || + (stage_robustness_info->uniformBuffers == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS); } } } @@ -417,19 +417,18 @@ static bool UsesPipelineRobustness(const void *pNext, const Pipeline &pipe_state static bool UsesPipelineVertexRobustness(const void *pNext, const Pipeline &pipe_state) { bool result = false; - const auto robustness_info = vku::FindStructInPNextChain(pNext); + const auto robustness_info = vku::FindStructInPNextChain(pNext); if (!robustness_info) { return false; } - result |= (robustness_info->vertexInputs == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT) || - (robustness_info->vertexInputs == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_EXT); + result |= (robustness_info->vertexInputs == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2) || + (robustness_info->vertexInputs == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS); if (!result) { for (const auto &stage_ci : pipe_state.shader_stages_ci) { - const auto stage_robustness_info = vku::FindStructInPNextChain(stage_ci.pNext); + const auto stage_robustness_info = vku::FindStructInPNextChain(stage_ci.pNext); if (stage_robustness_info) { - result |= - (stage_robustness_info->vertexInputs == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT) || - (stage_robustness_info->vertexInputs == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_EXT); + result |= (stage_robustness_info->vertexInputs == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2) || + (stage_robustness_info->vertexInputs == VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS); } } } @@ -510,7 +509,7 @@ static VkPrimitiveTopology GetTopologyAtRasterizer(const Pipeline &pipeline) { } static VkPipelineCreateFlags2KHR GetPipelineCreateFlags(const void *pNext, VkPipelineCreateFlags flags) { - const auto flags2 = vku::FindStructInPNextChain(pNext); + const auto flags2 = vku::FindStructInPNextChain(pNext); if (flags2) { return flags2->flags; } @@ -1130,7 +1129,7 @@ bool LastBound::IsStippledLineEnable() const { return cb_state.dynamic_state_value.stippled_line_enable; } } else { - if (const auto line_state_ci = vku::FindStructInPNextChain( + if (const auto line_state_ci = vku::FindStructInPNextChain( pipeline_state->RasterizationStatePNext())) { return line_state_ci->stippledLineEnable; } diff --git a/layers/state_tracker/pipeline_state.h b/layers/state_tracker/pipeline_state.h index 2e9da6111c4..b5aa819da83 100644 --- a/layers/state_tracker/pipeline_state.h +++ b/layers/state_tracker/pipeline_state.h @@ -578,7 +578,7 @@ class Pipeline : public StateObject { static bool EnablesRasterizationStates(const CreateInfo &create_info) { if (create_info.pDynamicState && create_info.pDynamicState->pDynamicStates) { for (uint32_t i = 0; i < create_info.pDynamicState->dynamicStateCount; ++i) { - if (create_info.pDynamicState->pDynamicStates[i] == VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE_EXT) { + if (create_info.pDynamicState->pDynamicStates[i] == VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE) { // If RASTERIZER_DISCARD_ENABLE is dynamic, then we must return true (i.e., rasterization is enabled) // NOTE: create_info must contain pre-raster state, otherwise it is an invalid pipeline and will trigger // an error outside of this function. diff --git a/layers/state_tracker/pipeline_sub_state.cpp b/layers/state_tracker/pipeline_sub_state.cpp index f07acb61461..a0909bb6b1e 100644 --- a/layers/state_tracker/pipeline_sub_state.cpp +++ b/layers/state_tracker/pipeline_sub_state.cpp @@ -40,8 +40,7 @@ VertexInputState::VertexInputState(const vvl::Pipeline &p, const vku::safe_VkGra vvl::enumerate(input_state->pVertexBindingDescriptions, input_state->vertexBindingDescriptionCount)) { bindings.emplace(bd->binding, VertexBindingState(i, bd)); } - const auto *divisor_info = - vku::FindStructInPNextChain(input_state->pNext); + const auto *divisor_info = vku::FindStructInPNextChain(input_state->pNext); if (divisor_info) { for (const auto [i, di] : vvl::enumerate(divisor_info->pVertexBindingDivisors, divisor_info->vertexBindingDivisorCount)) { diff --git a/layers/state_tracker/state_tracker.cpp b/layers/state_tracker/state_tracker.cpp index ee49ad802cd..c8a873995bf 100644 --- a/layers/state_tracker/state_tracker.cpp +++ b/layers/state_tracker/state_tracker.cpp @@ -1922,10 +1922,10 @@ void ValidationStateTracker::PostCallRecordCreateQueryPool(VkDevice device, cons for (uint32_t i = 0; i < perf->counterIndexCount; i++) { const auto &counter = counters.counters[perf->pCounterIndices[i]]; switch (counter.scope) { - case VK_QUERY_SCOPE_COMMAND_BUFFER_KHR: + case VK_PERFORMANCE_COUNTER_SCOPE_COMMAND_BUFFER_KHR: has_cb = true; break; - case VK_QUERY_SCOPE_RENDER_PASS_KHR: + case VK_PERFORMANCE_COUNTER_SCOPE_RENDER_PASS_KHR: has_rb = true; break; default: @@ -2875,7 +2875,7 @@ void ValidationStateTracker::PreCallRecordCmdBindDescriptorSets(VkCommandBuffer } void ValidationStateTracker::PreCallRecordCmdBindDescriptorSets2(VkCommandBuffer commandBuffer, - const VkBindDescriptorSetsInfoKHR *pBindDescriptorSetsInfo, + const VkBindDescriptorSetsInfo *pBindDescriptorSetsInfo, const RecordObject &record_obj) { auto cb_state = GetWrite(commandBuffer); auto pipeline_layout = Get(pBindDescriptorSetsInfo->layout); @@ -2933,7 +2933,7 @@ void ValidationStateTracker::PreCallRecordCmdPushDescriptorSetKHR(VkCommandBuffe } void ValidationStateTracker::PreCallRecordCmdPushDescriptorSet2(VkCommandBuffer commandBuffer, - const VkPushDescriptorSetInfoKHR *pPushDescriptorSetInfo, + const VkPushDescriptorSetInfo *pPushDescriptorSetInfo, const RecordObject &record_obj) { auto cb_state = GetWrite(commandBuffer); auto pipeline_layout = Get(pPushDescriptorSetInfo->layout); @@ -3048,7 +3048,7 @@ void ValidationStateTracker::PostCallRecordCmdPushConstants(VkCommandBuffer comm } void ValidationStateTracker::PostCallRecordCmdPushConstants2(VkCommandBuffer commandBuffer, - const VkPushConstantsInfoKHR *pPushConstantsInfo, + const VkPushConstantsInfo *pPushConstantsInfo, const RecordObject &record_obj) { PostCallRecordCmdPushConstants(commandBuffer, pPushConstantsInfo->layout, pPushConstantsInfo->stageFlags, pPushConstantsInfo->offset, pPushConstantsInfo->size, pPushConstantsInfo->pValues, record_obj); @@ -3625,7 +3625,7 @@ void ValidationStateTracker::PreCallRecordUnmapMemory(VkDevice device, VkDeviceM } } -void ValidationStateTracker::PreCallRecordUnmapMemory2(VkDevice device, const VkMemoryUnmapInfoKHR *pMemoryUnmapInfo, +void ValidationStateTracker::PreCallRecordUnmapMemory2(VkDevice device, const VkMemoryUnmapInfo *pMemoryUnmapInfo, const RecordObject &record_obj) { if (auto mem_info = Get(pMemoryUnmapInfo->memory)) { mem_info->mapped_range = vvl::MemRange(); @@ -4516,7 +4516,7 @@ void ValidationStateTracker::PreCallRecordCmdPushDescriptorSetWithTemplateKHR(Vk } void ValidationStateTracker::PreCallRecordCmdPushDescriptorSetWithTemplate2( - VkCommandBuffer commandBuffer, const VkPushDescriptorSetWithTemplateInfoKHR *pPushDescriptorSetWithTemplateInfo, + VkCommandBuffer commandBuffer, const VkPushDescriptorSetWithTemplateInfo *pPushDescriptorSetWithTemplateInfo, const RecordObject &record_obj) { auto cb_state = GetWrite(commandBuffer); auto template_state = Get(pPushDescriptorSetWithTemplateInfo->descriptorUpdateTemplate); @@ -5389,7 +5389,7 @@ void ValidationStateTracker::PostCallRecordCmdSetFragmentShadingRateKHR(VkComman } void ValidationStateTracker::PostCallRecordCmdSetRenderingAttachmentLocations( - VkCommandBuffer commandBuffer, const VkRenderingAttachmentLocationInfoKHR *pLocationInfo, const RecordObject &record_obj) { + VkCommandBuffer commandBuffer, const VkRenderingAttachmentLocationInfo *pLocationInfo, const RecordObject &record_obj) { auto cb_state = GetWrite(commandBuffer); cb_state->rendering_attachments.set_color_locations = true; @@ -5405,7 +5405,7 @@ void ValidationStateTracker::PostCallRecordCmdSetRenderingAttachmentLocationsKHR } void ValidationStateTracker::PostCallRecordCmdSetRenderingInputAttachmentIndices( - VkCommandBuffer commandBuffer, const VkRenderingInputAttachmentIndexInfoKHR *pLocationInfo, const RecordObject &record_obj) { + VkCommandBuffer commandBuffer, const VkRenderingInputAttachmentIndexInfo *pLocationInfo, const RecordObject &record_obj) { auto cb_state = GetWrite(commandBuffer); cb_state->rendering_attachments.set_color_indexes = true; diff --git a/layers/state_tracker/state_tracker.h b/layers/state_tracker/state_tracker.h index 18bd83e695b..33c1c5aaedd 100644 --- a/layers/state_tracker/state_tracker.h +++ b/layers/state_tracker/state_tracker.h @@ -1020,8 +1020,7 @@ class ValidationStateTracker : public ValidationObject { const VkConditionalRenderingBeginInfoEXT* pConditionalRenderingBegin, const RecordObject& record_obj) override; void PostCallRecordCmdEndConditionalRenderingEXT(VkCommandBuffer commandBuffer, const RecordObject& record_obj) override; - void PreCallRecordCmdBindDescriptorSets2(VkCommandBuffer commandBuffer, - const VkBindDescriptorSetsInfoKHR* pBindDescriptorSetsInfo, + void PreCallRecordCmdBindDescriptorSets2(VkCommandBuffer commandBuffer, const VkBindDescriptorSetsInfo* pBindDescriptorSetsInfo, const RecordObject& record_obj) override; void PreCallRecordCmdBindDescriptorSets2KHR(VkCommandBuffer commandBuffer, const VkBindDescriptorSetsInfoKHR* pBindDescriptorSetsInfo, @@ -1212,7 +1211,7 @@ class ValidationStateTracker : public ValidationObject { VkPipelineLayout layout, uint32_t set, uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites, const RecordObject& record_obj) override; - void PreCallRecordCmdPushDescriptorSet2(VkCommandBuffer commandBuffer, const VkPushDescriptorSetInfoKHR* pPushDescriptorSetInfo, + void PreCallRecordCmdPushDescriptorSet2(VkCommandBuffer commandBuffer, const VkPushDescriptorSetInfo* pPushDescriptorSetInfo, const RecordObject& record_obj) override; void PreCallRecordCmdPushDescriptorSet2KHR(VkCommandBuffer commandBuffer, const VkPushDescriptorSetInfoKHR* pPushDescriptorSetInfo, @@ -1233,7 +1232,7 @@ class ValidationStateTracker : public ValidationObject { void PostCallRecordCmdPushConstants(VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void* pValues, const RecordObject& record_obj) override; - void PostCallRecordCmdPushConstants2(VkCommandBuffer commandBuffer, const VkPushConstantsInfoKHR* pPushConstantsInfo, + void PostCallRecordCmdPushConstants2(VkCommandBuffer commandBuffer, const VkPushConstantsInfo* pPushConstantsInfo, const RecordObject& record_obj) override; void PostCallRecordCmdPushConstants2KHR(VkCommandBuffer commandBuffer, const VkPushConstantsInfoKHR* pPushConstantsInfo, const RecordObject& record_obj) override; @@ -1593,13 +1592,13 @@ class ValidationStateTracker : public ValidationObject { const VkFragmentShadingRateCombinerOpKHR combinerOps[2], const RecordObject& record_obj) override; void PostCallRecordCmdSetRenderingAttachmentLocations(VkCommandBuffer commandBuffer, - const VkRenderingAttachmentLocationInfoKHR* pLocationInfo, + const VkRenderingAttachmentLocationInfo* pLocationInfo, const RecordObject& record_obj) override; void PostCallRecordCmdSetRenderingAttachmentLocationsKHR(VkCommandBuffer commandBuffer, const VkRenderingAttachmentLocationInfoKHR* pLocationInfo, const RecordObject& record_obj) override; void PostCallRecordCmdSetRenderingInputAttachmentIndices(VkCommandBuffer commandBuffer, - const VkRenderingInputAttachmentIndexInfoKHR* pLocationInfo, + const VkRenderingInputAttachmentIndexInfo* pLocationInfo, const RecordObject& record_obj) override; void PostCallRecordCmdSetRenderingInputAttachmentIndicesKHR(VkCommandBuffer commandBuffer, const VkRenderingInputAttachmentIndexInfoKHR* pLocationInfo, diff --git a/layers/stateless/sl_buffer.cpp b/layers/stateless/sl_buffer.cpp index 37c43fdc235..b1864a6b99b 100644 --- a/layers/stateless/sl_buffer.cpp +++ b/layers/stateless/sl_buffer.cpp @@ -70,7 +70,7 @@ bool StatelessValidation::manual_PreCallValidateCreateBuffer(VkDevice device, co string_VkBufferCreateFlags(pCreateInfo->flags).c_str()); } - if (!vku::FindStructInPNextChain(pCreateInfo->pNext)) { + if (!vku::FindStructInPNextChain(pCreateInfo->pNext)) { skip |= ValidateFlags(create_info_loc.dot(Field::usage), vvl::FlagBitmask::VkBufferUsageFlagBits, AllVkBufferUsageFlagBits, pCreateInfo->usage, kRequiredFlags, VK_NULL_HANDLE, "VUID-VkBufferCreateInfo-None-09499", "VUID-VkBufferCreateInfo-None-09500"); diff --git a/layers/stateless/sl_cmd_buffer.cpp b/layers/stateless/sl_cmd_buffer.cpp index b0063c3b4e0..2281e6d8a18 100644 --- a/layers/stateless/sl_cmd_buffer.cpp +++ b/layers/stateless/sl_cmd_buffer.cpp @@ -43,10 +43,10 @@ bool StatelessValidation::ValidateCmdBindIndexBuffer(VkCommandBuffer commandBuff skip |= LogError(vuid, commandBuffer, loc.dot(Field::indexType), "is VK_INDEX_TYPE_NONE_KHR."); } - if (indexType == VK_INDEX_TYPE_UINT8_KHR && !enabled_features.indexTypeUint8) { + if (indexType == VK_INDEX_TYPE_UINT8 && !enabled_features.indexTypeUint8) { vuid = is_2 ? "VUID-vkCmdBindIndexBuffer2-indexType-08787" : "VUID-vkCmdBindIndexBuffer-indexType-08787"; skip |= LogError(vuid, commandBuffer, loc.dot(Field::indexType), - "is VK_INDEX_TYPE_UINT8_KHR but indexTypeUint8 feature was not enabled."); + "is VK_INDEX_TYPE_UINT8 but indexTypeUint8 feature was not enabled."); } return skip; @@ -332,7 +332,7 @@ bool StatelessValidation::manual_PreCallValidateCmdPushConstants(VkCommandBuffer } bool StatelessValidation::manual_PreCallValidateCmdPushConstants2(VkCommandBuffer commandBuffer, - const VkPushConstantsInfoKHR *pPushConstantsInfo, + const VkPushConstantsInfo *pPushConstantsInfo, const ErrorObject &error_obj) const { bool skip = false; skip |= ValidateCmdPushConstants(commandBuffer, pPushConstantsInfo->offset, pPushConstantsInfo->size, @@ -502,7 +502,7 @@ bool StatelessValidation::manual_PreCallValidateCmdBindDescriptorBuffersEXT(VkCo } for (uint32_t i = 0; i < bufferCount; i++) { - if (!vku::FindStructInPNextChain(pBindingInfos[i].pNext)) { + if (!vku::FindStructInPNextChain(pBindingInfos[i].pNext)) { skip |= ValidateFlags(error_obj.location.dot(Field::pBindingInfos, i).dot(Field::usage), vvl::FlagBitmask::VkBufferUsageFlagBits, AllVkBufferUsageFlagBits, pBindingInfos[i].usage, kRequiredFlags, VK_NULL_HANDLE, "VUID-VkDescriptorBufferBindingInfoEXT-None-09499", @@ -518,7 +518,7 @@ bool StatelessValidation::manual_PreCallValidateGetPhysicalDeviceExternalBufferP VkExternalBufferProperties *pExternalBufferProperties, const ErrorObject &error_obj) const { bool skip = false; - if (!vku::FindStructInPNextChain(pExternalBufferInfo->pNext)) { + if (!vku::FindStructInPNextChain(pExternalBufferInfo->pNext)) { skip |= ValidateFlags(error_obj.location.dot(Field::pExternalBufferInfo).dot(Field::usage), vvl::FlagBitmask::VkBufferUsageFlagBits, AllVkBufferUsageFlagBits, pExternalBufferInfo->usage, kRequiredFlags, VK_NULL_HANDLE, "VUID-VkPhysicalDeviceExternalBufferInfo-None-09499", @@ -537,7 +537,7 @@ bool StatelessValidation::manual_PreCallValidateCmdPushDescriptorSet(VkCommandBu } bool StatelessValidation::manual_PreCallValidateCmdPushDescriptorSet2(VkCommandBuffer commandBuffer, - const VkPushDescriptorSetInfoKHR *pPushDescriptorSetInfo, + const VkPushDescriptorSetInfo *pPushDescriptorSetInfo, const ErrorObject &error_obj) const { bool skip = false; skip |= ValidateWriteDescriptorSet(error_obj.location, pPushDescriptorSetInfo->descriptorWriteCount, diff --git a/layers/stateless/sl_descriptor.cpp b/layers/stateless/sl_descriptor.cpp index 0e6ef506743..5e164a329ee 100644 --- a/layers/stateless/sl_descriptor.cpp +++ b/layers/stateless/sl_descriptor.cpp @@ -548,9 +548,9 @@ bool StatelessValidation::ValidateMutableDescriptorTypeCreateInfo(const VkDescri skip |= LogError("VUID-VkMutableDescriptorTypeListEXT-pDescriptorTypes-04602", device, type_loc, "is VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC."); break; - case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT: + case VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK: skip |= LogError("VUID-VkMutableDescriptorTypeListEXT-pDescriptorTypes-04603", device, type_loc, - "is VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT."); + "is VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK."); break; default: break; @@ -575,7 +575,7 @@ bool StatelessValidation::ValidateDescriptorSetLayoutCreateInfo(const VkDescript bool skip = false; const bool has_descriptor_buffer_flag = (create_info.flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_DESCRIPTOR_BUFFER_BIT_EXT) != 0; - const bool has_push_descriptor_flag = (create_info.flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR) != 0; + const bool has_push_descriptor_flag = (create_info.flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT) != 0; // Validation for parameters excluded from the generated validation code due to a 'noautovalidity' tag in vk.xml if (create_info.pBindings != nullptr) { const auto *mutable_descriptor_type = vku::FindStructInPNextChain(create_info.pNext); @@ -633,7 +633,7 @@ bool StatelessValidation::ValidateDescriptorSetLayoutCreateInfo(const VkDescript if (has_push_descriptor_flag && binding->descriptorType == VK_DESCRIPTOR_TYPE_MUTABLE_EXT) { skip |= LogError("VUID-VkDescriptorSetLayoutCreateInfo-flags-04591", device, binding_loc.dot(Field::descriptorType), "is VK_DESCRIPTOR_TYPE_MUTABLE_EXT, but flags includes " - "VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR."); + "VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT."); } if (has_descriptor_buffer_flag && ((binding->descriptorType == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC) || @@ -926,7 +926,7 @@ static bool MutableDescriptorTypePartialOverlap(const VkDescriptorPoolCreateInfo VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC, VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT, - VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT, + VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR, VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV, }; @@ -1003,10 +1003,9 @@ bool StatelessValidation::manual_PreCallValidateCreateDescriptorPool(VkDevice de } if (pCreateInfo->pPoolSizes[i].type == VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK) { if (SafeModulo(pCreateInfo->pPoolSizes[i].descriptorCount, 4) != 0) { - skip |= - LogError("VUID-VkDescriptorPoolSize-type-02218", device, pool_loc.dot(Field::descriptorCount), - "is %" PRIu32 " (not a multiple of 4), but type is VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT.", - pCreateInfo->pPoolSizes[i].descriptorCount); + skip |= LogError("VUID-VkDescriptorPoolSize-type-02218", device, pool_loc.dot(Field::descriptorCount), + "is %" PRIu32 " (not a multiple of 4), but type is VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK.", + pCreateInfo->pPoolSizes[i].descriptorCount); } if (!non_zero_inline_uniform_count) { skip |= @@ -1352,7 +1351,7 @@ bool StatelessValidation::manual_PreCallValidateCmdBindDescriptorBufferEmbeddedS } bool StatelessValidation::manual_PreCallValidateCmdPushDescriptorSetWithTemplate2( - VkCommandBuffer commandBuffer, const VkPushDescriptorSetWithTemplateInfoKHR *pPushDescriptorSetWithTemplateInfo, + VkCommandBuffer commandBuffer, const VkPushDescriptorSetWithTemplateInfo *pPushDescriptorSetWithTemplateInfo, const ErrorObject &error_obj) const { bool skip = false; diff --git a/layers/stateless/sl_device_memory.cpp b/layers/stateless/sl_device_memory.cpp index d96917174c4..7c9f5b65592 100644 --- a/layers/stateless/sl_device_memory.cpp +++ b/layers/stateless/sl_device_memory.cpp @@ -70,9 +70,9 @@ bool StatelessValidation::ValidateDeviceImageMemoryRequirements(VkDevice device, } if (vkuFormatIsMultiplane(create_info.format) && (create_info.flags & VK_IMAGE_CREATE_DISJOINT_BIT) != 0) { - if (memory_requirements.planeAspect == VK_IMAGE_ASPECT_NONE_KHR) { + if (memory_requirements.planeAspect == VK_IMAGE_ASPECT_NONE) { skip |= LogError("VUID-VkDeviceImageMemoryRequirements-pCreateInfo-06417", device, loc.dot(Field::planeAspect), - "is VK_IMAGE_ASPECT_NONE_KHR with a multi-planar format and disjoint flag."); + "is VK_IMAGE_ASPECT_NONE with a multi-planar format and disjoint flag."); } else if ((create_info.tiling == VK_IMAGE_TILING_LINEAR || create_info.tiling == VK_IMAGE_TILING_OPTIMAL) && !IsOnlyOneValidPlaneAspect(create_info.format, memory_requirements.planeAspect)) { skip |= LogError("VUID-VkDeviceImageMemoryRequirements-pCreateInfo-06419", device, loc.dot(Field::planeAspect), diff --git a/layers/stateless/sl_image.cpp b/layers/stateless/sl_image.cpp index 005fd3f11a9..8ad9eabc24c 100644 --- a/layers/stateless/sl_image.cpp +++ b/layers/stateless/sl_image.cpp @@ -179,9 +179,9 @@ bool StatelessValidation::manual_PreCallValidateCreateImage(VkDevice device, con string_VkSampleCountFlagBits(pCreateInfo->samples)); } - if (!enabled_features.hostImageCopy && (pCreateInfo->usage & VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT) != 0) { + if (!enabled_features.hostImageCopy && (pCreateInfo->usage & VK_IMAGE_USAGE_HOST_TRANSFER_BIT) != 0) { skip |= LogError("VUID-VkImageCreateInfo-usage-10245", device, create_info_loc.dot(Field::usage), - "includes VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT, but hostImageCopy feature was not enabled."); + "includes VK_IMAGE_USAGE_HOST_TRANSFER_BIT, but hostImageCopy feature was not enabled."); } static const uint64_t drm_format_mod_linear = 0; diff --git a/layers/stateless/sl_pipeline.cpp b/layers/stateless/sl_pipeline.cpp index 5537ecaab32..8dddaa22988 100644 --- a/layers/stateless/sl_pipeline.cpp +++ b/layers/stateless/sl_pipeline.cpp @@ -138,9 +138,9 @@ bool StatelessValidation::ValidatePipelineShaderStageCreateInfoCommon(const VkPi } if (vku::FindStructInPNextChain(create_info.pNext)) { - if ((create_info.flags & VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT_EXT) != 0) { + if ((create_info.flags & VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT) != 0) { skip |= LogError("VUID-VkPipelineShaderStageCreateInfo-pNext-02754", device, loc.dot(Field::flags), - "(%s) includes VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT_EXT while " + "(%s) includes VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT while " "VkPipelineShaderStageRequiredSubgroupSizeCreateInfo is included in the pNext chain.", string_VkPipelineShaderStageCreateFlags(create_info.flags).c_str()); } @@ -152,7 +152,7 @@ bool StatelessValidation::ValidatePipelineShaderStageCreateInfoCommon(const VkPi bool StatelessValidation::ValidatePipelineBinaryInfo(const void *next, VkPipelineCreateFlags flags, VkPipelineCache pipelineCache, const Location &loc) const { bool skip = false; - const auto *temp_flags_2 = vku::FindStructInPNextChain(next); + const auto *temp_flags_2 = vku::FindStructInPNextChain(next); const VkPipelineCreateFlags2KHR create_flags_2 = temp_flags_2 ? temp_flags_2->flags : static_cast(flags); const Location flag_loc = @@ -198,9 +198,9 @@ bool StatelessValidation::ValidatePipelineBinaryInfo(const void *next, VkPipelin } } - if (create_flags_2 & VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT) { + if (create_flags_2 & VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT) { skip |= LogError(GetPipelineBinaryInfoVUID(flag_loc, vvl::PipelineBinaryInfoError::BinaryCount_09622), device, flag_loc, - "(%s) includes VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT while " + "(%s) includes VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT while " "binaryCount is greater than zero.", string_VkPipelineCreateFlags2(flags).c_str()); } @@ -372,7 +372,7 @@ bool StatelessValidation::manual_PreCallValidateCreateGraphicsPipelines( // Create a copy of create_info and set non-included sub-state to null VkGraphicsPipelineCreateInfo create_info = pCreateInfos[i]; - const auto *create_flags_2 = vku::FindStructInPNextChain(create_info.pNext); + const auto *create_flags_2 = vku::FindStructInPNextChain(create_info.pNext); const VkPipelineCreateFlags2KHR flags = create_flags_2 ? create_flags_2->flags : static_cast(create_info.flags); const Location flags_loc = create_flags_2 ? create_info_loc.pNext(Struct::VkPipelineCreateFlags2CreateInfo, Field::flags) @@ -538,7 +538,7 @@ bool StatelessValidation::manual_PreCallValidateCreateGraphicsPipelines( "is VK_DYNAMIC_STATE_EXCLUSIVE_SCISSOR_ENABLE_NV without support for version 2 of VK_NV_scissor_exclusive."); } - auto feedback_struct = vku::FindStructInPNextChain(create_info.pNext); + auto feedback_struct = vku::FindStructInPNextChain(create_info.pNext); if ((feedback_struct != nullptr) && (feedback_struct->pipelineStageCreationFeedbackCount != 0 && feedback_struct->pipelineStageCreationFeedbackCount != create_info.stageCount)) { skip |= LogError("VUID-VkGraphicsPipelineCreateInfo-pipelineStageCreationFeedbackCount-06594", device, @@ -1120,7 +1120,7 @@ bool StatelessValidation::manual_PreCallValidateCreateGraphicsPipelines( } const auto *line_state = - vku::FindStructInPNextChain(create_info.pRasterizationState->pNext); + vku::FindStructInPNextChain(create_info.pRasterizationState->pNext); const bool dynamic_line_raster_mode = vvl::Contains(dynamic_state_map, VK_DYNAMIC_STATE_LINE_RASTERIZATION_MODE_EXT); const bool dynamic_line_stipple_enable = vvl::Contains(dynamic_state_map, VK_DYNAMIC_STATE_LINE_STIPPLE_ENABLE_EXT); if (line_state) { @@ -1135,8 +1135,8 @@ bool StatelessValidation::manual_PreCallValidateCreateGraphicsPipelines( if (!dynamic_line_raster_mode) { if (create_info.pMultisampleState && - (line_state->lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR || - line_state->lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR)) { + (line_state->lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_BRESENHAM || + line_state->lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH)) { if (create_info.pMultisampleState->alphaToCoverageEnable) { skip |= LogError("VUID-VkGraphicsPipelineCreateInfo-lineRasterizationMode-02766", device, rasterization_loc.pNext(Struct::VkPipelineRasterizationLineStateCreateInfo, @@ -1162,61 +1162,60 @@ bool StatelessValidation::manual_PreCallValidateCreateGraphicsPipelines( } } - if (line_state->lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR && + if (line_state->lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_RECTANGULAR && (!enabled_features.rectangularLines)) { - skip |= LogError( - "VUID-VkPipelineRasterizationLineStateCreateInfo-lineRasterizationMode-02768", device, - rasterization_loc.pNext(Struct::VkPhysicalDeviceLineRasterizationFeatures, - Field::lineRasterizationMode), - "is VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR but the rectangularLines feature was not enabled."); - } - if (line_state->lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR && - (!enabled_features.bresenhamLines)) { skip |= - LogError("VUID-VkPipelineRasterizationLineStateCreateInfo-lineRasterizationMode-02769", device, + LogError("VUID-VkPipelineRasterizationLineStateCreateInfo-lineRasterizationMode-02768", device, rasterization_loc.pNext(Struct::VkPhysicalDeviceLineRasterizationFeatures, Field::lineRasterizationMode), - "is VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR but the bresenhamLines feature was not enabled."); + "is VK_LINE_RASTERIZATION_MODE_RECTANGULAR but the rectangularLines feature was not enabled."); + } + if (line_state->lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_BRESENHAM && + (!enabled_features.bresenhamLines)) { + skip |= LogError("VUID-VkPipelineRasterizationLineStateCreateInfo-lineRasterizationMode-02769", device, + rasterization_loc.pNext(Struct::VkPhysicalDeviceLineRasterizationFeatures, + Field::lineRasterizationMode), + "is VK_LINE_RASTERIZATION_MODE_BRESENHAM but the bresenhamLines feature was not enabled."); } - if (line_state->lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR && + if (line_state->lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH && (!enabled_features.smoothLines)) { skip |= LogError("VUID-VkPipelineRasterizationLineStateCreateInfo-lineRasterizationMode-02770", device, rasterization_loc.pNext(Struct::VkPhysicalDeviceLineRasterizationFeatures, Field::lineRasterizationMode), - "is VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR but the smoothLines feature was not " + "is VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH but the smoothLines feature was not " "enabled."); } if (line_state->stippledLineEnable && !dynamic_line_stipple_enable) { - if (line_state->lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR && + if (line_state->lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_RECTANGULAR && (!enabled_features.stippledRectangularLines)) { skip |= LogError("VUID-VkPipelineRasterizationLineStateCreateInfo-stippledLineEnable-02771", device, rasterization_loc.pNext(Struct::VkPhysicalDeviceLineRasterizationFeatures, Field::lineRasterizationMode), - "is VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR and stippledLineEnable was VK_TRUE, " + "is VK_LINE_RASTERIZATION_MODE_RECTANGULAR and stippledLineEnable was VK_TRUE, " "but the stippledRectangularLines feature was not enabled."); } - if (line_state->lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR && + if (line_state->lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_BRESENHAM && (!enabled_features.stippledBresenhamLines)) { skip |= LogError("VUID-VkPipelineRasterizationLineStateCreateInfo-stippledLineEnable-02772", device, rasterization_loc.pNext(Struct::VkPhysicalDeviceLineRasterizationFeatures, Field::lineRasterizationMode), - "is VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR and stippledLineEnable was VK_TRUE, but " + "is VK_LINE_RASTERIZATION_MODE_BRESENHAM and stippledLineEnable was VK_TRUE, but " "the stippledBresenhamLines feature was not enabled."); } - if (line_state->lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR && + if (line_state->lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH && (!enabled_features.stippledSmoothLines)) { skip |= LogError("VUID-VkPipelineRasterizationLineStateCreateInfo-stippledLineEnable-02773", device, rasterization_loc.pNext(Struct::VkPhysicalDeviceLineRasterizationFeatures, Field::lineRasterizationMode), - "is VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR and stippledLineEnable was " + "is VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH and stippledLineEnable was " "VK_TRUE, but the stippledSmoothLines feature was not enabled."); } - if (line_state->lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR && + if (line_state->lineRasterizationMode == VK_LINE_RASTERIZATION_MODE_DEFAULT && (!enabled_features.stippledRectangularLines || !device_limits.strictLines)) { skip |= LogError("VUID-VkPipelineRasterizationLineStateCreateInfo-stippledLineEnable-02774", device, rasterization_loc.pNext(Struct::VkPhysicalDeviceLineRasterizationFeatures, Field::lineRasterizationMode), - "is VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR and stippledLineEnable was VK_TRUE, but " + "is VK_LINE_RASTERIZATION_MODE_DEFAULT and stippledLineEnable was VK_TRUE, but " "the stippledRectangularLines feature was not enabled."); } } @@ -1339,7 +1338,7 @@ bool StatelessValidation::manual_PreCallValidateCreateComputePipelines(VkDevice } } - const auto *create_flags_2 = vku::FindStructInPNextChain(create_info.pNext); + const auto *create_flags_2 = vku::FindStructInPNextChain(create_info.pNext); const VkPipelineCreateFlags2KHR flags = create_flags_2 ? create_flags_2->flags : static_cast(create_info.flags); const Location flags_loc = create_flags_2 ? create_info_loc.pNext(Struct::VkPipelineCreateFlags2CreateInfo, Field::flags) @@ -1409,12 +1408,12 @@ bool StatelessValidation::manual_PreCallValidateCreatePipelineCache(VkDevice dev VkPipelineCache *pPipelineCache, const ErrorObject &error_obj) const { bool skip = false; - const bool has_externally_sync = (pCreateInfo->flags & VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT_EXT) != 0; + const bool has_externally_sync = (pCreateInfo->flags & VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT) != 0; if (!enabled_features.pipelineCreationCacheControl && has_externally_sync) { skip |= LogError("VUID-VkPipelineCacheCreateInfo-pipelineCreationCacheControl-02892", device, error_obj.location.dot(Field::pCreateInfo).dot(Field::flags), - "includes VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT_EXT, but pipelineCreationCacheControl " + "includes VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT, but pipelineCreationCacheControl " "feature was not enabled"); } return skip; diff --git a/layers/stateless/sl_ray_tracing.cpp b/layers/stateless/sl_ray_tracing.cpp index 7c807b09b79..f1cb26d060b 100644 --- a/layers/stateless/sl_ray_tracing.cpp +++ b/layers/stateless/sl_ray_tracing.cpp @@ -308,8 +308,7 @@ bool StatelessValidation::ValidateCreateRayTracingPipelinesFlagsNV(const VkPipel skip |= LogError("VUID-VkRayTracingPipelineCreateInfoNV-flags-11008", device, flags_loc, "is %s.", string_VkPipelineCreateFlags2(flags).c_str()); } - if ((flags & VK_PIPELINE_CREATE_DEFER_COMPILE_BIT_NV) && - (flags & VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT)) { + if ((flags & VK_PIPELINE_CREATE_DEFER_COMPILE_BIT_NV) && (flags & VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT)) { skip |= LogError("VUID-VkRayTracingPipelineCreateInfoNV-flags-02957", device, flags_loc, "is %s.", string_VkPipelineCreateFlags2(flags).c_str()); } @@ -369,17 +368,17 @@ bool StatelessValidation::manual_PreCallValidateCreateRayTracingPipelinesNV( skip |= ValidatePipelineShaderStageCreateInfoCommon(create_info.pStages[stage_index], create_info_loc.dot(Field::pStages, stage_index)); } - auto feedback_struct = vku::FindStructInPNextChain(create_info.pNext); + auto feedback_struct = vku::FindStructInPNextChain(create_info.pNext); if ((feedback_struct != nullptr) && (feedback_struct->pipelineStageCreationFeedbackCount != 0) && (feedback_struct->pipelineStageCreationFeedbackCount != create_info.stageCount)) { - skip |= LogError("VUID-VkRayTracingPipelineCreateInfoNV-pipelineStageCreationFeedbackCount-06651", device, - create_info_loc.dot(Field::stageCount), - "(%" PRIu32 ") must equal VkPipelineCreationFeedbackEXT::pipelineStageCreationFeedbackCount (%" PRIu32 - ").", - create_info.stageCount, feedback_struct->pipelineStageCreationFeedbackCount); + skip |= + LogError("VUID-VkRayTracingPipelineCreateInfoNV-pipelineStageCreationFeedbackCount-06651", device, + create_info_loc.dot(Field::stageCount), + "(%" PRIu32 ") must equal VkPipelineCreationFeedback::pipelineStageCreationFeedbackCount (%" PRIu32 ").", + create_info.stageCount, feedback_struct->pipelineStageCreationFeedbackCount); } - const auto *create_flags_2 = vku::FindStructInPNextChain(create_info.pNext); + const auto *create_flags_2 = vku::FindStructInPNextChain(create_info.pNext); const VkPipelineCreateFlags2KHR flags = create_flags_2 ? create_flags_2->flags : static_cast(create_info.flags); const Location flags_loc = create_flags_2 ? create_info_loc.pNext(Struct::VkPipelineCreateFlags2CreateInfo, Field::flags) @@ -392,8 +391,8 @@ bool StatelessValidation::manual_PreCallValidateCreateRayTracingPipelinesNV( skip |= ValidateCreateRayTracingPipelinesFlagsNV(flags, flags_loc); if (!enabled_features.pipelineCreationCacheControl) { - if (flags & (VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT | - VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT_EXT)) { + if (flags & + (VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT | VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT)) { skip |= LogError("VUID-VkRayTracingPipelineCreateInfoNV-pipelineCreationCacheControl-02905", device, flags_loc, "is %s but the pipelineCreationCacheControl feature is not enabled.", string_VkPipelineCreateFlags2(flags).c_str()); @@ -482,7 +481,7 @@ bool StatelessValidation::manual_PreCallValidateCreateRayTracingPipelinesKHR( const Location create_info_loc = error_obj.location.dot(Field::pCreateInfos, i); const VkRayTracingPipelineCreateInfoKHR &create_info = pCreateInfos[i]; - const auto *create_flags_2 = vku::FindStructInPNextChain(create_info.pNext); + const auto *create_flags_2 = vku::FindStructInPNextChain(create_info.pNext); const VkPipelineCreateFlags2KHR flags = create_flags_2 ? create_flags_2->flags : static_cast(create_info.flags); const Location flags_loc = create_flags_2 ? create_info_loc.pNext(Struct::VkPipelineCreateFlags2CreateInfo, Field::flags) @@ -516,8 +515,8 @@ bool StatelessValidation::manual_PreCallValidateCreateRayTracingPipelinesKHR( } if (!enabled_features.pipelineCreationCacheControl) { - if (flags & (VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT | - VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT_EXT)) { + if (flags & + (VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT | VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT)) { skip |= LogError("VUID-VkRayTracingPipelineCreateInfoKHR-pipelineCreationCacheControl-02905", device, flags_loc, "vkCreateRayTracingPipelinesKHR(): pCreateInfos[%" PRIu32 "].flags is %s.", i, string_VkPipelineCreateFlags2(flags).c_str()); @@ -637,7 +636,7 @@ bool StatelessValidation::manual_PreCallValidateCreateRayTracingPipelinesKHR( } if (deferredOperation != VK_NULL_HANDLE) { - if (flags & VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT_EXT) { + if (flags & VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT) { skip |= LogError("VUID-vkCreateRayTracingPipelinesKHR-deferredOperation-03587", device, flags_loc, "is %s, but deferredOperation is not VK_NULL_HANDLE.", string_VkPipelineCreateFlags2(flags).c_str()); diff --git a/layers/stateless/sl_render_pass.cpp b/layers/stateless/sl_render_pass.cpp index 892283a7bf3..df2960d01a9 100644 --- a/layers/stateless/sl_render_pass.cpp +++ b/layers/stateless/sl_render_pass.cpp @@ -25,11 +25,10 @@ bool StatelessValidation::ValidateSubpassGraphicsFlags(VkDevice device, const Vk const Location &loc) const { bool skip = false; // make sure we consider all of the expanded and un-expanded graphics bits to be valid - const auto kExcludeStages = VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT_KHR | VK_PIPELINE_STAGE_2_COPY_BIT_KHR | - VK_PIPELINE_STAGE_2_RESOLVE_BIT_KHR | VK_PIPELINE_STAGE_2_BLIT_BIT_KHR | - VK_PIPELINE_STAGE_2_CLEAR_BIT_KHR; - const auto kMetaGraphicsStages = VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT_KHR | VK_PIPELINE_STAGE_2_VERTEX_INPUT_BIT_KHR | - VK_PIPELINE_STAGE_2_PRE_RASTERIZATION_SHADERS_BIT_KHR; + const auto kExcludeStages = VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT | VK_PIPELINE_STAGE_2_COPY_BIT | + VK_PIPELINE_STAGE_2_RESOLVE_BIT | VK_PIPELINE_STAGE_2_BLIT_BIT | VK_PIPELINE_STAGE_2_CLEAR_BIT; + const auto kMetaGraphicsStages = VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT | VK_PIPELINE_STAGE_2_VERTEX_INPUT_BIT | + VK_PIPELINE_STAGE_2_PRE_RASTERIZATION_SHADERS_BIT; const auto kGraphicsStages = (sync_utils::ExpandPipelineStages(VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT, VK_QUEUE_GRAPHICS_BIT) | kMetaGraphicsStages) & ~kExcludeStages; @@ -125,14 +124,13 @@ bool StatelessValidation::ValidateCreateRenderPass(VkDevice device, const VkRend } } if (!enabled_features.synchronization2) { - if (initial_layout == VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR || - initial_layout == VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR) { + if (initial_layout == VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL || initial_layout == VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL) { vuid = use_rp2 ? "VUID-VkAttachmentDescription2-synchronization2-06908" : "VUID-VkAttachmentDescription-synchronization2-06908"; skip |= LogError(vuid, device, attachment_loc.dot(Field::initialLayout), "is %s but the synchronization2 feature is not enabled.", string_VkImageLayout(initial_layout)); } - if (final_layout == VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR || final_layout == VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR) { + if (final_layout == VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL || final_layout == VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL) { vuid = use_rp2 ? "VUID-VkAttachmentDescription2-synchronization2-06909" : "VUID-VkAttachmentDescription-synchronization2-06909"; skip |= LogError(vuid, device, attachment_loc.dot(Field::finalLayout), @@ -140,18 +138,18 @@ bool StatelessValidation::ValidateCreateRenderPass(VkDevice device, const VkRend } } if (!enabled_features.dynamicRenderingLocalRead) { - if (initial_layout == VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR) { + if (initial_layout == VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ) { vuid = use_rp2 ? "VUID-VkAttachmentDescription2-dynamicRenderingLocalRead-09544" : "VUID-VkAttachmentDescription-dynamicRenderingLocalRead-09544"; skip |= LogError(vuid, device, attachment_loc.dot(Field::initialLayout), - "is VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR but the " + "is VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ but the " "dynamicRenderingLocalRead feature is not enabled."); } - if (final_layout == VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR) { + if (final_layout == VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ) { vuid = use_rp2 ? "VUID-VkAttachmentDescription2-dynamicRenderingLocalRead-09545" : "VUID-VkAttachmentDescription-dynamicRenderingLocalRead-09545"; skip |= LogError(vuid, device, attachment_loc.dot(Field::finalLayout), - "is VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR but the " + "is VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ but the " "dynamicRenderingLocalRead feature is not enabled."); } } @@ -348,7 +346,7 @@ bool StatelessValidation::ValidateCreateRenderPass(VkDevice device, const VkRend VkPipelineStageFlags2 srcStageMask = dependency.srcStageMask; VkPipelineStageFlags2 dstStageMask = dependency.dstStageMask; - if (const auto barrier = vku::FindStructInPNextChain(pCreateInfo->pDependencies[i].pNext); barrier) { + if (const auto barrier = vku::FindStructInPNextChain(pCreateInfo->pDependencies[i].pNext); barrier) { srcStageMask = barrier->srcStageMask; dstStageMask = barrier->dstStageMask; } @@ -602,7 +600,7 @@ bool StatelessValidation::manual_PreCallValidateCmdBeginRendering(VkCommandBuffe pRenderingInfo->colorAttachmentCount, device_limits.maxColorAttachments); } - if ((pRenderingInfo->flags & VK_RENDERING_CONTENTS_INLINE_BIT_EXT) != 0 && !enabled_features.nestedCommandBuffer && + if ((pRenderingInfo->flags & VK_RENDERING_CONTENTS_INLINE_BIT_KHR) != 0 && !enabled_features.nestedCommandBuffer && !enabled_features.maintenance7) { skip |= LogError("VUID-VkRenderingInfo-flags-10012", commandBuffer, rendering_info_loc.dot(Field::flags), "are %s, but nestedCommandBuffer and maintenance7 feature were not enabled.", diff --git a/layers/stateless/stateless_validation.h b/layers/stateless/stateless_validation.h index 1c914975b6c..a8dcefe58ca 100644 --- a/layers/stateless/stateless_validation.h +++ b/layers/stateless/stateless_validation.h @@ -624,7 +624,7 @@ class StatelessValidation : public ValidationObject { const VkWriteDescriptorSet *pDescriptorWrites, const ErrorObject &error_obj) const; bool manual_PreCallValidateCmdPushDescriptorSet2(VkCommandBuffer commandBuffer, - const VkPushDescriptorSetInfoKHR *pPushDescriptorSetInfo, + const VkPushDescriptorSetInfo *pPushDescriptorSetInfo, const ErrorObject &error_obj) const; bool manual_PreCallValidateCmdSetExclusiveScissorNV(VkCommandBuffer commandBuffer, uint32_t firstExclusiveScissor, uint32_t exclusiveScissorCount, const VkRect2D *pExclusiveScissors, @@ -765,7 +765,7 @@ class StatelessValidation : public ValidationObject { const VkBindDescriptorBufferEmbeddedSamplersInfoEXT *pBindDescriptorBufferEmbeddedSamplersInfo, const ErrorObject &error_obj) const; bool manual_PreCallValidateCmdPushDescriptorSetWithTemplate2( - VkCommandBuffer commandBuffer, const VkPushDescriptorSetWithTemplateInfoKHR *pPushDescriptorSetWithTemplateInfo, + VkCommandBuffer commandBuffer, const VkPushDescriptorSetWithTemplateInfo *pPushDescriptorSetWithTemplateInfo, const ErrorObject &error_obj) const; bool manual_PreCallValidateCmdBindDescriptorSets2(VkCommandBuffer commandBuffer, const VkBindDescriptorSetsInfoKHR *pBindDescriptorSetsInfo, @@ -933,7 +933,7 @@ class StatelessValidation : public ValidationObject { const ErrorObject &error_obj) const; bool ValidateCmdPushConstants(VkCommandBuffer commandBuffer, uint32_t offset, uint32_t size, const Location &loc) const; - bool manual_PreCallValidateCmdPushConstants2(VkCommandBuffer commandBuffer, const VkPushConstantsInfoKHR *pPushConstantsInfo, + bool manual_PreCallValidateCmdPushConstants2(VkCommandBuffer commandBuffer, const VkPushConstantsInfo *pPushConstantsInfo, const ErrorObject &error_obj) const; bool manual_PreCallValidateCmdPushConstants(VkCommandBuffer commandBuffer, VkPipelineLayout layout, VkShaderStageFlags stageFlags, uint32_t offset, uint32_t size, const void *pValues, diff --git a/layers/sync/sync_renderpass.cpp b/layers/sync/sync_renderpass.cpp index 78ff8414019..ccfb492f3c5 100644 --- a/layers/sync/sync_renderpass.cpp +++ b/layers/sync/sync_renderpass.cpp @@ -84,7 +84,7 @@ void InitSubpassContexts(VkQueueFlags queue_flags, const vvl::RenderPass &rp_sta static SyncAccessIndex GetLoadOpUsageIndex(VkAttachmentLoadOp load_op, syncval_state::AttachmentType type) { SyncAccessIndex access_index; - if (load_op == VK_ATTACHMENT_LOAD_OP_NONE_KHR) { + if (load_op == VK_ATTACHMENT_LOAD_OP_NONE) { access_index = SYNC_ACCESS_INDEX_NONE; } else if (type == syncval_state::AttachmentType::kColor) { access_index = (load_op == VK_ATTACHMENT_LOAD_OP_LOAD) ? SYNC_COLOR_ATTACHMENT_OUTPUT_COLOR_ATTACHMENT_READ diff --git a/layers/sync/sync_vuid_maps.cpp b/layers/sync/sync_vuid_maps.cpp index 2b63802268c..0e384109c7c 100644 --- a/layers/sync/sync_vuid_maps.cpp +++ b/layers/sync/sync_vuid_maps.cpp @@ -1066,7 +1066,7 @@ const vvl::unordered_map> &GetImageLayoutErr {Key(Struct::VkImageMemoryBarrier), "VUID-VkImageMemoryBarrier-srcQueueFamilyIndex-07006"}, {Key(Struct::VkImageMemoryBarrier2), "VUID-VkImageMemoryBarrier2-srcQueueFamilyIndex-07006"}, }}}, - {VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR, + {VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ, ValueType{{ {Key(Struct::VkImageMemoryBarrier), "VUID-VkImageMemoryBarrier-srcQueueFamilyIndex-09550"}, {Key(Struct::VkImageMemoryBarrier2), "VUID-VkImageMemoryBarrier2-srcQueueFamilyIndex-09550"}, diff --git a/layers/utils/image_layout_utils.cpp b/layers/utils/image_layout_utils.cpp index a4a35ba5d58..94373c8b563 100644 --- a/layers/utils/image_layout_utils.cpp +++ b/layers/utils/image_layout_utils.cpp @@ -1,5 +1,5 @@ -/* Copyright (c) 2023 Valve Corporation - * Copyright (c) 2023 LunarG, Inc. +/* Copyright (c) 2023-2024 Valve Corporation + * Copyright (c) 2023-2024 LunarG, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,7 +47,7 @@ VkImageLayout NormalizeStencilImageLayout(VkImageLayout layout) { } VkImageLayout NormalizeSynchronization2Layout(const VkImageAspectFlags aspect_mask, VkImageLayout layout) { - if (layout == VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR) { + if (layout == VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL) { if (aspect_mask == VK_IMAGE_ASPECT_COLOR_BIT) { layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; } else if (aspect_mask == (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) { @@ -57,7 +57,7 @@ VkImageLayout NormalizeSynchronization2Layout(const VkImageAspectFlags aspect_ma } else if (aspect_mask == VK_IMAGE_ASPECT_STENCIL_BIT) { layout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL; } - } else if (layout == VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR) { + } else if (layout == VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL) { if (aspect_mask == VK_IMAGE_ASPECT_COLOR_BIT) { layout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; } else if (aspect_mask == (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) { diff --git a/layers/utils/vk_layer_utils.h b/layers/utils/vk_layer_utils.h index 24280d5430f..4f7f29ad6be 100644 --- a/layers/utils/vk_layer_utils.h +++ b/layers/utils/vk_layer_utils.h @@ -271,7 +271,7 @@ static inline uint32_t GetIndexAlignment(VkIndexType indexType) { return 2; case VK_INDEX_TYPE_UINT32: return 4; - case VK_INDEX_TYPE_UINT8_KHR: + case VK_INDEX_TYPE_UINT8: return 1; case VK_INDEX_TYPE_NONE_KHR: // alias VK_INDEX_TYPE_NONE_NV return 0; diff --git a/layers/vulkan/generated/dynamic_state_helper.cpp b/layers/vulkan/generated/dynamic_state_helper.cpp index addfa49a130..a2fc58d46a7 100644 --- a/layers/vulkan/generated/dynamic_state_helper.cpp +++ b/layers/vulkan/generated/dynamic_state_helper.cpp @@ -838,7 +838,7 @@ std::string DescribeDynamicStateDependency(CBDynamicState dynamic_state, const v if (!pipeline || pipeline->IsDynamic(CB_DYNAMIC_STATE_LINE_STIPPLE_ENABLE_EXT)) { ss << "vkCmdSetLineStippleEnableEXT last set stippledLineEnable to VK_TRUE.\n"; } else { - ss << "VkPipelineRasterizationLineStateCreateInfoEXT::stippledLineEnable was VK_TRUE in the last bound graphics " + ss << "VkPipelineRasterizationLineStateCreateInfo::stippledLineEnable was VK_TRUE in the last bound graphics " "pipeline.\n"; } break; diff --git a/scripts/generators/dynamic_state_generator.py b/scripts/generators/dynamic_state_generator.py index 812aed4eaf5..a0349f73774 100644 --- a/scripts/generators/dynamic_state_generator.py +++ b/scripts/generators/dynamic_state_generator.py @@ -520,7 +520,7 @@ def generateSource(self): if (!pipeline || pipeline->IsDynamic(CB_DYNAMIC_STATE_LINE_STIPPLE_ENABLE_EXT)) { ss << "vkCmdSetLineStippleEnableEXT last set stippledLineEnable to VK_TRUE.\\n"; } else { - ss << "VkPipelineRasterizationLineStateCreateInfoEXT::stippledLineEnable was VK_TRUE in the last bound graphics pipeline.\\n"; + ss << "VkPipelineRasterizationLineStateCreateInfo::stippledLineEnable was VK_TRUE in the last bound graphics pipeline.\\n"; }''') if 'sampleLocationsEnable' in dependency: out.append(''' diff --git a/tests/framework/barrier_queue_family.cpp b/tests/framework/barrier_queue_family.cpp index 4953b6faef3..30a325a6cec 100644 --- a/tests/framework/barrier_queue_family.cpp +++ b/tests/framework/barrier_queue_family.cpp @@ -179,7 +179,7 @@ void Barrier2QueueFamilyTestHelper::operator()(const std::string &img_err, const buffer_barrier_.srcQueueFamilyIndex = src; buffer_barrier_.dstQueueFamilyIndex = dst; - VkDependencyInfoKHR dep_info = vku::InitStructHelper(); + VkDependencyInfo dep_info = vku::InitStructHelper(); dep_info.bufferMemoryBarrierCount = 1; dep_info.pBufferMemoryBarriers = &buffer_barrier_; dep_info.imageMemoryBarrierCount = 1; @@ -236,9 +236,9 @@ void ValidOwnershipTransfer(ErrorMonitor *monitor, vkt::Queue *queue_from, vkt:: } void ValidOwnershipTransferOp(ErrorMonitor *monitor, vkt::Queue *queue, vkt::CommandBuffer &cb, - const VkBufferMemoryBarrier2KHR *buf_barrier, const VkImageMemoryBarrier2KHR *img_barrier) { + const VkBufferMemoryBarrier2 *buf_barrier, const VkImageMemoryBarrier2 *img_barrier) { cb.begin(); - VkDependencyInfoKHR dep_info = vku::InitStructHelper(); + VkDependencyInfo dep_info = vku::InitStructHelper(); dep_info.bufferMemoryBarrierCount = (buf_barrier) ? 1 : 0; dep_info.pBufferMemoryBarriers = buf_barrier; dep_info.imageMemoryBarrierCount = (img_barrier) ? 1 : 0; @@ -250,18 +250,18 @@ void ValidOwnershipTransferOp(ErrorMonitor *monitor, vkt::Queue *queue, vkt::Com } void ValidOwnershipTransfer(ErrorMonitor *monitor, vkt::Queue *queue_from, vkt::CommandBuffer &cb_from, vkt::Queue *queue_to, - vkt::CommandBuffer &cb_to, const VkBufferMemoryBarrier2KHR *buf_barrier, - const VkImageMemoryBarrier2KHR *img_barrier) { - VkBufferMemoryBarrier2KHR fixup_buf_barrier; - VkImageMemoryBarrier2KHR fixup_img_barrier; + vkt::CommandBuffer &cb_to, const VkBufferMemoryBarrier2 *buf_barrier, + const VkImageMemoryBarrier2 *img_barrier) { + VkBufferMemoryBarrier2 fixup_buf_barrier; + VkImageMemoryBarrier2 fixup_img_barrier; if (buf_barrier) { fixup_buf_barrier = *buf_barrier; - fixup_buf_barrier.dstStageMask = VK_PIPELINE_STAGE_2_NONE_KHR; + fixup_buf_barrier.dstStageMask = VK_PIPELINE_STAGE_2_NONE; fixup_buf_barrier.dstAccessMask = 0; } if (img_barrier) { fixup_img_barrier = *img_barrier; - fixup_img_barrier.dstStageMask = VK_PIPELINE_STAGE_2_NONE_KHR; + fixup_img_barrier.dstStageMask = VK_PIPELINE_STAGE_2_NONE; fixup_img_barrier.dstAccessMask = 0; } @@ -270,12 +270,12 @@ void ValidOwnershipTransfer(ErrorMonitor *monitor, vkt::Queue *queue_from, vkt:: if (buf_barrier) { fixup_buf_barrier = *buf_barrier; - fixup_buf_barrier.srcStageMask = VK_PIPELINE_STAGE_2_NONE_KHR; + fixup_buf_barrier.srcStageMask = VK_PIPELINE_STAGE_2_NONE; fixup_buf_barrier.srcAccessMask = 0; } if (img_barrier) { fixup_img_barrier = *img_barrier; - fixup_img_barrier.srcStageMask = VK_PIPELINE_STAGE_2_NONE_KHR; + fixup_img_barrier.srcStageMask = VK_PIPELINE_STAGE_2_NONE; fixup_img_barrier.srcAccessMask = 0; } ValidOwnershipTransferOp(monitor, queue_to, cb_to, buf_barrier ? &fixup_buf_barrier : nullptr, diff --git a/tests/framework/barrier_queue_family.h b/tests/framework/barrier_queue_family.h index 787ffe9d002..4bb3dc8cede 100644 --- a/tests/framework/barrier_queue_family.h +++ b/tests/framework/barrier_queue_family.h @@ -85,8 +85,8 @@ class Barrier2QueueFamilyTestHelper : public BarrierQueueFamilyBase { (*this)("", "", src, dst, queue_family_index, mod); } - VkImageMemoryBarrier2KHR image_barrier_; - VkBufferMemoryBarrier2KHR buffer_barrier_; + VkImageMemoryBarrier2 image_barrier_; + VkBufferMemoryBarrier2 buffer_barrier_; }; void ValidOwnershipTransferOp(ErrorMonitor *monitor, vkt::Queue *queue, vkt::CommandBuffer &cb, VkPipelineStageFlags src_stages, @@ -94,12 +94,12 @@ void ValidOwnershipTransferOp(ErrorMonitor *monitor, vkt::Queue *queue, vkt::Com const VkImageMemoryBarrier *img_barrier); void ValidOwnershipTransferOp(ErrorMonitor *monitor, vkt::Queue *queue, vkt::CommandBuffer &cb, - const VkBufferMemoryBarrier2KHR *buf_barrier, const VkImageMemoryBarrier2KHR *img_barrier); + const VkBufferMemoryBarrier2 *buf_barrier, const VkImageMemoryBarrier2 *img_barrier); void ValidOwnershipTransfer(ErrorMonitor *monitor, vkt::Queue *queue_from, vkt::CommandBuffer &cb_from, vkt::Queue *queue_to, vkt::CommandBuffer &cb_to, VkPipelineStageFlags src_stages, VkPipelineStageFlags dst_stages, const VkBufferMemoryBarrier *buf_barrier, const VkImageMemoryBarrier *img_barrier); void ValidOwnershipTransfer(ErrorMonitor *monitor, vkt::Queue *queue_from, vkt::CommandBuffer &cb_from, vkt::Queue *queue_to, - vkt::CommandBuffer &cb_to, const VkBufferMemoryBarrier2KHR *buf_barrier, - const VkImageMemoryBarrier2KHR *img_barrier); + vkt::CommandBuffer &cb_to, const VkBufferMemoryBarrier2 *buf_barrier, + const VkImageMemoryBarrier2 *img_barrier); diff --git a/tests/framework/binding.cpp b/tests/framework/binding.cpp index 959301b3793..22bd57fb64e 100644 --- a/tests/framework/binding.cpp +++ b/tests/framework/binding.cpp @@ -936,7 +936,7 @@ Semaphore::Semaphore(const Device &dev, VkSemaphoreType type, uint64_t initial_v init(dev, vku::InitStruct()); } else { VkSemaphoreTypeCreateInfo semaphore_type_ci = vku::InitStructHelper(); - semaphore_type_ci.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE_KHR; + semaphore_type_ci.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE; semaphore_type_ci.initialValue = initial_value; VkSemaphoreCreateInfo semaphore_ci = vku::InitStructHelper(&semaphore_type_ci); init(dev, semaphore_ci); @@ -1269,11 +1269,11 @@ bool Image::IsCompatible(const Device &dev, const VkImageUsageFlags usages, cons VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT | VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT | VK_FORMAT_FEATURE_2_BLIT_SRC_BIT | VK_FORMAT_FEATURE_2_BLIT_DST_BIT | VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_LINEAR_BIT; if (dev.IsEnabledExtension(VK_IMG_FILTER_CUBIC_EXTENSION_NAME)) { - all_feature_flags |= VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT_EXT; + all_feature_flags |= VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT; } if (dev.IsEnabledExtension(VK_KHR_MAINTENANCE_1_EXTENSION_NAME)) { - all_feature_flags |= VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT_KHR | VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT_KHR; + all_feature_flags |= VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT | VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT; } if (dev.IsEnabledExtension(VK_EXT_SAMPLER_FILTER_MINMAX_EXTENSION_NAME)) { @@ -1281,18 +1281,18 @@ bool Image::IsCompatible(const Device &dev, const VkImageUsageFlags usages, cons } if (dev.IsEnabledExtension(VK_KHR_SAMPLER_YCBCR_CONVERSION_EXTENSION_NAME)) { - all_feature_flags |= VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT_KHR | - VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT_KHR | - VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT_KHR | - VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT_KHR | - VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT_KHR | - VK_FORMAT_FEATURE_2_DISJOINT_BIT_KHR | VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT_KHR; + all_feature_flags |= VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT | + VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT | + VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT | + VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT | + VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT | + VK_FORMAT_FEATURE_2_DISJOINT_BIT | VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT; } if (dev.IsEnabledExtension(VK_KHR_FORMAT_FEATURE_FLAGS_2_EXTENSION_NAME)) { - all_feature_flags |= VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT_KHR | - VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT_KHR | - VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT_KHR; + all_feature_flags |= VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT | + VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT | + VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT; } if ((features & all_feature_flags) == 0) return false; // whole format unsupported @@ -1588,7 +1588,7 @@ Buffer AccelerationStructureNV::CreateScratchBuffer(const Device &device, VkBuff VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); void *pNext = nullptr; if (buffer_device_address) { - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; pNext = &alloc_flags; } @@ -1905,7 +1905,7 @@ void CommandBuffer::NextSubpass(VkSubpassContents contents) { vk::CmdNextSubpass void CommandBuffer::EndRenderPass() { vk::CmdEndRenderPass(handle()); } -void CommandBuffer::BeginRendering(const VkRenderingInfoKHR &renderingInfo) { +void CommandBuffer::BeginRendering(const VkRenderingInfo &renderingInfo) { if (vk::CmdBeginRenderingKHR) { vk::CmdBeginRenderingKHR(handle(), &renderingInfo); } else { @@ -1914,11 +1914,11 @@ void CommandBuffer::BeginRendering(const VkRenderingInfoKHR &renderingInfo) { } void CommandBuffer::BeginRenderingColor(const VkImageView imageView, VkRect2D render_area) { - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = imageView; color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR renderingInfo = vku::InitStructHelper(); + VkRenderingInfo renderingInfo = vku::InitStructHelper(); renderingInfo.colorAttachmentCount = 1; renderingInfo.pColorAttachments = &color_attachment; renderingInfo.layerCount = 1; diff --git a/tests/framework/binding.h b/tests/framework/binding.h index 4a92a92cd57..31639a590d0 100644 --- a/tests/framework/binding.h +++ b/tests/framework/binding.h @@ -670,10 +670,10 @@ class Buffer : public internal::NonDispHandle { return barrier; } - VkBufferMemoryBarrier2KHR BufferMemoryBarrier(VkPipelineStageFlags2KHR src_stage, VkPipelineStageFlags2KHR dst_stage, - VkAccessFlags2KHR src_access, VkAccessFlags2KHR dst_access, VkDeviceSize offset, - VkDeviceSize size) const { - VkBufferMemoryBarrier2KHR barrier = vku::InitStructHelper(); + VkBufferMemoryBarrier2 BufferMemoryBarrier(VkPipelineStageFlags2KHR src_stage, VkPipelineStageFlags2KHR dst_stage, + VkAccessFlags2KHR src_access, VkAccessFlags2KHR dst_access, VkDeviceSize offset, + VkDeviceSize size) const { + VkBufferMemoryBarrier2 barrier = vku::InitStructHelper(); barrier.buffer = handle(); barrier.srcStageMask = src_stage; barrier.dstStageMask = dst_stage; @@ -790,11 +790,10 @@ class Image : public internal::NonDispHandle { return barrier; } - VkImageMemoryBarrier2KHR ImageMemoryBarrier(VkPipelineStageFlags2KHR src_stage, VkPipelineStageFlags2KHR dst_stage, - VkAccessFlags2KHR src_access, VkAccessFlags2KHR dst_access, - VkImageLayout old_layout, VkImageLayout new_layout, - const VkImageSubresourceRange &range) const { - VkImageMemoryBarrier2KHR barrier = vku::InitStructHelper(); + VkImageMemoryBarrier2 ImageMemoryBarrier(VkPipelineStageFlags2KHR src_stage, VkPipelineStageFlags2KHR dst_stage, + VkAccessFlags2KHR src_access, VkAccessFlags2KHR dst_access, VkImageLayout old_layout, + VkImageLayout new_layout, const VkImageSubresourceRange &range) const { + VkImageMemoryBarrier2 barrier = vku::InitStructHelper(); barrier.srcStageMask = src_stage; barrier.dstStageMask = dst_stage; barrier.srcAccessMask = src_access; @@ -1179,7 +1178,7 @@ class CommandBuffer : public internal::Handle { uint32_t clear_count = 0, VkClearValue *clear_values = nullptr); void NextSubpass(VkSubpassContents contents = VK_SUBPASS_CONTENTS_INLINE); void EndRenderPass(); - void BeginRendering(const VkRenderingInfoKHR &renderingInfo); + void BeginRendering(const VkRenderingInfo &renderingInfo); void BeginRenderingColor(const VkImageView imageView, VkRect2D render_area); void EndRendering(); diff --git a/tests/framework/descriptor_helper.cpp b/tests/framework/descriptor_helper.cpp index c18cc03e0d7..334197caa47 100644 --- a/tests/framework/descriptor_helper.cpp +++ b/tests/framework/descriptor_helper.cpp @@ -25,7 +25,7 @@ OneOffDescriptorSet::OneOffDescriptorSet(vkt::Device *device, const Bindings &bi err = vk::CreateDescriptorPool(device_->handle(), &dspci, nullptr, &pool_); if (err != VK_SUCCESS) return; - if ((layout_flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR) == 0) { + if ((layout_flags & VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT) == 0) { VkDescriptorSetAllocateInfo alloc_info = {VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO, allocate_pnext, pool_, 1, &layout_.handle()}; err = vk::AllocateDescriptorSets(device_->handle(), &alloc_info, &set_); diff --git a/tests/framework/external_memory_sync.cpp b/tests/framework/external_memory_sync.cpp index 6933501e172..b079ce9cc45 100644 --- a/tests/framework/external_memory_sync.cpp +++ b/tests/framework/external_memory_sync.cpp @@ -218,7 +218,7 @@ bool HandleTypeNeedsDedicatedAllocation(VkPhysicalDevice gpu, const VkImageCreat bool SemaphoreExportImportSupported(VkPhysicalDevice gpu, VkExternalSemaphoreHandleTypeFlagBits handle_type) { constexpr auto export_import_flags = - VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT_KHR | VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT_KHR; + VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT | VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT; VkPhysicalDeviceExternalSemaphoreInfo info = vku::InitStructHelper(); info.handleType = handle_type; diff --git a/tests/framework/layer_validation_tests.cpp b/tests/framework/layer_validation_tests.cpp index 5c27b552a45..2be1f1b88eb 100644 --- a/tests/framework/layer_validation_tests.cpp +++ b/tests/framework/layer_validation_tests.cpp @@ -183,7 +183,7 @@ void TestRenderPassBegin(ErrorMonitor *error_monitor, const VkDevice device, con vk::ResetCommandBuffer(command_buffer, 0); } if (rp2Supported && rp2_vuid) { - VkSubpassBeginInfoKHR subpass_begin_info = {VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO_KHR, nullptr, VK_SUBPASS_CONTENTS_INLINE}; + VkSubpassBeginInfo subpass_begin_info = {VK_STRUCTURE_TYPE_SUBPASS_BEGIN_INFO_KHR, nullptr, VK_SUBPASS_CONTENTS_INLINE}; vk::BeginCommandBuffer(command_buffer, &cmd_begin_info); error_monitor->SetDesiredError(rp2_vuid); vk::CmdBeginRenderPass2KHR(command_buffer, begin_info, &subpass_begin_info); diff --git a/tests/framework/pipeline_helper.cpp b/tests/framework/pipeline_helper.cpp index 257a34766ff..fd87f9a0cb4 100644 --- a/tests/framework/pipeline_helper.cpp +++ b/tests/framework/pipeline_helper.cpp @@ -62,7 +62,7 @@ CreatePipelineHelper::CreatePipelineHelper(VkLayerTest &test, void *pNext) : lay // InitLineRasterizationInfo line_state_ci_ = vku::InitStructHelper(); - line_state_ci_.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR; + line_state_ci_.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_DEFAULT; line_state_ci_.stippledLineEnable = VK_FALSE; line_state_ci_.lineStippleFactor = 0; line_state_ci_.lineStipplePattern = 0; diff --git a/tests/framework/pipeline_helper.h b/tests/framework/pipeline_helper.h index 8374a6a423d..e38b18a325e 100644 --- a/tests/framework/pipeline_helper.h +++ b/tests/framework/pipeline_helper.h @@ -34,7 +34,7 @@ class CreatePipelineHelper { vkt::PipelineLayout pipeline_layout_; VkPipelineDynamicStateCreateInfo dyn_state_ci_ = {}; VkPipelineRasterizationStateCreateInfo rs_state_ci_ = {}; - VkPipelineRasterizationLineStateCreateInfoKHR line_state_ci_ = {}; + VkPipelineRasterizationLineStateCreateInfo line_state_ci_ = {}; VkPipelineColorBlendAttachmentState cb_attachments_ = {}; VkPipelineColorBlendStateCreateInfo cb_ci_ = {}; VkPipelineDepthStencilStateCreateInfo ds_ci_ = {}; diff --git a/tests/framework/ray_tracing_helper_nv.cpp b/tests/framework/ray_tracing_helper_nv.cpp index f534afa7960..64fa6b0c412 100644 --- a/tests/framework/ray_tracing_helper_nv.cpp +++ b/tests/framework/ray_tracing_helper_nv.cpp @@ -205,7 +205,7 @@ void GetSimpleGeometryForAccelerationStructureTests(const vkt::Device &device, v void *alloc_pnext = nullptr; if (buffer_device_address) { usage |= VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT; - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; alloc_pnext = &alloc_flags; } vbo->init(device, 1024, usage, kHostVisibleMemProps, alloc_pnext); diff --git a/tests/framework/ray_tracing_objects.cpp b/tests/framework/ray_tracing_objects.cpp index c7455ec4079..b8880d49a19 100644 --- a/tests/framework/ray_tracing_objects.cpp +++ b/tests/framework/ray_tracing_objects.cpp @@ -200,7 +200,7 @@ GeometryKHR &GeometryKHR::AddInstanceDeviceAccelStructRef(const vkt::Device &dev // Create instance buffer VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; vkt::Buffer instances_buffer( device, instances_.vk_instances.size() * sizeof(VkAccelerationStructureInstanceKHR), VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT | VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR, @@ -542,7 +542,7 @@ void BuildGeometryInfoKHR::SetupBuild(bool is_on_device_build, bool use_ppGeomet assert(device_scratch_); // So far null pointers are not supported if (!device_scratch_->initialized()) { VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; if (scratch_size > 0) { device_scratch_->init(*device_, scratch_size + as_props.minAccelerationStructureScratchOffsetAlignment, @@ -627,7 +627,7 @@ void BuildGeometryInfoKHR::VkCmdBuildAccelerationStructuresIndirectKHR(VkCommand indirect_buffer_ = std::make_unique(); VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; indirect_buffer_->init(*device_, 1 * vk_info_.geometryCount * sizeof(VkAccelerationStructureBuildRangeInfoKHR), VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, kHostVisibleMemProps, @@ -860,7 +860,7 @@ GeometryKHR GeometrySimpleOnDeviceTriangleInfo(const vkt::Device &device, size_t // Allocate vertex and index buffers VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; const VkBufferUsageFlags buffer_usage = VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR | VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT; @@ -1008,7 +1008,7 @@ GeometryKHR GeometryCubeOnDeviceInfo(const vkt::Device &device) { // Allocate vertex and index buffers VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; const VkBufferUsageFlags buffer_usage = VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR | VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT; @@ -1050,7 +1050,7 @@ GeometryKHR GeometrySimpleOnDeviceAABBInfo(const vkt::Device &device) { const VkDeviceSize aabb_buffer_size = sizeof(aabbs[0]) * aabbs.size(); vkt::Buffer aabb_buffer; VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; const VkBufferUsageFlags buffer_usage = VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR | VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT; @@ -1119,7 +1119,7 @@ std::shared_ptr AccelStructSimpleOnDeviceBottomLevel(c auto as = std::make_shared(&device); as->SetSize(size); as->SetType(VK_ACCELERATION_STRUCTURE_TYPE_BOTTOM_LEVEL_KHR); - as->SetDeviceBufferMemoryAllocateFlags(VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR); + as->SetDeviceBufferMemoryAllocateFlags(VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT); as->SetDeviceBufferMemoryPropertyFlags(VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT); as->SetBufferUsageFlags(VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT); @@ -1143,7 +1143,7 @@ std::shared_ptr AccelStructSimpleOnDeviceTopLevel(cons auto as = std::make_shared(&device); as->SetSize(size); as->SetType(VK_ACCELERATION_STRUCTURE_TYPE_TOP_LEVEL_KHR); - as->SetDeviceBufferMemoryAllocateFlags(VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR); + as->SetDeviceBufferMemoryAllocateFlags(VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT); as->SetDeviceBufferMemoryPropertyFlags(VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT); as->SetBufferUsageFlags(VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT); @@ -1547,7 +1547,7 @@ void Pipeline::BuildSbt() { sbt_buffer_info.usage = VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT | VK_BUFFER_USAGE_SHADER_BINDING_TABLE_BIT_KHR | VK_BUFFER_USAGE_TRANSFER_SRC_BIT; VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; sbt_buffer_.init(*device_, sbt_buffer_info, kHostVisibleMemProps, &alloc_flags); #ifdef VVL_DEBUG_LOG_SBT diff --git a/tests/framework/render.cpp b/tests/framework/render.cpp index dc12a4a19d7..fe1740039d2 100644 --- a/tests/framework/render.cpp +++ b/tests/framework/render.cpp @@ -1134,7 +1134,7 @@ void VkRenderFramework::SetDefaultDynamicStatesExclude(const std::vectorlinearTilingFeatures = pFormatProperties->formatProperties.linearTilingFeatures; props_3->optimalTilingFeatures = pFormatProperties->formatProperties.optimalTilingFeatures; props_3->bufferFeatures = pFormatProperties->formatProperties.bufferFeatures; - props_3->optimalTilingFeatures |= VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT_EXT; + props_3->optimalTilingFeatures |= VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT; switch (format) { case VK_FORMAT_R32_SINT: @@ -2326,21 +2326,21 @@ static VKAPI_ATTR VkResult VKAPI_CALL EnumeratePhysicalDeviceQueueFamilyPerforma } // arbitrary pCounters[0].unit = VK_PERFORMANCE_COUNTER_UNIT_GENERIC_KHR; - pCounters[0].scope = VK_QUERY_SCOPE_COMMAND_BUFFER_KHR; + pCounters[0].scope = VK_PERFORMANCE_COUNTER_SCOPE_COMMAND_BUFFER_KHR; pCounters[0].storage = VK_PERFORMANCE_COUNTER_STORAGE_INT32_KHR; pCounters[0].uuid[0] = 0x01; if (*pCounterCount == 1) { return VK_INCOMPLETE; } pCounters[1].unit = VK_PERFORMANCE_COUNTER_UNIT_GENERIC_KHR; - pCounters[1].scope = VK_QUERY_SCOPE_RENDER_PASS_KHR; + pCounters[1].scope = VK_PERFORMANCE_COUNTER_SCOPE_RENDER_PASS_KHR; pCounters[1].storage = VK_PERFORMANCE_COUNTER_STORAGE_INT32_KHR; pCounters[1].uuid[0] = 0x02; if (*pCounterCount == 2) { return VK_INCOMPLETE; } pCounters[2].unit = VK_PERFORMANCE_COUNTER_UNIT_GENERIC_KHR; - pCounters[2].scope = VK_QUERY_SCOPE_COMMAND_KHR; + pCounters[2].scope = VK_PERFORMANCE_COUNTER_SCOPE_COMMAND_KHR; pCounters[2].storage = VK_PERFORMANCE_COUNTER_STORAGE_INT32_KHR; pCounters[2].uuid[0] = 0x03; *pCounterCount = 3; @@ -2411,7 +2411,7 @@ GetPhysicalDeviceFragmentShadingRatesKHR(VkPhysicalDevice physicalDevice, uint32 return VK_SUCCESS; } -static VKAPI_ATTR VkResult VKAPI_CALL MapMemory2(VkDevice device, const VkMemoryMapInfoKHR* pMemoryMapInfo, void** ppData) { +static VKAPI_ATTR VkResult VKAPI_CALL MapMemory2(VkDevice device, const VkMemoryMapInfo* pMemoryMapInfo, void** ppData) { return MapMemory(device, pMemoryMapInfo->memory, pMemoryMapInfo->offset, pMemoryMapInfo->size, pMemoryMapInfo->flags, ppData); } @@ -2419,7 +2419,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL MapMemory2KHR(VkDevice device, const VkMem return MapMemory2(device, pMemoryMapInfo, ppData); } -static VKAPI_ATTR VkResult VKAPI_CALL UnmapMemory2(VkDevice device, const VkMemoryUnmapInfoKHR* pMemoryUnmapInfo) { +static VKAPI_ATTR VkResult VKAPI_CALL UnmapMemory2(VkDevice device, const VkMemoryUnmapInfo* pMemoryUnmapInfo) { UnmapMemory(device, pMemoryUnmapInfo->memory); return VK_SUCCESS; } diff --git a/tests/unit/android_external_resolve.cpp b/tests/unit/android_external_resolve.cpp index 88623cdc393..1a69c8b6bba 100644 --- a/tests/unit/android_external_resolve.cpp +++ b/tests/unit/android_external_resolve.cpp @@ -643,18 +643,18 @@ TEST_F(NegativeAndroidExternalResolve, DynamicRendering) { ivci.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}; const vkt::ImageView resolve_view(*m_device, ivci); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = color_view.handle(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.resolveMode = VK_RESOLVE_MODE_NONE; color_attachment.resolveImageView = resolve_view.handle(); color_attachment.resolveImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingAttachmentInfoKHR ds_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo ds_attachment = vku::InitStructHelper(); ds_attachment.imageView = VK_NULL_HANDLE; ds_attachment.resolveMode = VK_RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_ANDROID; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {32, 32}}; begin_rendering_info.colorAttachmentCount = 1; @@ -672,7 +672,7 @@ TEST_F(NegativeAndroidExternalResolve, DynamicRendering) { m_errorMonitor->VerifyFound(); begin_rendering_info.colorAttachmentCount = 2; - VkRenderingAttachmentInfoKHR attachments[2]{color_attachment, ds_attachment}; + VkRenderingAttachmentInfo attachments[2]{color_attachment, ds_attachment}; begin_rendering_info.pColorAttachments = attachments; begin_rendering_info.pDepthAttachment = nullptr; begin_rendering_info.pStencilAttachment = nullptr; @@ -740,13 +740,13 @@ TEST_F(NegativeAndroidExternalResolve, DynamicRenderingResolveModeNonNullColor) ivci.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}; const vkt::ImageView resolve_view(*m_device, ivci); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = color_view.handle(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.resolveMode = VK_RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_ANDROID; color_attachment.resolveImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {32, 32}}; begin_rendering_info.colorAttachmentCount = 1; @@ -895,14 +895,14 @@ TEST_F(NegativeAndroidExternalResolve, MissingImageUsage) { ivci.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}; const vkt::ImageView resolve_view(*m_device, ivci); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = color_view.handle(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.resolveMode = VK_RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_ANDROID; color_attachment.resolveImageView = resolve_view.handle(); color_attachment.resolveImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {32, 32}}; begin_rendering_info.colorAttachmentCount = 1; @@ -971,14 +971,14 @@ TEST_F(NegativeAndroidExternalResolve, ClearAttachment) { ivci.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}; const vkt::ImageView resolve_view(*m_device, ivci); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = color_view.handle(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.resolveMode = VK_RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_ANDROID; color_attachment.resolveImageView = resolve_view.handle(); color_attachment.resolveImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {32, 32}}; begin_rendering_info.colorAttachmentCount = 1; @@ -1058,14 +1058,14 @@ TEST_F(NegativeAndroidExternalResolve, DrawDynamicRasterizationSamples) { ivci.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}; const vkt::ImageView resolve_view(*m_device, ivci); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = color_view.handle(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.resolveMode = VK_RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_ANDROID; color_attachment.resolveImageView = resolve_view.handle(); color_attachment.resolveImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {32, 32}}; begin_rendering_info.colorAttachmentCount = 1; diff --git a/tests/unit/android_external_resolve_positive.cpp b/tests/unit/android_external_resolve_positive.cpp index 607600554bb..eedfdf925a7 100644 --- a/tests/unit/android_external_resolve_positive.cpp +++ b/tests/unit/android_external_resolve_positive.cpp @@ -288,14 +288,14 @@ TEST_F(PositiveAndroidExternalResolve, DynamicRendering) { ivci.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}; const vkt::ImageView resolve_view(*m_device, ivci); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = color_view.handle(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.resolveMode = VK_RESOLVE_MODE_EXTERNAL_FORMAT_DOWNSAMPLE_ANDROID; color_attachment.resolveImageView = resolve_view.handle(); color_attachment.resolveImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {32, 32}}; begin_rendering_info.colorAttachmentCount = 1; diff --git a/tests/unit/best_practices.cpp b/tests/unit/best_practices.cpp index cc20feb7e6a..29d82a44870 100644 --- a/tests/unit/best_practices.cpp +++ b/tests/unit/best_practices.cpp @@ -1160,8 +1160,8 @@ TEST_F(VkBestPracticesLayerTest, ThreadUpdateDescriptorUpdateAfterBindNoCollisio InitRenderTarget(); std::array flags = { - {VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT_EXT, VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT_EXT}}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT flags_create_info = vku::InitStructHelper(); + {VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT, VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT}}; + VkDescriptorSetLayoutBindingFlagsCreateInfo flags_create_info = vku::InitStructHelper(); flags_create_info.bindingCount = (uint32_t)flags.size(); flags_create_info.pBindingFlags = flags.data(); @@ -1170,8 +1170,8 @@ TEST_F(VkBestPracticesLayerTest, ThreadUpdateDescriptorUpdateAfterBindNoCollisio {0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_COMPUTE_BIT, nullptr}, {1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_COMPUTE_BIT, nullptr}, }, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, &flags_create_info, - VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &flags_create_info, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); vkt::Buffer buffer(*m_device, 256, VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT); @@ -1827,7 +1827,7 @@ TEST_F(VkBestPracticesLayerTest, ImageMemoryBarrierAccessLayoutCombinations) { nullptr, 0, nullptr, 1, &img_barrier); { - VkImageMemoryBarrier2KHR img_barrier2 = vku::InitStructHelper(); + VkImageMemoryBarrier2 img_barrier2 = vku::InitStructHelper(); img_barrier2.srcAccessMask = 0; img_barrier2.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED; img_barrier2.image = image.handle(); @@ -1837,7 +1837,7 @@ TEST_F(VkBestPracticesLayerTest, ImageMemoryBarrierAccessLayoutCombinations) { img_barrier2.subresourceRange.layerCount = 1; img_barrier2.subresourceRange.levelCount = 1; - VkDependencyInfoKHR dependency_info = vku::InitStructHelper(); + VkDependencyInfo dependency_info = vku::InitStructHelper(); dependency_info.imageMemoryBarrierCount = 1; dependency_info.pImageMemoryBarriers = &img_barrier2; @@ -2115,14 +2115,14 @@ TEST_F(VkBestPracticesLayerTest, IgnoreResolveImageView) { vkt::Image resolve_image(*m_device, image_create_info, vkt::set_layout); vkt::ImageView resolve_image_view = resolve_image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = image_view; color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.resolveMode = VK_RESOLVE_MODE_NONE; color_attachment.resolveImageLayout = VK_IMAGE_LAYOUT_GENERAL; color_attachment.resolveImageView = resolve_image_view; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; diff --git a/tests/unit/buffer.cpp b/tests/unit/buffer.cpp index 2efbde7f223..726df8d83ce 100644 --- a/tests/unit/buffer.cpp +++ b/tests/unit/buffer.cpp @@ -510,7 +510,7 @@ TEST_F(NegativeBuffer, IndexBufferOffset) { // Test for missing pNext struct for index buffer UINT8 type m_errorMonitor->SetDesiredError("VUID-vkCmdBindIndexBuffer-indexType-08787"); - vk::CmdBindIndexBuffer(m_command_buffer.handle(), buffer.handle(), 1, VK_INDEX_TYPE_UINT8_KHR); + vk::CmdBindIndexBuffer(m_command_buffer.handle(), buffer.handle(), 1, VK_INDEX_TYPE_UINT8); m_errorMonitor->VerifyFound(); m_command_buffer.EndRenderPass(); @@ -543,7 +543,7 @@ TEST_F(NegativeBuffer, IndexBuffer2Offset) { // Test for missing pNext struct for index buffer UINT8 type m_errorMonitor->SetDesiredError("VUID-vkCmdBindIndexBuffer2-indexType-08787"); - vk::CmdBindIndexBuffer2KHR(m_command_buffer.handle(), buffer.handle(), 1, VK_WHOLE_SIZE, VK_INDEX_TYPE_UINT8_KHR); + vk::CmdBindIndexBuffer2KHR(m_command_buffer.handle(), buffer.handle(), 1, VK_WHOLE_SIZE, VK_INDEX_TYPE_UINT8); m_errorMonitor->VerifyFound(); m_command_buffer.EndRenderPass(); @@ -612,7 +612,7 @@ TEST_F(NegativeBuffer, BufferUsageFlags2) { vkt::Buffer buffer(*m_device, 32, VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT | VK_BUFFER_USAGE_INDEX_BUFFER_BIT); VkBufferUsageFlags2CreateInfoKHR buffer_usage_flags = vku::InitStructHelper(); - buffer_usage_flags.usage = VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR | VK_BUFFER_USAGE_2_INDEX_BUFFER_BIT_KHR; + buffer_usage_flags.usage = VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT | VK_BUFFER_USAGE_2_INDEX_BUFFER_BIT; VkBufferViewCreateInfo buffer_view_ci = vku::InitStructHelper(&buffer_usage_flags); buffer_view_ci.format = VK_FORMAT_R8G8B8A8_UNORM; @@ -644,7 +644,7 @@ TEST_F(NegativeBuffer, BufferUsageFlags2Subset) { vkt::Buffer buffer(*m_device, 32, VK_BUFFER_USAGE_STORAGE_TEXEL_BUFFER_BIT); VkBufferUsageFlags2CreateInfoKHR buffer_usage_flags = vku::InitStructHelper(); - buffer_usage_flags.usage = VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR; + buffer_usage_flags.usage = VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT; VkBufferViewCreateInfo buffer_view_ci = vku::InitStructHelper(&buffer_usage_flags); buffer_view_ci.format = VK_FORMAT_R8G8B8A8_UNORM; diff --git a/tests/unit/buffer_positive.cpp b/tests/unit/buffer_positive.cpp index 5b31121b7ad..82d6b04985f 100644 --- a/tests/unit/buffer_positive.cpp +++ b/tests/unit/buffer_positive.cpp @@ -97,7 +97,7 @@ TEST_F(PositiveBuffer, DISABLED_PerfGetBufferAddressWorstCase) { // Allocate common buffer memory, all buffers will be bound to it so that they have the same starting address VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; VkMemoryAllocateInfo alloc_info = vku::InitStructHelper(&alloc_flags); alloc_info.allocationSize = 100 * 4096 * 4096; vkt::DeviceMemory buffer_memory(*m_device, alloc_info); @@ -140,7 +140,7 @@ TEST_F(PositiveBuffer, DISABLED_PerfGetBufferAddressGoodCase) { // Allocate common buffer memory, all buffers will be bound to it so that they have the same starting address VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; VkMemoryAllocateInfo alloc_info = vku::InitStructHelper(&alloc_flags); alloc_info.allocationSize = 100 * 4096 * 4096; vkt::DeviceMemory buffer_memory(*m_device, alloc_info); @@ -214,7 +214,7 @@ TEST_F(PositiveBuffer, BufferViewUsageBasic) { vkt::Buffer buffer(*m_device, 32, VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT); VkBufferUsageFlags2CreateInfoKHR buffer_usage_flags = vku::InitStructHelper(); - buffer_usage_flags.usage = VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR; + buffer_usage_flags.usage = VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT; VkBufferViewCreateInfo buffer_view_ci = vku::InitStructHelper(&buffer_usage_flags); buffer_view_ci.format = VK_FORMAT_R8G8B8A8_UNORM; @@ -230,11 +230,10 @@ TEST_F(PositiveBuffer, BufferUsageFlags2Subset) { AddRequiredFeature(vkt::Feature::maintenance5); RETURN_IF_SKIP(Init()); - vkt::Buffer buffer(*m_device, 32, - VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR | VK_BUFFER_USAGE_2_STORAGE_TEXEL_BUFFER_BIT_KHR); + vkt::Buffer buffer(*m_device, 32, VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT | VK_BUFFER_USAGE_2_STORAGE_TEXEL_BUFFER_BIT); VkBufferUsageFlags2CreateInfoKHR buffer_usage_flags = vku::InitStructHelper(); - buffer_usage_flags.usage = VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR; + buffer_usage_flags.usage = VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT; VkBufferViewCreateInfo buffer_view_ci = vku::InitStructHelper(&buffer_usage_flags); buffer_view_ci.format = VK_FORMAT_R8G8B8A8_UNORM; @@ -251,7 +250,7 @@ TEST_F(PositiveBuffer, BufferUsageFlags2Ignore) { RETURN_IF_SKIP(Init()); VkBufferUsageFlags2CreateInfoKHR buffer_usage_flags = vku::InitStructHelper(); - buffer_usage_flags.usage = VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR; + buffer_usage_flags.usage = VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT; VkBufferCreateInfo buffer_ci = vku::InitStructHelper(&buffer_usage_flags); buffer_ci.size = 32; diff --git a/tests/unit/command.cpp b/tests/unit/command.cpp index ca754449921..5a1d70339b0 100644 --- a/tests/unit/command.cpp +++ b/tests/unit/command.cpp @@ -240,10 +240,10 @@ TEST_F(NegativeCommand, Sync2CommandBufferTwoSubmits) { m_command_buffer.End(); // Bypass framework since it does the waits automatically - VkCommandBufferSubmitInfoKHR cb_info = vku::InitStructHelper(); + VkCommandBufferSubmitInfo cb_info = vku::InitStructHelper(); cb_info.commandBuffer = m_command_buffer.handle(); - VkSubmitInfo2KHR submit_info = vku::InitStructHelper(); + VkSubmitInfo2 submit_info = vku::InitStructHelper(); submit_info.commandBufferInfoCount = 1; submit_info.pCommandBufferInfos = &cb_info; @@ -423,7 +423,7 @@ TEST_F(NegativeCommand, PushConstant2PipelineLayoutCreateInfo) { InitRenderTarget(); const float data[16] = {}; - VkPushConstantsInfoKHR pc_info = vku::InitStructHelper(); + VkPushConstantsInfo pc_info = vku::InitStructHelper(); pc_info.stageFlags = VK_SHADER_STAGE_VERTEX_BIT; pc_info.offset = 32; pc_info.size = 16; @@ -1241,21 +1241,21 @@ TEST_F(NegativeCommand, ResolveInvalidSubresource) { // Equivalent test using KHR_copy_commands2 if (copy_commands2) { - const VkImageResolve2KHR resolveRegion2 = {VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2_KHR, - NULL, - resolveRegion.srcSubresource, - resolveRegion.srcOffset, - resolveRegion.dstSubresource, - resolveRegion.dstOffset, - resolveRegion.extent}; - const VkResolveImageInfo2KHR resolve_image_info2 = {VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2_KHR, - NULL, - srcImage.handle(), - VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - dstImage.handle(), - VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - 1, - &resolveRegion2}; + const VkImageResolve2 resolveRegion2 = {VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2, + NULL, + resolveRegion.srcSubresource, + resolveRegion.srcOffset, + resolveRegion.dstSubresource, + resolveRegion.dstOffset, + resolveRegion.extent}; + const VkResolveImageInfo2 resolve_image_info2 = {VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2, + NULL, + srcImage.handle(), + VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + dstImage.handle(), + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + 1, + &resolveRegion2}; m_errorMonitor->SetDesiredError("VUID-VkResolveImageInfo2-srcSubresource-01709"); vk::CmdResolveImage2KHR(m_command_buffer.handle(), &resolve_image_info2); m_errorMonitor->VerifyFound(); @@ -1271,21 +1271,21 @@ TEST_F(NegativeCommand, ResolveInvalidSubresource) { // Equivalent test using KHR_copy_commands2 if (copy_commands2) { - const VkImageResolve2KHR resolveRegion2 = {VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2_KHR, - NULL, - resolveRegion.srcSubresource, - resolveRegion.srcOffset, - resolveRegion.dstSubresource, - resolveRegion.dstOffset, - resolveRegion.extent}; - const VkResolveImageInfo2KHR resolve_image_info2 = {VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2_KHR, - NULL, - srcImage.handle(), - VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - dstImage.handle(), - VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - 1, - &resolveRegion2}; + const VkImageResolve2 resolveRegion2 = {VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2, + NULL, + resolveRegion.srcSubresource, + resolveRegion.srcOffset, + resolveRegion.dstSubresource, + resolveRegion.dstOffset, + resolveRegion.extent}; + const VkResolveImageInfo2 resolve_image_info2 = {VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2, + NULL, + srcImage.handle(), + VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + dstImage.handle(), + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + 1, + &resolveRegion2}; m_errorMonitor->SetDesiredError("VUID-VkResolveImageInfo2-dstSubresource-01710"); vk::CmdResolveImage2KHR(m_command_buffer.handle(), &resolve_image_info2); m_errorMonitor->VerifyFound(); @@ -1301,21 +1301,21 @@ TEST_F(NegativeCommand, ResolveInvalidSubresource) { // Equivalent test using KHR_copy_commands2 if (copy_commands2) { - const VkImageResolve2KHR resolveRegion2 = {VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2_KHR, - NULL, - resolveRegion.srcSubresource, - resolveRegion.srcOffset, - resolveRegion.dstSubresource, - resolveRegion.dstOffset, - resolveRegion.extent}; - const VkResolveImageInfo2KHR resolve_image_info2 = {VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2_KHR, - NULL, - srcImage.handle(), - VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - dstImage.handle(), - VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - 1, - &resolveRegion2}; + const VkImageResolve2 resolveRegion2 = {VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2, + NULL, + resolveRegion.srcSubresource, + resolveRegion.srcOffset, + resolveRegion.dstSubresource, + resolveRegion.dstOffset, + resolveRegion.extent}; + const VkResolveImageInfo2 resolve_image_info2 = {VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2, + NULL, + srcImage.handle(), + VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + dstImage.handle(), + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + 1, + &resolveRegion2}; m_errorMonitor->SetDesiredError("VUID-VkResolveImageInfo2-srcSubresource-01711"); vk::CmdResolveImage2KHR(m_command_buffer.handle(), &resolve_image_info2); m_errorMonitor->VerifyFound(); @@ -1331,21 +1331,21 @@ TEST_F(NegativeCommand, ResolveInvalidSubresource) { // Equivalent test using KHR_copy_commands2 if (copy_commands2) { - const VkImageResolve2KHR resolveRegion2 = {VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2_KHR, - NULL, - resolveRegion.srcSubresource, - resolveRegion.srcOffset, - resolveRegion.dstSubresource, - resolveRegion.dstOffset, - resolveRegion.extent}; - const VkResolveImageInfo2KHR resolve_image_info2 = {VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2_KHR, - NULL, - srcImage.handle(), - VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - dstImage.handle(), - VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - 1, - &resolveRegion2}; + const VkImageResolve2 resolveRegion2 = {VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2, + NULL, + resolveRegion.srcSubresource, + resolveRegion.srcOffset, + resolveRegion.dstSubresource, + resolveRegion.dstOffset, + resolveRegion.extent}; + const VkResolveImageInfo2 resolve_image_info2 = {VK_STRUCTURE_TYPE_RESOLVE_IMAGE_INFO_2, + NULL, + srcImage.handle(), + VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + dstImage.handle(), + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + 1, + &resolveRegion2}; m_errorMonitor->SetDesiredError("VUID-VkResolveImageInfo2-dstSubresource-01712"); vk::CmdResolveImage2KHR(m_command_buffer.handle(), &resolve_image_info2); m_errorMonitor->VerifyFound(); @@ -2666,7 +2666,7 @@ TEST_F(NegativeCommand, DescriptorSetPipelineBindPointMaintenance6) { vkt::CommandBuffer command_buffer(*m_device, command_pool); command_buffer.Begin(); - VkBindDescriptorSetsInfoKHR bind_ds_info = vku::InitStructHelper(); + VkBindDescriptorSetsInfo bind_ds_info = vku::InitStructHelper(); bind_ds_info.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT; bind_ds_info.layout = pipeline_layout.handle(); bind_ds_info.firstSet = 0; @@ -3212,7 +3212,7 @@ TEST_F(NegativeCommand, ClearDepthStencilWithAspectSeparate) { m_command_buffer.Begin(); - VkImageStencilUsageCreateInfoEXT image_stencil_create_info = vku::InitStructHelper(); + VkImageStencilUsageCreateInfo image_stencil_create_info = vku::InitStructHelper(); image_stencil_create_info.stencilUsage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; // not VK_IMAGE_USAGE_TRANSFER_DST_BIT image_create_info.pNext = &image_stencil_create_info; diff --git a/tests/unit/copy_buffer_image.cpp b/tests/unit/copy_buffer_image.cpp index 30f932269ad..58a0441c735 100644 --- a/tests/unit/copy_buffer_image.cpp +++ b/tests/unit/copy_buffer_image.cpp @@ -814,21 +814,21 @@ TEST_F(NegativeCopyBufferImage, CompressedImageMip) { // Equivalent test using KHR_copy_commands2 if (copy_commands2) { - const VkBufferImageCopy2KHR region2 = {VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2_KHR, - NULL, - region.bufferOffset, - region.bufferRowLength, - region.bufferImageHeight, - region.imageSubresource, - region.imageOffset, - region.imageExtent}; - const VkCopyBufferToImageInfo2KHR copy_buffer_to_image_info2 = {VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2_KHR, - NULL, - buffer_16.handle(), - image.handle(), - VK_IMAGE_LAYOUT_GENERAL, - 1, - ®ion2}; + const VkBufferImageCopy2 region2 = {VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2, + NULL, + region.bufferOffset, + region.bufferRowLength, + region.bufferImageHeight, + region.imageSubresource, + region.imageOffset, + region.imageExtent}; + const VkCopyBufferToImageInfo2 copy_buffer_to_image_info2 = {VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2, + NULL, + buffer_16.handle(), + image.handle(), + VK_IMAGE_LAYOUT_GENERAL, + 1, + ®ion2}; // imageOffset not a multiple of block size m_errorMonitor->SetDesiredError("VUID-VkCopyBufferToImageInfo2-dstImage-07274"); m_errorMonitor->SetDesiredError("VUID-VkCopyBufferToImageInfo2-dstImage-07275"); @@ -871,9 +871,9 @@ TEST_F(NegativeCopyBufferImage, Compressed) { RETURN_IF_SKIP(Init()); if (!FormatFeaturesAreSupported(Gpu(), VK_FORMAT_BC2_UNORM_BLOCK, VK_IMAGE_TILING_OPTIMAL, - VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR | VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR) || + VK_FORMAT_FEATURE_TRANSFER_SRC_BIT | VK_FORMAT_FEATURE_TRANSFER_DST_BIT) || !FormatFeaturesAreSupported(Gpu(), VK_FORMAT_BC3_UNORM_BLOCK, VK_IMAGE_TILING_OPTIMAL, - VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR | VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR)) { + VK_FORMAT_FEATURE_TRANSFER_SRC_BIT | VK_FORMAT_FEATURE_TRANSFER_DST_BIT)) { GTEST_SKIP() << "Required formats/features not supported"; } @@ -910,7 +910,7 @@ TEST_F(NegativeCopyBufferImage, CompressedMipLevels) { RETURN_IF_SKIP(Init()); if (!FormatFeaturesAreSupported(Gpu(), VK_FORMAT_BC2_UNORM_BLOCK, VK_IMAGE_TILING_OPTIMAL, - VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR | VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR)) { + VK_FORMAT_FEATURE_TRANSFER_SRC_BIT | VK_FORMAT_FEATURE_TRANSFER_DST_BIT)) { GTEST_SKIP() << "Required formats/features not supported"; } @@ -1091,23 +1091,24 @@ TEST_F(NegativeCopyBufferImage, ImageTypeExtentMismatch) { VK_IMAGE_LAYOUT_GENERAL, 1, ©_region); m_errorMonitor->VerifyFound(); - // Equivalent test using KHR_copy_commands2 + // Equivalent test using + if (copy_commands2) { - const VkImageCopy2KHR region2 = {VK_STRUCTURE_TYPE_IMAGE_COPY_2_KHR, - NULL, - copy_region.srcSubresource, - copy_region.srcOffset, - copy_region.dstSubresource, - copy_region.dstOffset, - copy_region.extent}; - const VkCopyImageInfo2KHR copy_image_info2 = {VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2_KHR, - NULL, - image_1D.handle(), - VK_IMAGE_LAYOUT_GENERAL, - image_2D.handle(), - VK_IMAGE_LAYOUT_GENERAL, - 1, - ®ion2}; + const VkImageCopy2 region2 = {VK_STRUCTURE_TYPE_IMAGE_COPY_2, + NULL, + copy_region.srcSubresource, + copy_region.srcOffset, + copy_region.dstSubresource, + copy_region.dstOffset, + copy_region.extent}; + const VkCopyImageInfo2 copy_image_info2 = {VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2, + NULL, + image_1D.handle(), + VK_IMAGE_LAYOUT_GENERAL, + image_2D.handle(), + VK_IMAGE_LAYOUT_GENERAL, + 1, + ®ion2}; m_errorMonitor->SetDesiredError("VUID-VkCopyImageInfo2-srcImage-00146"); m_errorMonitor->SetDesiredError("VUID-VkCopyImageInfo2-srcOffset-00145"); // also y-dim overrun m_errorMonitor->SetDesiredError("VUID-VkCopyImageInfo2-apiVersion-07933"); // not same image type @@ -1126,21 +1127,21 @@ TEST_F(NegativeCopyBufferImage, ImageTypeExtentMismatch) { // Equivalent test using KHR_copy_commands2 if (copy_commands2) { - const VkImageCopy2KHR region2 = {VK_STRUCTURE_TYPE_IMAGE_COPY_2_KHR, - NULL, - copy_region.srcSubresource, - copy_region.srcOffset, - copy_region.dstSubresource, - copy_region.dstOffset, - copy_region.extent}; - const VkCopyImageInfo2KHR copy_image_info2 = {VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2_KHR, - NULL, - image_2D.handle(), - VK_IMAGE_LAYOUT_GENERAL, - image_1D.handle(), - VK_IMAGE_LAYOUT_GENERAL, - 1, - ®ion2}; + const VkImageCopy2 region2 = {VK_STRUCTURE_TYPE_IMAGE_COPY_2, + NULL, + copy_region.srcSubresource, + copy_region.srcOffset, + copy_region.dstSubresource, + copy_region.dstOffset, + copy_region.extent}; + const VkCopyImageInfo2 copy_image_info2 = {VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2, + NULL, + image_2D.handle(), + VK_IMAGE_LAYOUT_GENERAL, + image_1D.handle(), + VK_IMAGE_LAYOUT_GENERAL, + 1, + ®ion2}; m_errorMonitor->SetDesiredError("VUID-VkCopyImageInfo2-dstImage-00152"); m_errorMonitor->SetDesiredError("VUID-VkCopyImageInfo2-dstOffset-00151"); // also y-dim overrun m_errorMonitor->SetDesiredError("VUID-VkCopyImageInfo2-apiVersion-07933"); // not same image type @@ -1161,21 +1162,21 @@ TEST_F(NegativeCopyBufferImage, ImageTypeExtentMismatch) { // Equivalent test using KHR_copy_commands2 if (copy_commands2) { - const VkImageCopy2KHR region2 = {VK_STRUCTURE_TYPE_IMAGE_COPY_2_KHR, - NULL, - copy_region.srcSubresource, - copy_region.srcOffset, - copy_region.dstSubresource, - copy_region.dstOffset, - copy_region.extent}; - const VkCopyImageInfo2KHR copy_image_info2 = {VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2_KHR, - NULL, - image_1D.handle(), - VK_IMAGE_LAYOUT_GENERAL, - image_2D.handle(), - VK_IMAGE_LAYOUT_GENERAL, - 1, - ®ion2}; + const VkImageCopy2 region2 = {VK_STRUCTURE_TYPE_IMAGE_COPY_2, + NULL, + copy_region.srcSubresource, + copy_region.srcOffset, + copy_region.dstSubresource, + copy_region.dstOffset, + copy_region.extent}; + const VkCopyImageInfo2 copy_image_info2 = {VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2, + NULL, + image_1D.handle(), + VK_IMAGE_LAYOUT_GENERAL, + image_2D.handle(), + VK_IMAGE_LAYOUT_GENERAL, + 1, + ®ion2}; m_errorMonitor->SetDesiredError("VUID-VkCopyImageInfo2-srcImage-00146"); m_errorMonitor->SetDesiredError("VUID-VkCopyImageInfo2-srcOffset-00145"); // also y-dim overrun m_errorMonitor->SetDesiredError("VUID-VkCopyImageInfo2-apiVersion-07933"); // not same image type @@ -1192,21 +1193,21 @@ TEST_F(NegativeCopyBufferImage, ImageTypeExtentMismatch) { // Equivalent test using KHR_copy_commands2 if (copy_commands2) { - const VkImageCopy2KHR region2 = {VK_STRUCTURE_TYPE_IMAGE_COPY_2_KHR, - NULL, - copy_region.srcSubresource, - copy_region.srcOffset, - copy_region.dstSubresource, - copy_region.dstOffset, - copy_region.extent}; - const VkCopyImageInfo2KHR copy_image_info2 = {VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2_KHR, - NULL, - image_2D.handle(), - VK_IMAGE_LAYOUT_GENERAL, - image_1D.handle(), - VK_IMAGE_LAYOUT_GENERAL, - 1, - ®ion2}; + const VkImageCopy2 region2 = {VK_STRUCTURE_TYPE_IMAGE_COPY_2, + NULL, + copy_region.srcSubresource, + copy_region.srcOffset, + copy_region.dstSubresource, + copy_region.dstOffset, + copy_region.extent}; + const VkCopyImageInfo2 copy_image_info2 = {VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2, + NULL, + image_2D.handle(), + VK_IMAGE_LAYOUT_GENERAL, + image_1D.handle(), + VK_IMAGE_LAYOUT_GENERAL, + 1, + ®ion2}; m_errorMonitor->SetDesiredError("VUID-VkCopyImageInfo2-dstImage-00152"); m_errorMonitor->SetDesiredError("VUID-VkCopyImageInfo2-dstOffset-00151"); // also y-dim overrun m_errorMonitor->SetDesiredError("VUID-VkCopyImageInfo2-apiVersion-07933"); // not same image type @@ -2415,7 +2416,7 @@ TEST_F(NegativeCopyBufferImage, CopyCommands2V13) { bic_region.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; bic_region.imageExtent = {4, 4, 1}; - VkCopyBufferToImageInfo2KHR buffer_image_info = vku::InitStructHelper(); + VkCopyBufferToImageInfo2 buffer_image_info = vku::InitStructHelper(); buffer_image_info.srcBuffer = src_buffer.handle(); buffer_image_info.dstImage = image.handle(); buffer_image_info.dstImageLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL; @@ -2666,7 +2667,7 @@ TEST_F(NegativeCopyBufferImage, BufferToCompressedImage) { // Verify format support if (!FormatFeaturesAreSupported(Gpu(), VK_FORMAT_BC1_RGBA_SRGB_BLOCK, VK_IMAGE_TILING_OPTIMAL, - VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR)) { + VK_FORMAT_FEATURE_TRANSFER_DST_BIT)) { GTEST_SKIP() << "Required formats/features not supported"; } @@ -2832,21 +2833,21 @@ TEST_F(NegativeCopyBufferImage, ImageMemory) { m_errorMonitor->VerifyFound(); if (copy_commands2) { - const VkImageCopy2KHR copy_region2 = {VK_STRUCTURE_TYPE_IMAGE_COPY_2_KHR, - NULL, - copy_region.srcSubresource, - copy_region.srcOffset, - copy_region.dstSubresource, - copy_region.dstOffset, - copy_region.extent}; - VkCopyImageInfo2KHR copy_image_info2 = {VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2_KHR, - NULL, - image_no_mem.handle(), - VK_IMAGE_LAYOUT_GENERAL, - image.handle(), - VK_IMAGE_LAYOUT_GENERAL, - 1, - ©_region2}; + const VkImageCopy2 copy_region2 = {VK_STRUCTURE_TYPE_IMAGE_COPY_2, + NULL, + copy_region.srcSubresource, + copy_region.srcOffset, + copy_region.dstSubresource, + copy_region.dstOffset, + copy_region.extent}; + VkCopyImageInfo2 copy_image_info2 = {VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2, + NULL, + image_no_mem.handle(), + VK_IMAGE_LAYOUT_GENERAL, + image.handle(), + VK_IMAGE_LAYOUT_GENERAL, + 1, + ©_region2}; m_errorMonitor->SetDesiredError("VUID-VkCopyImageInfo2-srcImage-07966"); m_errorMonitor->SetUnexpectedError("doesn't match the previously used layout VK_IMAGE_LAYOUT_GENERAL."); vk::CmdCopyImage2KHR(m_command_buffer.handle(), ©_image_info2); @@ -3064,10 +3065,10 @@ TEST_F(NegativeCopyBufferImage, Extents) { // equivalent test using KHR_copy_commands2 if (copy_commands2) { - const VkBufferCopy2KHR copy_info2 = {VK_STRUCTURE_TYPE_BUFFER_COPY_2_KHR, NULL, copy_info.srcOffset, copy_info.dstOffset, - copy_info.size}; - const VkCopyBufferInfo2KHR copy_buffer_info2 = { - VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2_KHR, NULL, buffer_one.handle(), buffer_two.handle(), 1, ©_info2}; + const VkBufferCopy2 copy_info2 = {VK_STRUCTURE_TYPE_BUFFER_COPY_2, NULL, copy_info.srcOffset, copy_info.dstOffset, + copy_info.size}; + const VkCopyBufferInfo2 copy_buffer_info2 = { + VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2, NULL, buffer_one.handle(), buffer_two.handle(), 1, ©_info2}; m_errorMonitor->SetDesiredError("VUID-VkCopyBufferInfo2-srcOffset-00113"); vk::CmdCopyBuffer2KHR(m_command_buffer.handle(), ©_buffer_info2); m_errorMonitor->VerifyFound(); @@ -3080,10 +3081,10 @@ TEST_F(NegativeCopyBufferImage, Extents) { // equivalent test using KHR_copy_commands2 if (copy_commands2) { - const VkBufferCopy2KHR copy_info2 = {VK_STRUCTURE_TYPE_BUFFER_COPY_2_KHR, NULL, copy_info.srcOffset, copy_info.dstOffset, - copy_info.size}; - const VkCopyBufferInfo2KHR copy_buffer_info2 = { - VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2_KHR, NULL, buffer_one.handle(), buffer_two.handle(), 1, ©_info2}; + const VkBufferCopy2 copy_info2 = {VK_STRUCTURE_TYPE_BUFFER_COPY_2, NULL, copy_info.srcOffset, copy_info.dstOffset, + copy_info.size}; + const VkCopyBufferInfo2 copy_buffer_info2 = { + VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2, NULL, buffer_one.handle(), buffer_two.handle(), 1, ©_info2}; m_errorMonitor->SetDesiredError("VUID-VkCopyBufferInfo2-dstOffset-00114"); vk::CmdCopyBuffer2KHR(m_command_buffer.handle(), ©_buffer_info2); m_errorMonitor->VerifyFound(); @@ -3096,9 +3097,9 @@ TEST_F(NegativeCopyBufferImage, Extents) { // equivalent test using KHR_copy_commands2 if (copy_commands2) { - const VkBufferCopy2KHR copy_info2 = {VK_STRUCTURE_TYPE_BUFFER_COPY_2_KHR, NULL, copy_info.srcOffset, copy_info.dstOffset, - copy_info.size}; - const VkCopyBufferInfo2KHR copy_buffer_info2 = { + const VkBufferCopy2 copy_info2 = {VK_STRUCTURE_TYPE_BUFFER_COPY_2, NULL, copy_info.srcOffset, copy_info.dstOffset, + copy_info.size}; + const VkCopyBufferInfo2 copy_buffer_info2 = { VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2_KHR, NULL, buffer_one.handle(), buffer_two.handle(), 1, ©_info2}; m_errorMonitor->SetDesiredError("VUID-VkCopyBufferInfo2-size-00115"); vk::CmdCopyBuffer2KHR(m_command_buffer.handle(), ©_buffer_info2); @@ -3112,9 +3113,9 @@ TEST_F(NegativeCopyBufferImage, Extents) { // equivalent test using KHR_copy_commands2 if (copy_commands2) { - const VkBufferCopy2KHR copy_info2 = {VK_STRUCTURE_TYPE_BUFFER_COPY_2_KHR, NULL, copy_info.srcOffset, copy_info.dstOffset, - copy_info.size}; - const VkCopyBufferInfo2KHR copy_buffer_info2 = { + const VkBufferCopy2 copy_info2 = {VK_STRUCTURE_TYPE_BUFFER_COPY_2, NULL, copy_info.srcOffset, copy_info.dstOffset, + copy_info.size}; + const VkCopyBufferInfo2 copy_buffer_info2 = { VK_STRUCTURE_TYPE_COPY_BUFFER_INFO_2_KHR, NULL, buffer_one.handle(), buffer_two.handle(), 1, ©_info2}; m_errorMonitor->SetDesiredError("VUID-VkCopyBufferInfo2-size-00116"); vk::CmdCopyBuffer2KHR(m_command_buffer.handle(), ©_buffer_info2); diff --git a/tests/unit/copy_buffer_image_positive.cpp b/tests/unit/copy_buffer_image_positive.cpp index 859a9c3d1d0..1ac49acb66d 100644 --- a/tests/unit/copy_buffer_image_positive.cpp +++ b/tests/unit/copy_buffer_image_positive.cpp @@ -264,9 +264,9 @@ TEST_F(PositiveCopyBufferImage, UncompressedToCompressedImage) { // Verify format support // Size-compatible (64-bit) formats. Uncompressed is 64 bits per texel, compressed is 64 bits per 4x4 block (or 4bpt). if (!FormatFeaturesAreSupported(Gpu(), VK_FORMAT_R16G16B16A16_UINT, VK_IMAGE_TILING_OPTIMAL, - VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR | VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR) || + VK_FORMAT_FEATURE_TRANSFER_SRC_BIT | VK_FORMAT_FEATURE_TRANSFER_DST_BIT) || !FormatFeaturesAreSupported(Gpu(), VK_FORMAT_BC1_RGBA_SRGB_BLOCK, VK_IMAGE_TILING_OPTIMAL, - VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR | VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR)) { + VK_FORMAT_FEATURE_TRANSFER_SRC_BIT | VK_FORMAT_FEATURE_TRANSFER_DST_BIT)) { GTEST_SKIP() << "Required formats/features not supported"; } @@ -321,9 +321,9 @@ TEST_F(PositiveCopyBufferImage, UncompressedToCompressedImage2) { // Size-compatible (64-bit) formats. Uncompressed is 64 bits per texel, compressed is 64 bits per 4x4 block (or 4bpt). if (!FormatFeaturesAreSupported(Gpu(), VK_FORMAT_R16G16B16A16_UINT, VK_IMAGE_TILING_OPTIMAL, - VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR | VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR) || + VK_FORMAT_FEATURE_TRANSFER_SRC_BIT | VK_FORMAT_FEATURE_TRANSFER_DST_BIT) || !FormatFeaturesAreSupported(Gpu(), VK_FORMAT_BC1_RGBA_SRGB_BLOCK, VK_IMAGE_TILING_OPTIMAL, - VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR | VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR)) { + VK_FORMAT_FEATURE_TRANSFER_SRC_BIT | VK_FORMAT_FEATURE_TRANSFER_DST_BIT)) { GTEST_SKIP() << "Required formats/features not supported"; } @@ -355,9 +355,9 @@ TEST_F(PositiveCopyBufferImage, Compressed) { RETURN_IF_SKIP(Init()); if (!FormatFeaturesAreSupported(Gpu(), VK_FORMAT_BC2_UNORM_BLOCK, VK_IMAGE_TILING_OPTIMAL, - VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR | VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR) || + VK_FORMAT_FEATURE_TRANSFER_SRC_BIT | VK_FORMAT_FEATURE_TRANSFER_DST_BIT) || !FormatFeaturesAreSupported(Gpu(), VK_FORMAT_BC3_UNORM_BLOCK, VK_IMAGE_TILING_OPTIMAL, - VK_FORMAT_FEATURE_TRANSFER_SRC_BIT_KHR | VK_FORMAT_FEATURE_TRANSFER_DST_BIT_KHR)) { + VK_FORMAT_FEATURE_TRANSFER_SRC_BIT | VK_FORMAT_FEATURE_TRANSFER_DST_BIT)) { GTEST_SKIP() << "Required formats/features not supported"; } diff --git a/tests/unit/debug_printf.cpp b/tests/unit/debug_printf.cpp index c4550a7729f..61fa0982408 100644 --- a/tests/unit/debug_printf.cpp +++ b/tests/unit/debug_printf.cpp @@ -2152,7 +2152,7 @@ TEST_F(NegativeDebugPrintf, ShaderObjectFragment) { GLSLToSPV(VK_SHADER_STAGE_VERTEX_BIT, kVertexDrawPassthroughGlsl)); const vkt::Shader frag_shader(*m_device, VK_SHADER_STAGE_FRAGMENT_BIT, GLSLToSPV(VK_SHADER_STAGE_FRAGMENT_BIT, fs_source)); - VkRenderingInfoKHR renderingInfo = vku::InitStructHelper(); + VkRenderingInfo renderingInfo = vku::InitStructHelper(); renderingInfo.colorAttachmentCount = 0; renderingInfo.layerCount = 1; renderingInfo.renderArea = {{0, 0}, {1, 1}}; @@ -2821,7 +2821,7 @@ TEST_F(NegativeDebugPrintf, DISABLED_ShaderObjectMultiCreate) { VkShaderEXT shaders[2]; vk::CreateShadersEXT(m_device->handle(), 2, shader_create_infos, nullptr, shaders); - VkRenderingInfoKHR renderingInfo = vku::InitStructHelper(); + VkRenderingInfo renderingInfo = vku::InitStructHelper(); renderingInfo.colorAttachmentCount = 0; renderingInfo.layerCount = 1; renderingInfo.renderArea = {{0, 0}, {1, 1}}; @@ -3799,7 +3799,7 @@ TEST_F(NegativeDebugPrintf, DeviceGeneratedCommandsCompute) { pre_process_size = mem_reqs2.memoryRequirements.size; } - VkBufferUsageFlags2CreateInfoKHR buffer_usage_flags = vku::InitStructHelper(); + VkBufferUsageFlags2CreateInfo buffer_usage_flags = vku::InitStructHelper(); buffer_usage_flags.usage = VK_BUFFER_USAGE_2_PREPROCESS_BUFFER_BIT_EXT | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT; VkBufferCreateInfo buffer_ci = vku::InitStructHelper(&buffer_usage_flags); buffer_ci.size = pre_process_size; @@ -3894,7 +3894,7 @@ TEST_F(NegativeDebugPrintf, DeviceGeneratedCommandsGraphics) { pre_process_size = mem_reqs2.memoryRequirements.size; } - VkBufferUsageFlags2CreateInfoKHR buffer_usage_flags = vku::InitStructHelper(); + VkBufferUsageFlags2CreateInfo buffer_usage_flags = vku::InitStructHelper(); buffer_usage_flags.usage = VK_BUFFER_USAGE_2_PREPROCESS_BUFFER_BIT_EXT | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT; VkBufferCreateInfo buffer_ci = vku::InitStructHelper(&buffer_usage_flags); buffer_ci.size = pre_process_size; @@ -3988,7 +3988,7 @@ TEST_F(NegativeDebugPrintf, DISABLED_DeviceGeneratedCommandsIES) { } )glsl"; - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreateComputePipelineHelper init_pipe(*this, &pipe_flags2); init_pipe.cs_ = std::make_unique(this, shader_source_1, VK_SHADER_STAGE_COMPUTE_BIT, SPV_ENV_VULKAN_1_1); @@ -4027,7 +4027,7 @@ TEST_F(NegativeDebugPrintf, DISABLED_DeviceGeneratedCommandsIES) { pre_process_size = mem_reqs2.memoryRequirements.size; } - VkBufferUsageFlags2CreateInfoKHR buffer_usage_flags = vku::InitStructHelper(); + VkBufferUsageFlags2CreateInfo buffer_usage_flags = vku::InitStructHelper(); buffer_usage_flags.usage = VK_BUFFER_USAGE_2_PREPROCESS_BUFFER_BIT_EXT | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT; VkBufferCreateInfo buffer_ci = vku::InitStructHelper(&buffer_usage_flags); buffer_ci.size = pre_process_size; @@ -4197,7 +4197,7 @@ TEST_F(NegativeDebugPrintf, InlineUniformBlock) { OneOffDescriptorSet descriptor_set(m_device, { {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, - {1, VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT, 8, VK_SHADER_STAGE_ALL, nullptr}, + {1, VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, 8, VK_SHADER_STAGE_ALL, nullptr}, {2, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, }, 0, nullptr, 0, nullptr, &pool_inline_info); @@ -4207,7 +4207,7 @@ TEST_F(NegativeDebugPrintf, InlineUniformBlock) { descriptor_set.UpdateDescriptorSets(); const uint32_t print_value = 5; - VkWriteDescriptorSetInlineUniformBlockEXT write_inline_uniform = vku::InitStructHelper(); + VkWriteDescriptorSetInlineUniformBlock write_inline_uniform = vku::InitStructHelper(); write_inline_uniform.dataSize = 4; write_inline_uniform.pData = &print_value; @@ -4216,7 +4216,7 @@ TEST_F(NegativeDebugPrintf, InlineUniformBlock) { descriptor_writes.dstBinding = 1; descriptor_writes.dstArrayElement = 4; // offset 4 bytes descriptor_writes.descriptorCount = 4; // Write 4 bytes - descriptor_writes.descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT; + descriptor_writes.descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK; vk::UpdateDescriptorSets(device(), 1, &descriptor_writes, 0, nullptr); CreateComputePipelineHelper pipe(*this); diff --git a/tests/unit/descriptor_buffer.cpp b/tests/unit/descriptor_buffer.cpp index b9c629f0d47..cea6d384063 100644 --- a/tests/unit/descriptor_buffer.cpp +++ b/tests/unit/descriptor_buffer.cpp @@ -157,7 +157,7 @@ TEST_F(NegativeDescriptorBuffer, SetLayoutInlineUniformBlockEXT) { VkPhysicalDeviceInlineUniformBlockPropertiesEXT inlineUniformProps = vku::InitStructHelper(); GetPhysicalDeviceProperties2(inlineUniformProps); - const VkDescriptorSetLayoutBinding binding{0, VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT, + const VkDescriptorSetLayoutBinding binding{0, VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, inlineUniformProps.maxInlineUniformBlockSize + 4, VK_SHADER_STAGE_FRAGMENT_BIT, nullptr}; const auto dslci = vku::InitStruct(nullptr, 0U, 1U, &binding); @@ -178,7 +178,7 @@ TEST_F(NegativeDescriptorBuffer, SetLayoutMutableDescriptorEXT) { const VkDescriptorSetLayoutBinding binding{0, VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE, 1, VK_SHADER_STAGE_FRAGMENT_BIT, nullptr}; const VkDescriptorSetLayoutCreateFlags flags = - VK_DESCRIPTOR_SET_LAYOUT_CREATE_DESCRIPTOR_BUFFER_BIT_EXT | VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_VALVE; + VK_DESCRIPTOR_SET_LAYOUT_CREATE_DESCRIPTOR_BUFFER_BIT_EXT | VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_EXT; const auto dslci = vku::InitStruct(nullptr, flags, 1U, &binding); VkDescriptorSetLayout dsl; m_errorMonitor->SetDesiredError("VUID-VkDescriptorSetLayoutCreateInfo-flags-08003"); @@ -853,7 +853,7 @@ TEST_F(NegativeDescriptorBuffer, BindingAndOffsets) { // Allocate common buffer memory VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; VkMemoryAllocateInfo alloc_info = vku::InitStructHelper(&alloc_flags); alloc_info.allocationSize = buffer_mem_reqs.size; m_device->Physical().SetMemoryType(buffer_mem_reqs.memoryTypeBits, &alloc_info, 0); @@ -1564,7 +1564,7 @@ TEST_F(NegativeDescriptorBuffer, Binding) { &descriptor_set.set_, 0, nullptr); m_errorMonitor->VerifyFound(); - VkBindDescriptorSetsInfoKHR bind_ds_info = vku::InitStructHelper(); + VkBindDescriptorSetsInfo bind_ds_info = vku::InitStructHelper(); bind_ds_info.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT; bind_ds_info.layout = pipeline_layout.handle(); bind_ds_info.firstSet = 0; diff --git a/tests/unit/descriptor_buffer_positive.cpp b/tests/unit/descriptor_buffer_positive.cpp index 7af145b8b73..d1e48a6beb9 100644 --- a/tests/unit/descriptor_buffer_positive.cpp +++ b/tests/unit/descriptor_buffer_positive.cpp @@ -82,7 +82,7 @@ TEST_F(PositiveDescriptorBuffer, BindBufferAndSetOffset) { } TEST_F(PositiveDescriptorBuffer, PipelineFlags2) { - TEST_DESCRIPTION("Use descriptor buffer with pipeline created with VkPipelineCreateFlags2CreateInfoKHR"); + TEST_DESCRIPTION("Use descriptor buffer with pipeline created with VkPipelineCreateFlags2CreateInfo"); AddRequiredExtensions(VK_KHR_BUFFER_DEVICE_ADDRESS_EXTENSION_NAME); AddRequiredExtensions(VK_KHR_MAINTENANCE_5_EXTENSION_NAME); AddRequiredFeature(vkt::Feature::maintenance5); @@ -100,7 +100,7 @@ TEST_F(PositiveDescriptorBuffer, PipelineFlags2) { const vkt::DescriptorSetLayout set_layout(*m_device, {binding}, VK_DESCRIPTOR_SET_LAYOUT_CREATE_DESCRIPTOR_BUFFER_BIT_EXT); const vkt::PipelineLayout pipeline_layout(*m_device, {&set_layout}); - VkPipelineCreateFlags2CreateInfoKHR flags_2_ci = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo flags_2_ci = vku::InitStructHelper(); flags_2_ci.flags = VK_PIPELINE_CREATE_2_DESCRIPTOR_BUFFER_BIT_EXT; CreatePipelineHelper pipe(*this, &flags_2_ci); diff --git a/tests/unit/descriptor_indexing.cpp b/tests/unit/descriptor_indexing.cpp index 7e22392c198..b00f671afaa 100644 --- a/tests/unit/descriptor_indexing.cpp +++ b/tests/unit/descriptor_indexing.cpp @@ -28,9 +28,9 @@ TEST_F(NegativeDescriptorIndexing, UpdateAfterBind) { RETURN_IF_SKIP(Init()); InitRenderTarget(); - VkDescriptorBindingFlagsEXT flags[3] = {0, VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT_EXT, - VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT_EXT}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT flags_create_info = vku::InitStructHelper(); + VkDescriptorBindingFlagsEXT flags[3] = {0, VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT, + VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT}; + VkDescriptorSetLayoutBindingFlagsCreateInfo flags_create_info = vku::InitStructHelper(); flags_create_info.bindingCount = 3; flags_create_info.pBindingFlags = &flags[0]; @@ -41,7 +41,7 @@ TEST_F(NegativeDescriptorIndexing, UpdateAfterBind) { {2, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_FRAGMENT_BIT, nullptr}, }; VkDescriptorSetLayoutCreateInfo ds_layout_ci = vku::InitStructHelper(&flags_create_info); - ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT; + ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT; ds_layout_ci.bindingCount = 3; ds_layout_ci.pBindings = &binding[0]; vkt::DescriptorSetLayout ds_layout(*m_device, ds_layout_ci); @@ -52,7 +52,7 @@ TEST_F(NegativeDescriptorIndexing, UpdateAfterBind) { {binding[2].descriptorType, binding[2].descriptorCount}, }; VkDescriptorPoolCreateInfo dspci = vku::InitStructHelper(); - dspci.flags = VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT; + dspci.flags = VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT; dspci.poolSizeCount = 3; dspci.pPoolSizes = &pool_sizes[0]; dspci.maxSets = 1; @@ -190,7 +190,7 @@ TEST_F(NegativeDescriptorIndexing, SetLayoutWithoutExtension) { RETURN_IF_SKIP(Init()); VkDescriptorSetLayoutCreateInfo ds_layout_ci = vku::InitStructHelper(); - ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT; + ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT; VkDescriptorSetLayout ds_layout = VK_NULL_HANDLE; @@ -208,8 +208,8 @@ TEST_F(NegativeDescriptorIndexing, SetLayout) { RETURN_IF_SKIP(Init()); std::array flags = { - {VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT_EXT, VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT_EXT}}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT flags_create_info = vku::InitStructHelper(); + {VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT, VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT}}; + VkDescriptorSetLayoutBindingFlagsCreateInfo flags_create_info = vku::InitStructHelper(); flags_create_info.bindingCount = size32(flags); flags_create_info.pBindingFlags = nullptr; @@ -226,7 +226,7 @@ TEST_F(NegativeDescriptorIndexing, SetLayout) { } { - // VU for VkDescriptorSetLayoutBindingFlagsCreateInfoEXT::bindingCount + // VU for VkDescriptorSetLayoutBindingFlagsCreateInfo::bindingCount flags_create_info.pBindingFlags = flags.data(); flags_create_info.bindingCount = 2; @@ -247,7 +247,7 @@ TEST_F(NegativeDescriptorIndexing, SetLayout) { m_errorMonitor->VerifyFound(); } { - ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT; + ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT; ds_layout_ci.bindingCount = 0; flags_create_info.bindingCount = 0; vkt::DescriptorSetLayout ds_layout(*m_device, ds_layout_ci); @@ -283,10 +283,10 @@ TEST_F(NegativeDescriptorIndexing, SetLayout) { ds_layout_ci.flags = 0; ds_layout_ci.bindingCount = 1; flags_create_info.bindingCount = 1; - flags[0] = VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT_EXT; + flags[0] = VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT; vkt::DescriptorSetLayout ds_layout(*m_device, ds_layout_ci); - VkDescriptorSetVariableDescriptorCountAllocateInfoEXT count_alloc_info = vku::InitStructHelper(); + VkDescriptorSetVariableDescriptorCountAllocateInfo count_alloc_info = vku::InitStructHelper(); count_alloc_info.descriptorSetCount = 1; // Set variable count larger than what was in the descriptor binding uint32_t variable_count = 2; @@ -308,7 +308,7 @@ TEST_F(NegativeDescriptorIndexing, SetLayout) { binding.descriptorCount = 3; vkt::DescriptorSetLayout ds_layout(*m_device, ds_layout_ci); - VkDescriptorSetVariableDescriptorCountAllocateInfoEXT count_alloc_info = vku::InitStructHelper(); + VkDescriptorSetVariableDescriptorCountAllocateInfo count_alloc_info = vku::InitStructHelper(); count_alloc_info.descriptorSetCount = 1; uint32_t variable_count = 2; count_alloc_info.pDescriptorCounts = &variable_count; @@ -366,12 +366,12 @@ TEST_F(NegativeDescriptorIndexing, SetLayoutBindings) { VkDescriptorBindingFlags flags[2] = {VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT, 0}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT flags_create_info = vku::InitStructHelper(); + VkDescriptorSetLayoutBindingFlagsCreateInfo flags_create_info = vku::InitStructHelper(); flags_create_info.bindingCount = 2; flags_create_info.pBindingFlags = flags; VkDescriptorSetLayoutCreateInfo create_info = vku::InitStructHelper(&flags_create_info); - create_info.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT; + create_info.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT; create_info.bindingCount = 2; create_info.pBindings = bindings; diff --git a/tests/unit/descriptor_indexing_positive.cpp b/tests/unit/descriptor_indexing_positive.cpp index 3479963b035..405c118819f 100644 --- a/tests/unit/descriptor_indexing_positive.cpp +++ b/tests/unit/descriptor_indexing_positive.cpp @@ -38,10 +38,10 @@ TEST_F(PositiveDescriptorIndexing, BindingPartiallyBound) { InitRenderTarget(); VkDescriptorBindingFlagsEXT ds_binding_flags[2] = {}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT layout_createinfo_binding_flags = vku::InitStructHelper(); + VkDescriptorSetLayoutBindingFlagsCreateInfo layout_createinfo_binding_flags = vku::InitStructHelper(); ds_binding_flags[0] = 0; // No Error - ds_binding_flags[1] = VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT; + ds_binding_flags[1] = VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT; // Uncomment for Error // ds_binding_flags[1] = 0; @@ -113,12 +113,12 @@ TEST_F(PositiveDescriptorIndexing, UpdateAfterBind) { {0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, {1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, }; - VkDescriptorBindingFlagsEXT flags[2] = {VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT_EXT, 0}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT flags_create_info = vku::InitStructHelper(); + VkDescriptorBindingFlagsEXT flags[2] = {VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT, 0}; + VkDescriptorSetLayoutBindingFlagsCreateInfo flags_create_info = vku::InitStructHelper(); flags_create_info.bindingCount = 2; flags_create_info.pBindingFlags = flags; - OneOffDescriptorSet descriptor_set(m_device, binding_defs, VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, - &flags_create_info, VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + OneOffDescriptorSet descriptor_set(m_device, binding_defs, VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, + &flags_create_info, VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout(*m_device, {&descriptor_set.layout_}); descriptor_set.WriteDescriptorBufferInfo(0, buffer1, 0, VK_WHOLE_SIZE, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER); @@ -158,10 +158,10 @@ TEST_F(PositiveDescriptorIndexing, UpdateAfterBind) { descriptor_set.WriteDescriptorBufferInfo(0, buffer2, 0, VK_WHOLE_SIZE, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER); descriptor_set.UpdateDescriptorSets(); - VkCommandBufferSubmitInfoKHR cb_info = vku::InitStructHelper(); + VkCommandBufferSubmitInfo cb_info = vku::InitStructHelper(); cb_info.commandBuffer = m_command_buffer.handle(); - VkSubmitInfo2KHR submit_info = vku::InitStructHelper(); + VkSubmitInfo2 submit_info = vku::InitStructHelper(); submit_info.commandBufferInfoCount = 1; submit_info.pCommandBufferInfos = &cb_info; @@ -190,11 +190,11 @@ TEST_F(PositiveDescriptorIndexing, PartiallyBoundDescriptors) { {1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, }; VkDescriptorBindingFlagsEXT flags[2] = {VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT, 0}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT flags_create_info = vku::InitStructHelper(); + VkDescriptorSetLayoutBindingFlagsCreateInfo flags_create_info = vku::InitStructHelper(); flags_create_info.bindingCount = 2; flags_create_info.pBindingFlags = flags; - OneOffDescriptorSet descriptor_set(m_device, binding_defs, VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, - &flags_create_info, VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + OneOffDescriptorSet descriptor_set(m_device, binding_defs, VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, + &flags_create_info, VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout(*m_device, {&descriptor_set.layout_}); descriptor_set.WriteDescriptorBufferInfo(0, buffer1, 0, VK_WHOLE_SIZE, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER); @@ -231,10 +231,10 @@ TEST_F(PositiveDescriptorIndexing, PartiallyBoundDescriptors) { buffer1.destroy(); - VkCommandBufferSubmitInfoKHR cb_info = vku::InitStructHelper(); + VkCommandBufferSubmitInfo cb_info = vku::InitStructHelper(); cb_info.commandBuffer = m_command_buffer.handle(); - VkSubmitInfo2KHR submit_info = vku::InitStructHelper(); + VkSubmitInfo2 submit_info = vku::InitStructHelper(); submit_info.commandBufferInfoCount = 1; submit_info.pCommandBufferInfos = &cb_info; diff --git a/tests/unit/descriptors.cpp b/tests/unit/descriptors.cpp index a9be91df5ba..e0d7dfa16a2 100644 --- a/tests/unit/descriptors.cpp +++ b/tests/unit/descriptors.cpp @@ -1115,7 +1115,7 @@ TEST_F(NegativeDescriptors, DynamicOffsetCasesMaintenance6) { m_command_buffer.Begin(); m_command_buffer.BeginRenderPass(m_renderPassBeginInfo); - VkBindDescriptorSetsInfoKHR bind_ds_info = vku::InitStructHelper(); + VkBindDescriptorSetsInfo bind_ds_info = vku::InitStructHelper(); bind_ds_info.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT; bind_ds_info.layout = pipeline_layout.handle(); bind_ds_info.firstSet = 0; @@ -1150,7 +1150,7 @@ TEST_F(NegativeDescriptors, BindDescriptorSetsInfoPipelineLayout) { m_command_buffer.Begin(); m_command_buffer.BeginRenderPass(m_renderPassBeginInfo); - VkBindDescriptorSetsInfoKHR bind_ds_info = vku::InitStructHelper(); + VkBindDescriptorSetsInfo bind_ds_info = vku::InitStructHelper(); bind_ds_info.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT; bind_ds_info.layout = CastToHandle(0xbaadb1be); bind_ds_info.firstSet = 0; @@ -1922,8 +1922,8 @@ TEST_F(NegativeDescriptors, DSUsageBitsFlags2) { GTEST_SKIP() << "Device does not support VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT for this format"; } - VkBufferUsageFlags2CreateInfoKHR buffer_usage_flags = vku::InitStructHelper(); - buffer_usage_flags.usage = VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR; + VkBufferUsageFlags2CreateInfo buffer_usage_flags = vku::InitStructHelper(); + buffer_usage_flags.usage = VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT; VkBufferCreateInfo buffer_create_info = vku::InitStructHelper(&buffer_usage_flags); buffer_create_info.size = 1024; @@ -2535,7 +2535,7 @@ TEST_F(NegativeDescriptors, InlineUniformBlockEXT) { // Test too many bindings dslb_vec.clear(); dslb.binding = 0; - dslb.descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT; + dslb.descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK; dslb.descriptorCount = 4; dslb.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT; @@ -2589,7 +2589,7 @@ TEST_F(NegativeDescriptors, InlineUniformBlockEXT) { // Pool size must be a multiple of 4 VkDescriptorPoolSize ds_type_count = {}; - ds_type_count.type = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT; + ds_type_count.type = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK; ds_type_count.descriptorCount = 33; VkDescriptorPoolCreateInfo ds_pool_ci = vku::InitStructHelper(&pool_inline_info); @@ -2612,7 +2612,7 @@ TEST_F(NegativeDescriptors, InlineUniformBlockEXT) { // Create two valid sets with 8 bytes each dslb_vec.clear(); dslb.binding = 0; - dslb.descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT; + dslb.descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK; dslb.descriptorCount = 8; dslb.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT; dslb_vec.push_back(dslb); @@ -2634,7 +2634,7 @@ TEST_F(NegativeDescriptors, InlineUniformBlockEXT) { ASSERT_EQ(VK_SUCCESS, err); uint32_t dummyData[8] = {}; - VkWriteDescriptorSetInlineUniformBlockEXT write_inline_uniform = vku::InitStructHelper(); + VkWriteDescriptorSetInlineUniformBlock write_inline_uniform = vku::InitStructHelper(); write_inline_uniform.dataSize = 3; write_inline_uniform.pData = &dummyData[0]; @@ -2644,7 +2644,7 @@ TEST_F(NegativeDescriptors, InlineUniformBlockEXT) { descriptor_write.dstBinding = 0; descriptor_write.dstArrayElement = 0; descriptor_write.descriptorCount = 3; - descriptor_write.descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT; + descriptor_write.descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK; // one for dataSiz and for descriptorCount m_errorMonitor->SetDesiredError("VUID-VkWriteDescriptorSet-descriptorType-02220"); @@ -2709,7 +2709,7 @@ TEST_F(NegativeDescriptors, InlineUniformBlockEXTFeature) { VkDescriptorSetLayoutBinding dslb = {}; dslb.binding = 0; - dslb.descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT; + dslb.descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK; dslb.descriptorCount = 1; dslb.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT; @@ -2730,7 +2730,7 @@ TEST_F(NegativeDescriptors, MaxInlineUniformBlockBindings) { RETURN_IF_SKIP(Init()); VkDescriptorPoolSize ds_type_count = {}; - ds_type_count.type = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT; + ds_type_count.type = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK; ds_type_count.descriptorCount = 16; VkDescriptorPoolCreateInfo ds_pool_ci = vku::InitStructHelper(); @@ -3287,8 +3287,8 @@ TEST_F(NegativeDescriptors, DescriptorUpdateOfMultipleBindingWithOneUpdateCall) VkDescriptorSetLayoutBinding layoutBinding[3] = {}; uint32_t bindingCount[] = {sizeof(inline_data) / 2, 0, sizeof(inline_data) / 2}; uint32_t bindingPoint[] = {0, 1, 2}; - VkDescriptorType descType[] = {VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC, - VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT}; + VkDescriptorType descType[] = {VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC, + VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK}; for (size_t i = 0; i < 3; ++i) { layoutBinding[i].binding = bindingPoint[i]; layoutBinding[i].descriptorCount = bindingCount[i]; @@ -3312,12 +3312,12 @@ TEST_F(NegativeDescriptors, DescriptorUpdateOfMultipleBindingWithOneUpdateCall) vkt::DescriptorPool descPool; { - VkDescriptorPoolInlineUniformBlockCreateInfoEXT descPoolInlineInfo = vku::InitStructHelper(); + VkDescriptorPoolInlineUniformBlockCreateInfo descPoolInlineInfo = vku::InitStructHelper(); descPoolInlineInfo.maxInlineUniformBlockBindings = 2; VkDescriptorPoolSize poolSize[2]; poolSize[0].descriptorCount = sizeof(inline_data); - poolSize[0].type = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT; + poolSize[0].type = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK; poolSize[1].descriptorCount = 1; poolSize[1].type = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC; @@ -3345,13 +3345,13 @@ TEST_F(NegativeDescriptors, DescriptorUpdateOfMultipleBindingWithOneUpdateCall) } vkt::DescriptorSet descSet(*m_device, &descPool, descSetHandle); - VkWriteDescriptorSetInlineUniformBlockEXT writeInlineUbDesc = vku::InitStructHelper(); + VkWriteDescriptorSetInlineUniformBlock writeInlineUbDesc = vku::InitStructHelper(); writeInlineUbDesc.dataSize = sizeof(inline_data); writeInlineUbDesc.pData = inline_data; VkWriteDescriptorSet writeDesc = vku::InitStructHelper(&writeInlineUbDesc); writeDesc.descriptorCount = sizeof(inline_data); - writeDesc.descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT; + writeDesc.descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK; writeDesc.dstBinding = 0; writeDesc.dstArrayElement = 0; writeDesc.dstSet = descSet.handle(); @@ -3497,7 +3497,7 @@ TEST_F(NegativeDescriptors, MutableDescriptors) { vk::CreateDescriptorSetLayout(device(), &ds_layout_ci, NULL, &ds_layout); m_errorMonitor->VerifyFound(); - descriptor_types[1] = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT; + descriptor_types[1] = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK; m_errorMonitor->SetDesiredError("VUID-VkMutableDescriptorTypeListEXT-pDescriptorTypes-04603"); vk::CreateDescriptorSetLayout(device(), &ds_layout_ci, NULL, &ds_layout); m_errorMonitor->VerifyFound(); @@ -4016,7 +4016,7 @@ TEST_F(NegativeDescriptors, DISABLED_AllocatingVariableDescriptorSets) { RETURN_IF_SKIP(Init()); VkDescriptorBindingFlagsEXT flags[2] = {0, VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT flags_create_info = vku::InitStructHelper(); + VkDescriptorSetLayoutBindingFlagsCreateInfo flags_create_info = vku::InitStructHelper(); flags_create_info.bindingCount = 2; flags_create_info.pBindingFlags = flags; @@ -4029,7 +4029,7 @@ TEST_F(NegativeDescriptors, DISABLED_AllocatingVariableDescriptorSets) { vkt::DescriptorSetLayout ds_layout(*m_device, ds_layout_ci); VkDescriptorSetLayout ds_layout_handle = ds_layout.handle(); - VkDescriptorSetVariableDescriptorCountAllocateInfoEXT count_alloc_info = vku::InitStructHelper(); + VkDescriptorSetVariableDescriptorCountAllocateInfo count_alloc_info = vku::InitStructHelper(); count_alloc_info.descriptorSetCount = 1; uint32_t variable_count = 2; count_alloc_info.pDescriptorCounts = &variable_count; @@ -4633,9 +4633,9 @@ TEST_F(NegativeDescriptors, SampledImageDepthComparisonForFormat) { vk::GetPhysicalDeviceFormatProperties2KHR(Gpu(), (VkFormat)fmt, &fmt_props); - const bool has_sampling = (fmt_props_3.optimalTilingFeatures & VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT_KHR) != 0; + const bool has_sampling = (fmt_props_3.optimalTilingFeatures & VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT) != 0; const bool has_sampling_img_depth_compare = - (fmt_props_3.optimalTilingFeatures & VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT_KHR) != 0; + (fmt_props_3.optimalTilingFeatures & VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT) != 0; if (has_sampling && !has_sampling_img_depth_compare) { format = (VkFormat)fmt; @@ -4861,7 +4861,7 @@ TEST_F(NegativeDescriptors, DescriptorIndexingMissingFeatures) { RETURN_IF_SKIP(Init()); VkDescriptorBindingFlagsEXT flag = VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT flags_create_info = vku::InitStructHelper(); + VkDescriptorSetLayoutBindingFlagsCreateInfo flags_create_info = vku::InitStructHelper(); flags_create_info.bindingCount = 1u; flags_create_info.pBindingFlags = &flag; @@ -4944,12 +4944,12 @@ TEST_F(NegativeDescriptors, IncompatibleDescriptorFlagsWithBindingFlags) { bindings[1].pImmutableSamplers = nullptr; VkDescriptorBindingFlagsEXT binding_flags[] = {VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT, 0}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT flags_create_info = vku::InitStructHelper(); + VkDescriptorSetLayoutBindingFlagsCreateInfo flags_create_info = vku::InitStructHelper(); flags_create_info.bindingCount = 1u; flags_create_info.pBindingFlags = binding_flags; VkDescriptorSetLayoutCreateInfo create_info = vku::InitStructHelper(&flags_create_info); - create_info.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR; + create_info.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT; create_info.bindingCount = 1u; create_info.pBindings = bindings; @@ -5120,7 +5120,7 @@ TEST_F(NegativeDescriptors, PushDescriptorWithoutInfo) { { {0, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, VK_SHADER_STAGE_FRAGMENT_BIT, nullptr}, }, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT); const vkt::PipelineLayout pipeline_layout(*m_device, {&descriptor_set.layout_}); diff --git a/tests/unit/descriptors_positive.cpp b/tests/unit/descriptors_positive.cpp index 8c61e609c6d..2e2b6f92d50 100644 --- a/tests/unit/descriptors_positive.cpp +++ b/tests/unit/descriptors_positive.cpp @@ -914,8 +914,8 @@ TEST_F(PositiveDescriptors, DSUsageBitsFlags2) { GTEST_SKIP() << "Device does not support VK_FORMAT_FEATURE_STORAGE_TEXEL_BUFFER_BIT for this format"; } - VkBufferUsageFlags2CreateInfoKHR buffer_usage_flags = vku::InitStructHelper(); - buffer_usage_flags.usage = VK_BUFFER_USAGE_2_STORAGE_TEXEL_BUFFER_BIT_KHR; + VkBufferUsageFlags2CreateInfo buffer_usage_flags = vku::InitStructHelper(); + buffer_usage_flags.usage = VK_BUFFER_USAGE_2_STORAGE_TEXEL_BUFFER_BIT; VkBufferCreateInfo buffer_create_info = vku::InitStructHelper(&buffer_usage_flags); buffer_create_info.size = 1024; diff --git a/tests/unit/device_generated_commands.cpp b/tests/unit/device_generated_commands.cpp index aa237f1d015..dcbc6671f71 100644 --- a/tests/unit/device_generated_commands.cpp +++ b/tests/unit/device_generated_commands.cpp @@ -85,7 +85,7 @@ TEST_F(NegativeDeviceGeneratedCommands, IndirectCommandShaderStageBinding) { GTEST_SKIP() << "VK_SHADER_STAGE_COMPUTE_BIT is supported."; } - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateGraphicsPipeline(); @@ -110,7 +110,7 @@ TEST_F(NegativeDeviceGeneratedCommands, IndirectCommandMaxPipelineCount) { RETURN_IF_SKIP(InitBasicDeviceGeneratedCommands()); InitRenderTarget(); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateGraphicsPipeline(); @@ -152,7 +152,7 @@ TEST_F(NegativeDeviceGeneratedCommands, IndirectCommandDescriptorType) { }); vkt::PipelineLayout pipeline_layout(*m_device, {&descriptor_set_0.layout_, &descriptor_set_1.layout_}); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper pipe(*this, &pipe_flags2); pipe.gp_ci_.layout = pipeline_layout.handle(); @@ -634,7 +634,7 @@ TEST_F(NegativeDeviceGeneratedCommands, CmdExecuteGeneratedCommandsSecondary) { RETURN_IF_SKIP(InitBasicDeviceGeneratedCommands()); InitRenderTarget(); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateGraphicsPipeline(); @@ -663,8 +663,7 @@ TEST_F(NegativeDeviceGeneratedCommands, CmdExecuteGeneratedCommandsSecondary) { VkMemoryAllocateFlagsInfo allocate_flag_info = vku::InitStructHelper(); allocate_flag_info.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; - vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR, kHostVisibleMemProps, - &allocate_flag_info); + vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, kHostVisibleMemProps, &allocate_flag_info); VkGeneratedCommandsInfoEXT generated_commands_info = vku::InitStructHelper(); generated_commands_info.shaderStages = VK_SHADER_STAGE_VERTEX_BIT; @@ -703,7 +702,7 @@ TEST_F(NegativeDeviceGeneratedCommands, UpdateIESPipelineWriteCount) { RETURN_IF_SKIP(InitBasicDeviceGeneratedCommands()); InitRenderTarget(); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateGraphicsPipeline(); @@ -731,7 +730,7 @@ TEST_F(NegativeDeviceGeneratedCommands, UpdateIESPipelineIndex) { RETURN_IF_SKIP(InitBasicDeviceGeneratedCommands()); InitRenderTarget(); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateGraphicsPipeline(); @@ -750,7 +749,7 @@ TEST_F(NegativeDeviceGeneratedCommands, UpdateIESPipelineDynamicState) { RETURN_IF_SKIP(InitBasicDeviceGeneratedCommands()); InitRenderTarget(); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper init_pipe(*this, &pipe_flags2); init_pipe.AddDynamicState(VK_DYNAMIC_STATE_VIEWPORT); @@ -774,7 +773,7 @@ TEST_F(NegativeDeviceGeneratedCommands, UpdateIESPipelineFragmentOutput) { RETURN_IF_SKIP(InitBasicDeviceGeneratedCommands()); InitRenderTarget(); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper init_pipe(*this, &pipe_flags2); init_pipe.CreateGraphicsPipeline(); @@ -807,7 +806,7 @@ TEST_F(NegativeDeviceGeneratedCommands, UpdateIESPipelineFragDepth) { InitRenderTarget(); // has no FragDepth - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper init_pipe(*this, &pipe_flags2); init_pipe.CreateGraphicsPipeline(); @@ -840,7 +839,7 @@ TEST_F(NegativeDeviceGeneratedCommands, UpdateIESPipelineSampleMask) { InitRenderTarget(); // has no SampleMask - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper init_pipe(*this, &pipe_flags2); init_pipe.CreateGraphicsPipeline(); @@ -874,7 +873,7 @@ TEST_F(NegativeDeviceGeneratedCommands, UpdateIESPipelineStencilExportEXT) { InitRenderTarget(); // has no StencilExportEXT - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper init_pipe(*this, &pipe_flags2); init_pipe.CreateGraphicsPipeline(); @@ -917,7 +916,7 @@ TEST_F(NegativeDeviceGeneratedCommands, UpdateIESPipelineShaderStages) { } // has no StencilExportEXT - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper init_pipe(*this, &pipe_flags2); init_pipe.CreateGraphicsPipeline(); @@ -967,7 +966,7 @@ TEST_F(NegativeDeviceGeneratedCommands, UpdateIESPipelineCompatible) { )glsl"; VkShaderObj vs(this, vs_source, VK_SHADER_STAGE_VERTEX_BIT); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper init_pipe(*this, &pipe_flags2); init_pipe.gp_ci_.layout = pipeline_layout_vert.handle(); @@ -994,7 +993,7 @@ TEST_F(NegativeDeviceGeneratedCommands, UpdateIESMixShaderObjectPipeline) { RETURN_IF_SKIP(InitBasicDeviceGeneratedCommands()); InitRenderTarget(); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateGraphicsPipeline(); @@ -1404,7 +1403,7 @@ TEST_F(NegativeDeviceGeneratedCommands, GetRequirementsExecutionSetTokenStage) { command_layout_ci.pTokens = tokens; vkt::IndirectCommandsLayout command_layout(*m_device, command_layout_ci); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper init_pipe(*this, &pipe_flags2); init_pipe.CreateGraphicsPipeline(); // vert and frag @@ -1439,7 +1438,7 @@ TEST_F(NegativeDeviceGeneratedCommands, GetRequirementsMaxIndirectSequenceCount) command_layout_ci.pTokens = &token; vkt::IndirectCommandsLayout command_layout(*m_device, command_layout_ci); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateGraphicsPipeline(); @@ -1480,7 +1479,7 @@ TEST_F(NegativeDeviceGeneratedCommands, GetRequirementsExecutionSetToken) { vkt::IndirectCommandsLayout command_layout(*m_device, command_layout_ci); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreateComputePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateComputePipeline(); @@ -1538,7 +1537,7 @@ TEST_F(NegativeDeviceGeneratedCommands, GetRequirementsNoExecutionTokenNullIES) command_layout_ci.pTokens = &token; vkt::IndirectCommandsLayout command_layout(*m_device, command_layout_ci); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateGraphicsPipeline(); @@ -1578,7 +1577,7 @@ TEST_F(NegativeDeviceGeneratedCommands, ExecuteNoBoundPipeline) { command_layout_ci.pTokens = tokens; vkt::IndirectCommandsLayout command_layout(*m_device, command_layout_ci); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreateComputePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateComputePipeline(); @@ -1586,8 +1585,7 @@ TEST_F(NegativeDeviceGeneratedCommands, ExecuteNoBoundPipeline) { VkMemoryAllocateFlagsInfo allocate_flag_info = vku::InitStructHelper(); allocate_flag_info.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; - vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR, kHostVisibleMemProps, - &allocate_flag_info); + vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, kHostVisibleMemProps, &allocate_flag_info); VkGeneratedCommandsInfoEXT generated_commands_info = vku::InitStructHelper(); generated_commands_info.shaderStages = VK_SHADER_STAGE_COMPUTE_BIT; @@ -1653,8 +1651,7 @@ TEST_F(NegativeDeviceGeneratedCommands, ExecuteNoBoundShaderObject) { VkMemoryAllocateFlagsInfo allocate_flag_info = vku::InitStructHelper(); allocate_flag_info.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; - vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR, kHostVisibleMemProps, - &allocate_flag_info); + vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, kHostVisibleMemProps, &allocate_flag_info); VkGeneratedCommandsInfoEXT generated_commands_info = vku::InitStructHelper(); generated_commands_info.shaderStages = VK_SHADER_STAGE_VERTEX_BIT; @@ -1698,7 +1695,7 @@ TEST_F(NegativeDeviceGeneratedCommands, ExecuteIsPreprocessed) { command_layout_ci.pTokens = tokens; vkt::IndirectCommandsLayout command_layout(*m_device, command_layout_ci); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreateComputePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateComputePipeline(); @@ -1706,8 +1703,7 @@ TEST_F(NegativeDeviceGeneratedCommands, ExecuteIsPreprocessed) { VkMemoryAllocateFlagsInfo allocate_flag_info = vku::InitStructHelper(); allocate_flag_info.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; - vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR, kHostVisibleMemProps, - &allocate_flag_info); + vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, kHostVisibleMemProps, &allocate_flag_info); VkGeneratedCommandsInfoEXT generated_commands_info = vku::InitStructHelper(); generated_commands_info.shaderStages = VK_SHADER_STAGE_COMPUTE_BIT; @@ -1752,7 +1748,7 @@ TEST_F(NegativeDeviceGeneratedCommands, PreprocessNoBoundPipeline) { command_layout_ci.pTokens = tokens; vkt::IndirectCommandsLayout command_layout(*m_device, command_layout_ci); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreateComputePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateComputePipeline(); @@ -1760,8 +1756,7 @@ TEST_F(NegativeDeviceGeneratedCommands, PreprocessNoBoundPipeline) { VkMemoryAllocateFlagsInfo allocate_flag_info = vku::InitStructHelper(); allocate_flag_info.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; - vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR, kHostVisibleMemProps, - &allocate_flag_info); + vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, kHostVisibleMemProps, &allocate_flag_info); VkGeneratedCommandsInfoEXT generated_commands_info = vku::InitStructHelper(); generated_commands_info.shaderStages = VK_SHADER_STAGE_COMPUTE_BIT; @@ -1809,7 +1804,7 @@ TEST_F(NegativeDeviceGeneratedCommands, PreprocessRecordingState) { command_layout_ci.pTokens = tokens; vkt::IndirectCommandsLayout command_layout(*m_device, command_layout_ci); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreateComputePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateComputePipeline(); @@ -1817,8 +1812,7 @@ TEST_F(NegativeDeviceGeneratedCommands, PreprocessRecordingState) { VkMemoryAllocateFlagsInfo allocate_flag_info = vku::InitStructHelper(); allocate_flag_info.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; - vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR, kHostVisibleMemProps, - &allocate_flag_info); + vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, kHostVisibleMemProps, &allocate_flag_info); VkGeneratedCommandsInfoEXT generated_commands_info = vku::InitStructHelper(); generated_commands_info.shaderStages = VK_SHADER_STAGE_COMPUTE_BIT; @@ -1872,7 +1866,7 @@ TEST_F(NegativeDeviceGeneratedCommands, PreprocessCommandLayoutFlag) { command_layout_ci.pTokens = tokens; vkt::IndirectCommandsLayout command_layout(*m_device, command_layout_ci); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreateComputePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateComputePipeline(); @@ -1880,8 +1874,7 @@ TEST_F(NegativeDeviceGeneratedCommands, PreprocessCommandLayoutFlag) { VkMemoryAllocateFlagsInfo allocate_flag_info = vku::InitStructHelper(); allocate_flag_info.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; - vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR, kHostVisibleMemProps, - &allocate_flag_info); + vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, kHostVisibleMemProps, &allocate_flag_info); VkGeneratedCommandsInfoEXT generated_commands_info = vku::InitStructHelper(); generated_commands_info.shaderStages = VK_SHADER_STAGE_COMPUTE_BIT; @@ -1936,7 +1929,7 @@ TEST_F(NegativeDeviceGeneratedCommands, GeneratedCommandsInfoDynamicVertex) { command_layout_ci.pTokens = tokens; vkt::IndirectCommandsLayout command_layout(*m_device, command_layout_ci); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper pipe(*this, &pipe_flags2); // Missing VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE pipe.CreateGraphicsPipeline(); @@ -1944,8 +1937,7 @@ TEST_F(NegativeDeviceGeneratedCommands, GeneratedCommandsInfoDynamicVertex) { VkMemoryAllocateFlagsInfo allocate_flag_info = vku::InitStructHelper(); allocate_flag_info.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; - vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR, kHostVisibleMemProps, - &allocate_flag_info); + vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, kHostVisibleMemProps, &allocate_flag_info); VkGeneratedCommandsInfoEXT generated_commands_info = vku::InitStructHelper(); generated_commands_info.shaderStages = VK_SHADER_STAGE_VERTEX_BIT; @@ -1981,7 +1973,7 @@ TEST_F(NegativeDeviceGeneratedCommands, GeneratedCommandsInfoAddresses) { command_layout_ci.pTokens = &token; vkt::IndirectCommandsLayout command_layout(*m_device, command_layout_ci); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreateComputePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateComputePipeline(); @@ -1989,8 +1981,7 @@ TEST_F(NegativeDeviceGeneratedCommands, GeneratedCommandsInfoAddresses) { VkMemoryAllocateFlagsInfo allocate_flag_info = vku::InitStructHelper(); allocate_flag_info.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; - vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR, kHostVisibleMemProps, - &allocate_flag_info); + vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, kHostVisibleMemProps, &allocate_flag_info); VkGeneratedCommandsInfoEXT generated_commands_info = vku::InitStructHelper(); generated_commands_info.shaderStages = VK_SHADER_STAGE_COMPUTE_BIT; @@ -2037,7 +2028,7 @@ TEST_F(NegativeDeviceGeneratedCommands, GeneratedCommandsInfoMultiDrawLimit) { command_layout_ci.pTokens = tokens; vkt::IndirectCommandsLayout command_layout(*m_device, command_layout_ci); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateGraphicsPipeline(); @@ -2045,8 +2036,7 @@ TEST_F(NegativeDeviceGeneratedCommands, GeneratedCommandsInfoMultiDrawLimit) { VkMemoryAllocateFlagsInfo allocate_flag_info = vku::InitStructHelper(); allocate_flag_info.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; - vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR, kHostVisibleMemProps, - &allocate_flag_info); + vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, kHostVisibleMemProps, &allocate_flag_info); VkGeneratedCommandsInfoEXT generated_commands_info = vku::InitStructHelper(); generated_commands_info.shaderStages = VK_SHADER_STAGE_VERTEX_BIT; @@ -2092,7 +2082,7 @@ TEST_F(NegativeDeviceGeneratedCommands, ExecuteStageMismatch) { vkt::IndirectCommandsLayout command_layout(*m_device, command_layout_ci); // Pipeline (and IES) have no fragment stage - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper pipe(*this, &pipe_flags2); pipe.shader_stages_ = {pipe.vs_->GetStageCreateInfo()}; @@ -2102,8 +2092,7 @@ TEST_F(NegativeDeviceGeneratedCommands, ExecuteStageMismatch) { VkMemoryAllocateFlagsInfo allocate_flag_info = vku::InitStructHelper(); allocate_flag_info.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; - vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR, kHostVisibleMemProps, - &allocate_flag_info); + vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, kHostVisibleMemProps, &allocate_flag_info); VkGeneratedCommandsInfoEXT generated_commands_info = vku::InitStructHelper(); generated_commands_info.shaderStages = VK_SHADER_STAGE_VERTEX_BIT; @@ -2146,7 +2135,7 @@ TEST_F(NegativeDeviceGeneratedCommands, ExecutePreprocessBufferUsage) { command_layout_ci.pTokens = tokens; vkt::IndirectCommandsLayout command_layout(*m_device, command_layout_ci); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreateComputePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateComputePipeline(); @@ -2154,8 +2143,7 @@ TEST_F(NegativeDeviceGeneratedCommands, ExecutePreprocessBufferUsage) { VkMemoryAllocateFlagsInfo allocate_flag_info = vku::InitStructHelper(); allocate_flag_info.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; - vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR, kHostVisibleMemProps, - &allocate_flag_info); + vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, kHostVisibleMemProps, &allocate_flag_info); VkGeneratedCommandsInfoEXT generated_commands_info = vku::InitStructHelper(); generated_commands_info.shaderStages = VK_SHADER_STAGE_COMPUTE_BIT; @@ -2179,7 +2167,7 @@ TEST_F(NegativeDeviceGeneratedCommands, ExecutePreprocessBufferUsage) { } { - VkBufferUsageFlags2CreateInfoKHR buffer_usage_flags = vku::InitStructHelper(); + VkBufferUsageFlags2CreateInfo buffer_usage_flags = vku::InitStructHelper(); buffer_usage_flags.usage = VK_BUFFER_USAGE_2_PREPROCESS_BUFFER_BIT_EXT | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT; VkBufferCreateInfo buffer_ci = vku::InitStructHelper(&buffer_usage_flags); @@ -2217,7 +2205,7 @@ TEST_F(NegativeDeviceGeneratedCommands, ExecuteSequenceCountBufferUsage) { command_layout_ci.pTokens = tokens; vkt::IndirectCommandsLayout command_layout(*m_device, command_layout_ci); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreateComputePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateComputePipeline(); @@ -2225,8 +2213,7 @@ TEST_F(NegativeDeviceGeneratedCommands, ExecuteSequenceCountBufferUsage) { VkMemoryAllocateFlagsInfo allocate_flag_info = vku::InitStructHelper(); allocate_flag_info.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; - vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR, kHostVisibleMemProps, - &allocate_flag_info); + vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, kHostVisibleMemProps, &allocate_flag_info); VkGeneratedCommandsInfoEXT generated_commands_info = vku::InitStructHelper(); generated_commands_info.shaderStages = VK_SHADER_STAGE_COMPUTE_BIT; @@ -2249,9 +2236,9 @@ TEST_F(NegativeDeviceGeneratedCommands, ExecuteSequenceCountBufferUsage) { } { - VkBufferUsageFlags2CreateInfoKHR buffer_usage_flags = vku::InitStructHelper(); - buffer_usage_flags.usage = VK_BUFFER_USAGE_2_INDIRECT_BUFFER_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT | - VK_BUFFER_USAGE_STORAGE_BUFFER_BIT; + VkBufferUsageFlags2CreateInfo buffer_usage_flags = vku::InitStructHelper(); + buffer_usage_flags.usage = + VK_BUFFER_USAGE_2_INDIRECT_BUFFER_BIT | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT; VkBufferCreateInfo buffer_ci = vku::InitStructHelper(&buffer_usage_flags); buffer_ci.size = 1024; vkt::Buffer bad_buffer(*m_device, buffer_ci, 0, &allocate_flag_info); @@ -2313,8 +2300,7 @@ TEST_F(NegativeDeviceGeneratedCommands, ExecuteShaderObjectStages) { VkMemoryAllocateFlagsInfo allocate_flag_info = vku::InitStructHelper(); allocate_flag_info.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; - vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR, kHostVisibleMemProps, - &allocate_flag_info); + vkt::Buffer block_buffer(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, kHostVisibleMemProps, &allocate_flag_info); VkGeneratedCommandsInfoEXT generated_commands_info = vku::InitStructHelper(); generated_commands_info.shaderStages = VK_SHADER_STAGE_VERTEX_BIT; diff --git a/tests/unit/device_generated_commands_positive.cpp b/tests/unit/device_generated_commands_positive.cpp index 13acc3afa06..bd0a405d36a 100644 --- a/tests/unit/device_generated_commands_positive.cpp +++ b/tests/unit/device_generated_commands_positive.cpp @@ -52,7 +52,7 @@ void DeviceGeneratedCommandsTest::SetPreProcessBuffer(VkGeneratedCommandsInfoEXT VkMemoryAllocateFlagsInfo allocate_flag_info = vku::InitStructHelper(); allocate_flag_info.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; - VkBufferUsageFlags2CreateInfoKHR buffer_usage_flags = vku::InitStructHelper(); + VkBufferUsageFlags2CreateInfo buffer_usage_flags = vku::InitStructHelper(); buffer_usage_flags.usage = VK_BUFFER_USAGE_2_PREPROCESS_BUFFER_BIT_EXT | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT; VkBufferCreateInfo buffer_ci = vku::InitStructHelper(&buffer_usage_flags); buffer_ci.size = pre_process_size; @@ -70,7 +70,7 @@ TEST_F(PositiveDeviceGeneratedCommands, CreateIndirectExecutionSetPipeline) { RETURN_IF_SKIP(InitBasicDeviceGeneratedCommands()); InitRenderTarget(); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateGraphicsPipeline(); @@ -137,7 +137,7 @@ TEST_F(PositiveDeviceGeneratedCommands, GetGeneratedCommandsMemoryRequirements) vkt::IndirectCommandsLayout command_layout(*m_device, command_layout_ci); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateGraphicsPipeline(); @@ -184,7 +184,7 @@ TEST_F(PositiveDeviceGeneratedCommands, CmdExecuteGeneratedCommandsGraphics) { RETURN_IF_SKIP(InitBasicDeviceGeneratedCommands()); InitRenderTarget(); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateGraphicsPipeline(); @@ -236,7 +236,7 @@ TEST_F(PositiveDeviceGeneratedCommands, UpdateIndirectExecutionSetPipeline) { RETURN_IF_SKIP(InitBasicDeviceGeneratedCommands()); InitRenderTarget(); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreatePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateGraphicsPipeline(); @@ -308,7 +308,7 @@ TEST_F(PositiveDeviceGeneratedCommands, CmdExecuteGeneratedCommandsCompute) { command_layout_ci.pTokens = tokens; vkt::IndirectCommandsLayout command_layout(*m_device, command_layout_ci); - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreateComputePipelineHelper pipe(*this, &pipe_flags2); pipe.CreateComputePipeline(); diff --git a/tests/unit/device_queue.cpp b/tests/unit/device_queue.cpp index bda71a67380..d839efbff1e 100644 --- a/tests/unit/device_queue.cpp +++ b/tests/unit/device_queue.cpp @@ -206,11 +206,11 @@ TEST_F(NegativeDeviceQueue, MismatchedGlobalPriority) { GTEST_SKIP() << "Multiple queues from same queue family are required to run this test"; } - VkDeviceQueueGlobalPriorityCreateInfoKHR queue_global_priority_ci[2] = {}; + VkDeviceQueueGlobalPriorityCreateInfo queue_global_priority_ci[2] = {}; queue_global_priority_ci[0] = vku::InitStructHelper(); - queue_global_priority_ci[0].globalPriority = VK_QUEUE_GLOBAL_PRIORITY_LOW_KHR; + queue_global_priority_ci[0].globalPriority = VK_QUEUE_GLOBAL_PRIORITY_LOW; queue_global_priority_ci[1] = vku::InitStructHelper(); - queue_global_priority_ci[1].globalPriority = VK_QUEUE_GLOBAL_PRIORITY_MEDIUM_KHR; + queue_global_priority_ci[1].globalPriority = VK_QUEUE_GLOBAL_PRIORITY_MEDIUM; float priorities[] = {1.0f, 1.0f}; VkDeviceQueueCreateInfo device_queue_ci[2] = {}; diff --git a/tests/unit/dynamic_rendering.cpp b/tests/unit/dynamic_rendering.cpp index de7e580a316..567228ec3e7 100644 --- a/tests/unit/dynamic_rendering.cpp +++ b/tests/unit/dynamic_rendering.cpp @@ -21,7 +21,7 @@ class NegativeDynamicRendering : public DynamicRenderingTest {}; TEST_F(NegativeDynamicRendering, CommandBufferInheritanceRenderingInfo) { - TEST_DESCRIPTION("VkCommandBufferInheritanceRenderingInfoKHR Dynamic Rendering Tests."); + TEST_DESCRIPTION("VkCommandBufferInheritanceRenderingInfo Dynamic Rendering Tests."); SetTargetApiVersion(VK_API_VERSION_1_2); AddRequiredExtensions(VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME); AddRequiredFeature(vkt::Feature::dynamicRendering); @@ -32,7 +32,7 @@ TEST_F(NegativeDynamicRendering, CommandBufferInheritanceRenderingInfo) { VkFormat color_format = VK_FORMAT_D32_SFLOAT; - VkCommandBufferInheritanceRenderingInfoKHR cmd_buffer_inheritance_rendering_info = vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo cmd_buffer_inheritance_rendering_info = vku::InitStructHelper(); cmd_buffer_inheritance_rendering_info.colorAttachmentCount = 1; cmd_buffer_inheritance_rendering_info.pColorAttachmentFormats = &color_format; cmd_buffer_inheritance_rendering_info.depthAttachmentFormat = VK_FORMAT_R8G8B8_UNORM; @@ -79,7 +79,7 @@ TEST_F(NegativeDynamicRendering, CommandDraw) { RETURN_IF_SKIP(InitBasicDynamicRendering()); VkFormat depth_format = VK_FORMAT_D32_SFLOAT_S8_UINT; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.depthAttachmentFormat = depth_format; pipeline_rendering_info.stencilAttachmentFormat = depth_format; @@ -93,11 +93,11 @@ TEST_F(NegativeDynamicRendering, CommandDraw) { image.SetLayout(VK_IMAGE_LAYOUT_GENERAL); vkt::ImageView depth_image_view = image.CreateView(VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT); - VkRenderingAttachmentInfoKHR depth_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo depth_attachment = vku::InitStructHelper(); depth_attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; depth_attachment.imageView = depth_image_view.handle(); - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.pDepthAttachment = &depth_attachment; begin_rendering_info.pStencilAttachment = &depth_attachment; begin_rendering_info.layerCount = 1; @@ -131,7 +131,7 @@ TEST_F(NegativeDynamicRendering, CommandDrawWithShaderTileImageRead) { VkFormat depth_format = VK_FORMAT_D32_SFLOAT_S8_UINT; VkFormat color_format = VK_FORMAT_B8G8R8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; pipeline_rendering_info.depthAttachmentFormat = depth_format; @@ -157,15 +157,15 @@ TEST_F(NegativeDynamicRendering, CommandDrawWithShaderTileImageRead) { vkt::Image color_image(*m_device, 32, 32, 1, color_format, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView color_image_view = color_image.CreateView(); - VkRenderingAttachmentInfoKHR depth_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo depth_attachment = vku::InitStructHelper(); depth_attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; depth_attachment.imageView = depth_image_view.handle(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.imageView = color_image_view.handle(); - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.pDepthAttachment = &depth_attachment; @@ -218,7 +218,7 @@ TEST_F(NegativeDynamicRendering, CmdClearAttachmentTests) { secondary_cmd_buffer_alloc_info.commandBufferCount = 1; vkt::CommandBuffer secondary_cmd_buffer(*m_device, secondary_cmd_buffer_alloc_info); - VkCommandBufferInheritanceRenderingInfoKHR inheritance_rendering_info = vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo inheritance_rendering_info = vku::InitStructHelper(); inheritance_rendering_info.colorAttachmentCount = 1; inheritance_rendering_info.pColorAttachmentFormats = &render_target_ci.format; inheritance_rendering_info.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; @@ -278,11 +278,11 @@ TEST_F(NegativeDynamicRendering, CmdClearAttachmentTests) { m_command_buffer.Begin(); - VkRenderingAttachmentInfoKHR color_attachment_info = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment_info = vku::InitStructHelper(); color_attachment_info.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment_info.imageView = render_target_view.handle(); - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); - begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR; + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); + begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; begin_rendering_info.renderArea = clear_rect.rect; begin_rendering_info.layerCount = 2; begin_rendering_info.colorAttachmentCount = 1; @@ -332,16 +332,16 @@ TEST_F(NegativeDynamicRendering, ClearAttachments) { // Dynamic rendering structs VkRect2D rect{{0, 0}, {32, 32}}; - VkRenderingAttachmentInfoKHR depth_attachment_info = vku::InitStructHelper(); - depth_attachment_info.imageLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR; + VkRenderingAttachmentInfo depth_attachment_info = vku::InitStructHelper(); + depth_attachment_info.imageLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL; depth_attachment_info.imageView = depth_stencil_image_view.handle(); - VkRenderingAttachmentInfoKHR stencil_attachment_info = vku::InitStructHelper(); + VkRenderingAttachmentInfo stencil_attachment_info = vku::InitStructHelper(); stencil_attachment_info.imageLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL; stencil_attachment_info.imageView = depth_stencil_image_view.handle(); - VkRenderingAttachmentInfoKHR color_attachment_info = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment_info = vku::InitStructHelper(); color_attachment_info.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment_info.imageView = color_image_view; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.renderArea = rect; begin_rendering_info.layerCount = 1; @@ -671,7 +671,7 @@ TEST_F(NegativeDynamicRendering, GraphicsPipelineCreateInfo) { VkFormat color_format[2] = {VK_FORMAT_R8G8B8A8_UNORM, VK_FORMAT_D32_SFLOAT_S8_UINT}; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 2; pipeline_rendering_info.pColorAttachmentFormats = &color_format[0]; pipeline_rendering_info.viewMask = 0x2; @@ -741,7 +741,7 @@ TEST_F(NegativeDynamicRendering, ColorAttachmentMismatch) { color_blend_state_create_info.pAttachments = nullptr; VkFormat color_format[2] = {VK_FORMAT_UNDEFINED, VK_FORMAT_UNDEFINED}; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = color_format; @@ -772,7 +772,7 @@ TEST_F(NegativeDynamicRendering, ColorAttachmentMismatchDefault) { // default attachmentCount is 1 CreatePipelineHelper pipe(*this); - // Not having VkPipelineRenderingCreateInfoKHR means colorAttachmentCount is zero + // Not having VkPipelineRenderingCreateInfo means colorAttachmentCount is zero pipe.gp_ci_.renderPass = VK_NULL_HANDLE; m_errorMonitor->SetDesiredError("VUID-VkGraphicsPipelineCreateInfo-renderPass-06055"); pipe.CreateGraphicsPipeline(); @@ -785,7 +785,7 @@ TEST_F(NegativeDynamicRendering, MismatchingViewMask) { RETURN_IF_SKIP(InitBasicDynamicRendering()); VkFormat color_formats = VK_FORMAT_UNDEFINED; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_formats; pipeline_rendering_info.viewMask = 1; @@ -793,10 +793,10 @@ TEST_F(NegativeDynamicRendering, MismatchingViewMask) { CreatePipelineHelper pipe(*this, &pipeline_rendering_info); pipe.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.viewMask = 2; @@ -817,7 +817,7 @@ TEST_F(NegativeDynamicRendering, MismatchingAttachmentFormats) { TEST_DESCRIPTION("Draw with Dynamic Rendering with mismatching color attachment counts and depth/stencil formats"); RETURN_IF_SKIP(InitBasicDynamicRendering()); - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); VkFormat color_formats[] = {VK_FORMAT_R8G8B8A8_UNORM}; pipeline_rendering_info.colorAttachmentCount = 1; @@ -875,15 +875,15 @@ TEST_F(NegativeDynamicRendering, MismatchingAttachmentFormats) { vkt::Image depthStencilImage(*m_device, 32, 32, 1, depthStencilFormat, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT); vkt::ImageView depthStencilImageView = depthStencilImage.CreateView(VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.imageView = colorImageView; - VkRenderingAttachmentInfoKHR depth_stencil_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo depth_stencil_attachment = vku::InitStructHelper(); depth_stencil_attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; depth_stencil_attachment.imageView = depthStencilImageView; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; m_command_buffer.Begin(); @@ -934,12 +934,12 @@ TEST_F(NegativeDynamicRendering, MismatchingAttachmentFormats) { TEST_F(NegativeDynamicRendering, MismatchingAttachmentFormats2) { TEST_DESCRIPTION( - "Draw with Dynamic Rendering with attachment specified as VK_NULL_HANDLE in VkRenderingInfoKHR, but with corresponding " - "format in VkPipelineRenderingCreateInfoKHR not set to VK_FORMAT_UNDEFINED"); + "Draw with Dynamic Rendering with attachment specified as VK_NULL_HANDLE in VkRenderingInfo, but with corresponding " + "format in VkPipelineRenderingCreateInfo not set to VK_FORMAT_UNDEFINED"); RETURN_IF_SKIP(InitBasicDynamicRendering()); - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); VkFormat color_formats[] = {VK_FORMAT_R8G8B8A8_UNORM}; pipeline_rendering_info.colorAttachmentCount = 1; @@ -971,11 +971,11 @@ TEST_F(NegativeDynamicRendering, MismatchingAttachmentFormats2) { vkt::Image depthStencilImage(*m_device, 32, 32, 1, depthStencilFormat, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.imageView = VK_NULL_HANDLE; - VkRenderingAttachmentInfoKHR depth_stencil_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo depth_stencil_attachment = vku::InitStructHelper(); depth_stencil_attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; depth_stencil_attachment.imageView = VK_NULL_HANDLE; @@ -983,7 +983,7 @@ TEST_F(NegativeDynamicRendering, MismatchingAttachmentFormats2) { { // Mismatching color formats - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; @@ -998,7 +998,7 @@ TEST_F(NegativeDynamicRendering, MismatchingAttachmentFormats2) { { // Mismatching depth format - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.pDepthAttachment = &depth_stencil_attachment; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; @@ -1012,7 +1012,7 @@ TEST_F(NegativeDynamicRendering, MismatchingAttachmentFormats2) { { // Mismatching stencil format - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.pStencilAttachment = &depth_stencil_attachment; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; @@ -1035,7 +1035,7 @@ TEST_F(NegativeDynamicRendering, MismatchingAttachmentFormats3Color) { AddRequiredFeature(vkt::Feature::dynamicRenderingUnusedAttachments); RETURN_IF_SKIP(InitBasicDynamicRendering()); - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); VkFormat color_formats[] = {VK_FORMAT_B8G8R8A8_UNORM}; pipeline_rendering_info.colorAttachmentCount = 1; @@ -1048,11 +1048,11 @@ TEST_F(NegativeDynamicRendering, MismatchingAttachmentFormats3Color) { vkt::Image colorImage(*m_device, 32, 32, 1, VK_FORMAT_R8G8B8A8_UINT, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView colorImageView = colorImage.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.imageView = colorImageView; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; m_command_buffer.Begin(); @@ -1078,7 +1078,7 @@ TEST_F(NegativeDynamicRendering, MismatchingAttachmentFormats3DepthStencil) { AddRequiredFeature(vkt::Feature::dynamicRenderingUnusedAttachments); RETURN_IF_SKIP(InitBasicDynamicRendering()); - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 0; pipeline_rendering_info.pColorAttachmentFormats = nullptr; pipeline_rendering_info.depthAttachmentFormat = VK_FORMAT_D16_UNORM; @@ -1126,11 +1126,11 @@ TEST_F(NegativeDynamicRendering, MismatchingAttachmentFormats3DepthStencil) { vkt::Image depthStencilImage(*m_device, 32, 32, 1, depthStencilFormat, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT); vkt::ImageView depthStencilImageView = depthStencilImage.CreateView(VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT); - VkRenderingAttachmentInfoKHR depth_stencil_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo depth_stencil_attachment = vku::InitStructHelper(); depth_stencil_attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; depth_stencil_attachment.imageView = depthStencilImageView; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; m_command_buffer.Begin(); @@ -1166,7 +1166,7 @@ TEST_F(NegativeDynamicRendering, MismatchingAttachmentSamplesColor) { RETURN_IF_SKIP(InitBasicDynamicRendering()); InitRenderTarget(); - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); VkFormat color_formats[] = {VK_FORMAT_R8G8B8A8_UNORM}; pipeline_rendering_info.colorAttachmentCount = 1; @@ -1180,11 +1180,11 @@ TEST_F(NegativeDynamicRendering, MismatchingAttachmentSamplesColor) { vkt::Image colorImage(*m_device, 32, 32, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView colorImageView = colorImage.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.imageView = colorImageView; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; m_command_buffer.Begin(); @@ -1208,7 +1208,7 @@ TEST_F(NegativeDynamicRendering, MismatchingAttachmentSamplesDepthStencil) { VkFormat depthStencilFormat = FindSupportedDepthStencilFormat(Gpu()); - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 0; pipeline_rendering_info.pColorAttachmentFormats = nullptr; pipeline_rendering_info.depthAttachmentFormat = depthStencilFormat; @@ -1234,11 +1234,11 @@ TEST_F(NegativeDynamicRendering, MismatchingAttachmentSamplesDepthStencil) { vkt::Image depthStencilImage(*m_device, 32, 32, 1, depthStencilFormat, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT); vkt::ImageView depthStencilImageView = depthStencilImage.CreateView(VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT); - VkRenderingAttachmentInfoKHR depth_stencil_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo depth_stencil_attachment = vku::InitStructHelper(); depth_stencil_attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; depth_stencil_attachment.imageView = depthStencilImageView; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; m_command_buffer.Begin(); @@ -1283,7 +1283,7 @@ TEST_F(NegativeDynamicRendering, MismatchingMixedAttachmentSamplesColor) { VkSampleCountFlagBits counts[2] = {VK_SAMPLE_COUNT_2_BIT, VK_SAMPLE_COUNT_2_BIT}; VkAttachmentSampleCountInfoAMD samples_info = vku::InitStructHelper(); - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(&samples_info); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(&samples_info); VkFormat color_formats[] = {VK_FORMAT_R8G8B8A8_UNORM}; pipeline_rendering_info.colorAttachmentCount = 1; @@ -1306,11 +1306,11 @@ TEST_F(NegativeDynamicRendering, MismatchingMixedAttachmentSamplesColor) { vkt::Image colorImage(*m_device, 32, 32, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView colorImageView = colorImage.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.imageView = colorImageView; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; m_command_buffer.Begin(); @@ -1343,7 +1343,7 @@ TEST_F(NegativeDynamicRendering, MismatchingMixedAttachmentSamplesDepthStencil) VkSampleCountFlagBits counts[2] = {VK_SAMPLE_COUNT_2_BIT, VK_SAMPLE_COUNT_2_BIT}; VkAttachmentSampleCountInfoAMD samples_info = vku::InitStructHelper(); - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(&samples_info); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(&samples_info); VkFormat depthStencilFormat = FindSupportedDepthStencilFormat(Gpu()); @@ -1374,11 +1374,11 @@ TEST_F(NegativeDynamicRendering, MismatchingMixedAttachmentSamplesDepthStencil) vkt::Image depthStencilImage(*m_device, 32, 32, 1, depthStencilFormat, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT); vkt::ImageView depthStencilImageView = depthStencilImage.CreateView(VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT); - VkRenderingAttachmentInfoKHR depth_stencil_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo depth_stencil_attachment = vku::InitStructHelper(); depth_stencil_attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; depth_stencil_attachment.imageView = depthStencilImageView; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; begin_rendering_info.layerCount = 1; m_command_buffer.Begin(); @@ -1430,7 +1430,7 @@ TEST_F(NegativeDynamicRendering, AttachmentInfo) { vkt::ImageView depth_image_view = image.CreateView(VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT); vkt::ImageView depth_image_view_fragment = image_fragment.CreateView(VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT); - VkRenderingAttachmentInfoKHR depth_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo depth_attachment = vku::InitStructHelper(); depth_attachment.imageLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR; depth_attachment.imageView = depth_image_view; depth_attachment.resolveMode = VK_RESOLVE_MODE_SAMPLE_ZERO_BIT; @@ -1441,7 +1441,7 @@ TEST_F(NegativeDynamicRendering, AttachmentInfo) { fragment_density_map.imageView = depth_image_view; fragment_density_map.imageLayout = VK_IMAGE_LAYOUT_GENERAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(&fragment_density_map); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(&fragment_density_map); begin_rendering_info.pDepthAttachment = &depth_attachment; begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; @@ -1468,7 +1468,7 @@ TEST_F(NegativeDynamicRendering, BufferBeginInfoLegacy) { AddRequiredExtensions(VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME); RETURN_IF_SKIP(Init()); - VkCommandBufferInheritanceRenderingInfoKHR cmd_buffer_inheritance_rendering_info = vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo cmd_buffer_inheritance_rendering_info = vku::InitStructHelper(); cmd_buffer_inheritance_rendering_info.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; VkCommandBufferInheritanceInfo cmd_buffer_inheritance_info = vku::InitStructHelper(&cmd_buffer_inheritance_rendering_info); @@ -1610,7 +1610,7 @@ TEST_F(NegativeDynamicRendering, PipelineMissingFlags) { vkt::Image image(*m_device, image_create_info, vkt::set_layout); vkt::ImageView depth_image_view = image.CreateView(VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; if (shading_rate) { @@ -1621,7 +1621,7 @@ TEST_F(NegativeDynamicRendering, PipelineMissingFlags) { fragment_shading_rate.imageLayout = VK_IMAGE_LAYOUT_GENERAL; fragment_shading_rate.shadingRateAttachmentTexelSize = fsr_properties.minFragmentShadingRateAttachmentTexelSize; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(&fragment_shading_rate); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(&fragment_shading_rate); begin_rendering_info.layerCount = 1; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; @@ -1629,7 +1629,7 @@ TEST_F(NegativeDynamicRendering, PipelineMissingFlags) { const VkFormat color_format = VK_FORMAT_UNDEFINED; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -1654,7 +1654,7 @@ TEST_F(NegativeDynamicRendering, PipelineMissingFlags) { fragment_density_map.imageView = depth_image_view.handle(); fragment_density_map.imageLayout = VK_IMAGE_LAYOUT_GENERAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(&fragment_density_map); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(&fragment_density_map); begin_rendering_info.layerCount = 1; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; @@ -1662,7 +1662,7 @@ TEST_F(NegativeDynamicRendering, PipelineMissingFlags) { const VkFormat color_format = VK_FORMAT_UNDEFINED; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -1685,7 +1685,7 @@ TEST_F(NegativeDynamicRendering, LayerCount) { TEST_DESCRIPTION("Test dynamic rendering with viewMask 0 and invalid layer count."); RETURN_IF_SKIP(InitBasicDynamicRendering()); - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; m_errorMonitor->SetDesiredError("VUID-VkRenderingInfo-viewMask-06069"); @@ -1713,7 +1713,7 @@ TEST_F(NegativeDynamicRendering, InfoMismatchedSamples) { vkt::Image color_image(*m_device, image_ci, vkt::set_layout); vkt::ImageView color_image_view = color_image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = color_image_view.handle(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.resolveMode = VK_RESOLVE_MODE_NONE; @@ -1723,12 +1723,12 @@ TEST_F(NegativeDynamicRendering, InfoMismatchedSamples) { vkt::Image depth_image(*m_device, 64, 64, 1, depth_format, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT); vkt::ImageView depth_image_view = depth_image.CreateView(VK_IMAGE_ASPECT_DEPTH_BIT); - VkRenderingAttachmentInfoKHR depth_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo depth_attachment = vku::InitStructHelper(); depth_attachment.imageLayout = VK_IMAGE_LAYOUT_GENERAL; depth_attachment.imageView = depth_image_view.handle(); depth_attachment.resolveMode = VK_RESOLVE_MODE_NONE; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; @@ -1784,7 +1784,7 @@ TEST_F(NegativeDynamicRendering, BeginRenderingFragmentShadingRate) { fragment_shading_rate.imageLayout = VK_IMAGE_LAYOUT_GENERAL; fragment_shading_rate.shadingRateAttachmentTexelSize = fsr_properties.minFragmentShadingRateAttachmentTexelSize; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(&fragment_shading_rate); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(&fragment_shading_rate); begin_rendering_info.layerCount = 4; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; @@ -1799,7 +1799,7 @@ TEST_F(NegativeDynamicRendering, BeginRenderingFragmentShadingRate) { m_command_buffer.BeginRendering(begin_rendering_info); m_errorMonitor->VerifyFound(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = image_view; color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -1831,11 +1831,11 @@ TEST_F(NegativeDynamicRendering, DeviceGroupRenderPassBeginInfo) { vkt::Image colorImage(*m_device, 32, 32, 1, VK_FORMAT_R8G8B8A8_UINT, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView colorImageView = colorImage.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = colorImageView; color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(&device_group_render_pass_begin_info); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(&device_group_render_pass_begin_info); begin_rendering_info.layerCount = 1; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; @@ -1885,7 +1885,7 @@ TEST_F(NegativeDynamicRendering, BeginRenderingFragmentShadingRateImage) { fragment_shading_rate.imageLayout = VK_IMAGE_LAYOUT_GENERAL; fragment_shading_rate.shadingRateAttachmentTexelSize = fsr_properties.minFragmentShadingRateAttachmentTexelSize; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(&fragment_shading_rate); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(&fragment_shading_rate); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; @@ -1959,11 +1959,11 @@ TEST_F(NegativeDynamicRendering, BeginRenderingDepthAttachmentFormat) { image.SetLayout(VK_IMAGE_LAYOUT_GENERAL); vkt::ImageView image_view = image.CreateView(VK_IMAGE_ASPECT_STENCIL_BIT); - VkRenderingAttachmentInfoKHR depth_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo depth_attachment = vku::InitStructHelper(); depth_attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL; depth_attachment.imageView = image_view; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.pDepthAttachment = &depth_attachment; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; @@ -1997,7 +1997,7 @@ TEST_F(NegativeDynamicRendering, TestFragmentDensityMapRenderArea) { fragment_density_map.imageView = image_view; fragment_density_map.imageLayout = VK_IMAGE_LAYOUT_GENERAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(&fragment_density_map); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(&fragment_density_map); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea.extent.width = 64 * fdm_props.maxFragmentDensityTexelSize.width; begin_rendering_info.renderArea.extent.height = 32 * fdm_props.maxFragmentDensityTexelSize.height; @@ -2098,7 +2098,7 @@ TEST_F(NegativeDynamicRendering, FragmentDensityMapRenderAreaWithoutDeviceGroupE fragment_density_map.imageView = image_view; fragment_density_map.imageLayout = VK_IMAGE_LAYOUT_GENERAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(&fragment_density_map); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(&fragment_density_map); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea.extent.width = 64 * fdm_props.maxFragmentDensityTexelSize.width; begin_rendering_info.renderArea.extent.height = 32 * fdm_props.maxFragmentDensityTexelSize.height; @@ -2128,7 +2128,7 @@ TEST_F(NegativeDynamicRendering, BarrierShaderTileFeaturesNotEnabled) { m_command_buffer.Begin(); - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); VkClearRect clear_rect = {{{0, 0}, {m_width, m_height}}, 0, 1}; begin_rendering_info.renderArea = clear_rect.rect; begin_rendering_info.layerCount = 1; @@ -2141,7 +2141,7 @@ TEST_F(NegativeDynamicRendering, BarrierShaderTileFeaturesNotEnabled) { barrier2.dstStageMask = VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT; barrier2.dstAccessMask = VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT; - VkDependencyInfoKHR dependency_info = vku::InitStructHelper(); + VkDependencyInfo dependency_info = vku::InitStructHelper(); dependency_info.dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT; dependency_info.memoryBarrierCount = 1; dependency_info.pMemoryBarriers = &barrier2; @@ -2175,20 +2175,20 @@ TEST_F(NegativeDynamicRendering, WithoutShaderTileImageAndBarrier) { m_command_buffer.Begin(); - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); VkClearRect clear_rect = {{{0, 0}, {m_width, m_height}}, 0, 1}; begin_rendering_info.renderArea = clear_rect.rect; begin_rendering_info.layerCount = 1; m_command_buffer.BeginRendering(begin_rendering_info); - VkMemoryBarrier2KHR memory_barrier_2 = vku::InitStructHelper(); + VkMemoryBarrier2 memory_barrier_2 = vku::InitStructHelper(); memory_barrier_2.srcStageMask = VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT; memory_barrier_2.srcAccessMask = VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT; memory_barrier_2.dstStageMask = VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT; memory_barrier_2.dstAccessMask = VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT; - VkDependencyInfoKHR dependency_info = vku::InitStructHelper(); + VkDependencyInfo dependency_info = vku::InitStructHelper(); dependency_info.dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT; dependency_info.memoryBarrierCount = 1; dependency_info.pMemoryBarriers = &memory_barrier_2; @@ -2228,20 +2228,20 @@ TEST_F(NegativeDynamicRendering, WithShaderTileImageAndBarrier) { m_command_buffer.Begin(); - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); VkClearRect clear_rect = {{{0, 0}, {m_width, m_height}}, 0, 1}; begin_rendering_info.renderArea = clear_rect.rect; begin_rendering_info.layerCount = 1; m_command_buffer.BeginRendering(begin_rendering_info); - VkMemoryBarrier2KHR memory_barrier_2 = vku::InitStructHelper(); + VkMemoryBarrier2 memory_barrier_2 = vku::InitStructHelper(); memory_barrier_2.srcStageMask = VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT; memory_barrier_2.srcAccessMask = VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT; memory_barrier_2.dstStageMask = VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT; memory_barrier_2.dstAccessMask = VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT; - VkDependencyInfoKHR dependency_info = vku::InitStructHelper(); + VkDependencyInfo dependency_info = vku::InitStructHelper(); dependency_info.dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT; dependency_info.memoryBarrierCount = 1; dependency_info.pMemoryBarriers = &memory_barrier_2; @@ -2253,7 +2253,7 @@ TEST_F(NegativeDynamicRendering, WithShaderTileImageAndBarrier) { vkt::Buffer buffer(*m_device, 256, VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT); - VkBufferMemoryBarrier2KHR buf_barrier_2 = vku::InitStructHelper(); + VkBufferMemoryBarrier2 buf_barrier_2 = vku::InitStructHelper(); buf_barrier_2.buffer = buffer.handle(); buf_barrier_2.offset = 0; buf_barrier_2.size = VK_WHOLE_SIZE; @@ -2360,11 +2360,11 @@ TEST_F(NegativeDynamicRendering, BeginRenderingStencilAttachmentFormat) { image.SetLayout(VK_IMAGE_LAYOUT_GENERAL); vkt::ImageView image_view = image.CreateView(VK_IMAGE_ASPECT_DEPTH_BIT); - VkRenderingAttachmentInfoKHR stencil_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo stencil_attachment = vku::InitStructHelper(); stencil_attachment.imageLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL; stencil_attachment.imageView = image_view; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.pStencilAttachment = &stencil_attachment; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; @@ -2384,7 +2384,7 @@ TEST_F(NegativeDynamicRendering, InheritanceRenderingInfoStencilAttachmentFormat VkFormat color_format = VK_FORMAT_R8G8B8A8_UNORM; - VkCommandBufferInheritanceRenderingInfoKHR cmd_buffer_inheritance_rendering_info = vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo cmd_buffer_inheritance_rendering_info = vku::InitStructHelper(); cmd_buffer_inheritance_rendering_info.colorAttachmentCount = 1; cmd_buffer_inheritance_rendering_info.pColorAttachmentFormats = &color_format; cmd_buffer_inheritance_rendering_info.depthAttachmentFormat = depth_format; @@ -2423,7 +2423,7 @@ TEST_F(NegativeDynamicRendering, CreateGraphicsPipelineWithAttachmentSampleCount sample_count_info_amd.colorAttachmentCount = 1; sample_count_info_amd.depthStencilAttachmentSamples = static_cast(0x3); - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(&sample_count_info_amd); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(&sample_count_info_amd); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -2482,11 +2482,11 @@ TEST_F(NegativeDynamicRendering, AreaGreaterThanAttachmentExtent) { vkt::Image colorImage(*m_device, 32, 32, 1, VK_FORMAT_R8G8B8A8_UINT, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView colorImageView = colorImage.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.imageView = colorImageView; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; @@ -2540,7 +2540,7 @@ TEST_F(NegativeDynamicRendering, AreaGreaterThanAttachmentExtent) { vkt::Image depthImage(*m_device, 32, 32, 1, ds_format, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT); vkt::ImageView depthImageView = depthImage.CreateView(VK_IMAGE_ASPECT_DEPTH_BIT); - VkRenderingAttachmentInfoKHR depth_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo depth_attachment = vku::InitStructHelper(); depth_attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL; depth_attachment.imageView = depthImageView; @@ -2565,11 +2565,11 @@ TEST_F(NegativeDynamicRendering, DeviceGroupAreaGreaterThanAttachmentExtent) { vkt::Image colorImage(*m_device, 32, 32, 1, VK_FORMAT_R8G8B8A8_UINT, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView colorImageView = colorImage.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.imageView = colorImageView; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; @@ -2623,7 +2623,7 @@ TEST_F(NegativeDynamicRendering, DeviceGroupAreaGreaterThanAttachmentExtent) { vkt::Image depthImage(*m_device, 32, 32, 1, ds_format, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT); vkt::ImageView depthImageView = depthImage.CreateView(VK_IMAGE_ASPECT_DEPTH_BIT); - VkRenderingAttachmentInfoKHR depth_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo depth_attachment = vku::InitStructHelper(); depth_attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL; depth_attachment.imageView = depthImageView; @@ -2781,7 +2781,7 @@ TEST_F(NegativeDynamicRendering, ShaderLayerBuiltIn) { VkFormat color_format = VK_FORMAT_R8G8B8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; pipeline_rendering_info.viewMask = 0x1; @@ -2827,7 +2827,7 @@ TEST_F(NegativeDynamicRendering, InputAttachmentCapability) { VkFormat color_format = VK_FORMAT_R8G8B8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -2846,7 +2846,7 @@ TEST_F(NegativeDynamicRendering, RenderingInfoColorAttachmentFormat) { VkFormat color_format = VK_FORMAT_MAX_ENUM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -2867,7 +2867,7 @@ TEST_F(NegativeDynamicRendering, PipelineRenderingCreateInfoFormat) { std::vector color_format(over_limit); std::fill(color_format.begin(), color_format.end(), VK_FORMAT_R8G8B8A8_UNORM); - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = over_limit; pipeline_rendering_info.pColorAttachmentFormats = color_format.data(); @@ -2888,7 +2888,7 @@ TEST_F(NegativeDynamicRendering, LibraryViewMask) { VkFormat color_format = VK_FORMAT_R8G8B8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -2933,7 +2933,7 @@ TEST_F(NegativeDynamicRendering, AttachmentSampleCount) { samples_info.pColorAttachmentSamples = &color_attachment_samples; VkFormat color_format = VK_FORMAT_R8G8B8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(&samples_info); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(&samples_info); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -2954,7 +2954,7 @@ TEST_F(NegativeDynamicRendering, LibrariesViewMask) { VkFormat color_format = VK_FORMAT_R8G8B8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -3006,7 +3006,7 @@ TEST_F(NegativeDynamicRendering, LibraryRenderPass) { VkFormat color_format = VK_FORMAT_R8G8B8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -3095,7 +3095,7 @@ TEST_F(NegativeDynamicRendering, RenderingFragmentDensityMapAttachment) { VkRenderingFragmentDensityMapAttachmentInfoEXT rendering_fragment_density = vku::InitStructHelper(); rendering_fragment_density.imageView = image_view; rendering_fragment_density.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(&rendering_fragment_density); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(&rendering_fragment_density); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; begin_rendering_info.viewMask = 0; @@ -3144,7 +3144,7 @@ TEST_F(NegativeDynamicRendering, RenderingFragmentDensityMapAttachmentUsage) { VkRenderingFragmentDensityMapAttachmentInfoEXT rendering_fragment_density = vku::InitStructHelper(); rendering_fragment_density.imageView = image_view; rendering_fragment_density.imageLayout = VK_IMAGE_LAYOUT_GENERAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(&rendering_fragment_density); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(&rendering_fragment_density); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; @@ -3183,7 +3183,7 @@ TEST_F(NegativeDynamicRendering, FragmentDensityMapAttachmentCreateFlags) { VkRenderingFragmentDensityMapAttachmentInfoEXT rendering_fragment_density = vku::InitStructHelper(); rendering_fragment_density.imageView = image_view; rendering_fragment_density.imageLayout = VK_IMAGE_LAYOUT_GENERAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(&rendering_fragment_density); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(&rendering_fragment_density); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; @@ -3221,7 +3221,7 @@ TEST_F(NegativeDynamicRendering, FragmentDensityMapAttachmentLayerCount) { VkRenderingFragmentDensityMapAttachmentInfoEXT rendering_fragment_density = vku::InitStructHelper(); rendering_fragment_density.imageView = image_view; rendering_fragment_density.imageLayout = VK_IMAGE_LAYOUT_GENERAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(&rendering_fragment_density); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(&rendering_fragment_density); begin_rendering_info.layerCount = 1; begin_rendering_info.viewMask = 0x1; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; @@ -3266,7 +3266,7 @@ TEST_F(NegativeDynamicRendering, PNextImageView) { vku::InitStructHelper(&rendering_fragment_shading_rate); rendering_fragment_density.imageView = image_view; rendering_fragment_density.imageLayout = VK_IMAGE_LAYOUT_GENERAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(&rendering_fragment_density); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(&rendering_fragment_density); begin_rendering_info.layerCount = 1; begin_rendering_info.viewMask = 0x1; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; @@ -3291,7 +3291,7 @@ TEST_F(NegativeDynamicRendering, RenderArea) { InitRenderTarget(); - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea.offset.x = -1; begin_rendering_info.renderArea.extent.width = 32; @@ -3364,7 +3364,7 @@ TEST_F(NegativeDynamicRendering, InfoViewMask) { GTEST_SKIP() << "VUID is not testable as maxMultiviewViewCount is 32"; } - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea.extent.width = 32; begin_rendering_info.renderArea.extent.height = 32; @@ -3386,7 +3386,7 @@ TEST_F(NegativeDynamicRendering, ColorAttachmentFormat) { InitRenderTarget(); VkFormat format = FindSupportedDepthStencilFormat(Gpu()); - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &format; @@ -3419,14 +3419,14 @@ TEST_F(NegativeDynamicRendering, ResolveModeWithNonIntegerColorFormat) { vkt::Image resolve_image(*m_device, image_create_info, vkt::set_layout); vkt::ImageView resolve_image_view = resolve_image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = image_view; color_attachment.resolveMode = VK_RESOLVE_MODE_SAMPLE_ZERO_BIT; // not allowed for format color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.resolveImageLayout = VK_IMAGE_LAYOUT_GENERAL; color_attachment.resolveImageView = resolve_image_view; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -3462,14 +3462,14 @@ TEST_F(NegativeDynamicRendering, ResolveModeWithIntegerColorFormat) { vkt::Image resolve_image(*m_device, image_create_info, vkt::set_layout); vkt::ImageView resolve_image_view = resolve_image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = image_view; color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.resolveMode = VK_RESOLVE_MODE_MAX_BIT; color_attachment.resolveImageLayout = VK_IMAGE_LAYOUT_GENERAL; color_attachment.resolveImageView = resolve_image_view; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -3492,14 +3492,14 @@ TEST_F(NegativeDynamicRendering, ResolveModeSamples) { vkt::Image image(*m_device, 32, 32, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView image_view = image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = image_view; color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.resolveMode = VK_RESOLVE_MODE_AVERAGE_BIT; color_attachment.resolveImageLayout = VK_IMAGE_LAYOUT_GENERAL; color_attachment.resolveImageView = image_view; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -3534,14 +3534,14 @@ TEST_F(NegativeDynamicRendering, ResolveImageViewSamples) { vkt::Image resolve_image(*m_device, image_create_info, vkt::set_layout); vkt::ImageView resolve_image_view = resolve_image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = image_view; color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.resolveMode = VK_RESOLVE_MODE_SAMPLE_ZERO_BIT; color_attachment.resolveImageLayout = VK_IMAGE_LAYOUT_GENERAL; color_attachment.resolveImageView = resolve_image_view; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -3581,14 +3581,14 @@ TEST_F(NegativeDynamicRendering, ResolveImageViewFormatMatch) { vkt::Image resolve_image(*m_device, 32, 32, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView resolve_image_view = resolve_image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = image_view; color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.resolveMode = VK_RESOLVE_MODE_SAMPLE_ZERO_BIT; color_attachment.resolveImageLayout = VK_IMAGE_LAYOUT_GENERAL; color_attachment.resolveImageView = resolve_image_view; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -3611,11 +3611,11 @@ TEST_F(NegativeDynamicRendering, AttachmentImageViewLayout) { vkt::Image image(*m_device, 32, 32, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView image_view = image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = image_view; color_attachment.imageLayout = VK_IMAGE_LAYOUT_PREINITIALIZED; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -3650,14 +3650,14 @@ TEST_F(NegativeDynamicRendering, ResolveImageViewLayout) { vkt::Image resolve_image(*m_device, 32, 32, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView resolve_image_view = resolve_image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = image_view; color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.resolveMode = VK_RESOLVE_MODE_AVERAGE_BIT; color_attachment.resolveImageLayout = VK_IMAGE_LAYOUT_PREINITIALIZED; color_attachment.resolveImageView = resolve_image_view; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -3693,14 +3693,14 @@ TEST_F(NegativeDynamicRendering, ResolveImageViewLayoutSeparateDepthStencil) { vkt::Image resolve_image(*m_device, 32, 32, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView resolve_image_view = resolve_image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = image_view; color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.resolveMode = VK_RESOLVE_MODE_AVERAGE_BIT; color_attachment.resolveImageLayout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL; color_attachment.resolveImageView = resolve_image_view; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -3733,11 +3733,11 @@ TEST_F(NegativeDynamicRendering, AttachmentImageViewShadingRateLayout) { image.SetLayout(VK_IMAGE_LAYOUT_GENERAL); vkt::ImageView image_view = image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = image_view; color_attachment.imageLayout = VK_IMAGE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL_KHR; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -3784,14 +3784,14 @@ TEST_F(NegativeDynamicRendering, ResolveImageViewShadingRateLayout) { vkt::Image resolve_image(*m_device, 32, 32, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView resolve_image_view = resolve_image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = image_view; color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.resolveMode = VK_RESOLVE_MODE_AVERAGE_BIT; color_attachment.resolveImageLayout = VK_IMAGE_LAYOUT_FRAGMENT_SHADING_RATE_ATTACHMENT_OPTIMAL_KHR; color_attachment.resolveImageView = resolve_image_view; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -3819,11 +3819,11 @@ TEST_F(NegativeDynamicRendering, AttachmentImageViewFragmentDensityLayout) { image.SetLayout(VK_IMAGE_LAYOUT_GENERAL); vkt::ImageView image_view = image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = image_view; color_attachment.imageLayout = VK_IMAGE_LAYOUT_FRAGMENT_DENSITY_MAP_OPTIMAL_EXT; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -3859,14 +3859,14 @@ TEST_F(NegativeDynamicRendering, ResolveImageViewFragmentDensityLayout) { vkt::Image resolve_image(*m_device, 32, 32, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView resolve_image_view = resolve_image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = image_view; color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.resolveMode = VK_RESOLVE_MODE_AVERAGE_BIT; color_attachment.resolveImageLayout = VK_IMAGE_LAYOUT_FRAGMENT_DENSITY_MAP_OPTIMAL_EXT; color_attachment.resolveImageView = resolve_image_view; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -3902,14 +3902,14 @@ TEST_F(NegativeDynamicRendering, ResolveImageViewReadOnlyOptimalLayout) { vkt::Image resolve_image(*m_device, 32, 32, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView resolve_image_view = resolve_image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = image_view; color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.resolveMode = VK_RESOLVE_MODE_AVERAGE_BIT; - color_attachment.resolveImageLayout = VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR; + color_attachment.resolveImageLayout = VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL; color_attachment.resolveImageView = resolve_image_view; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -3948,7 +3948,7 @@ TEST_F(NegativeDynamicRendering, BeginRenderingFragmentShadingRateImageView) { fragment_shading_rate.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; fragment_shading_rate.shadingRateAttachmentTexelSize = fsr_properties.minFragmentShadingRateAttachmentTexelSize; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(&fragment_shading_rate); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(&fragment_shading_rate); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; @@ -3986,12 +3986,12 @@ TEST_F(NegativeDynamicRendering, RenderingInfoColorAttachment) { vkt::Image resolve_image(*m_device, image_create_info, vkt::set_layout); vkt::ImageView resolve_image_view = resolve_image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = invalid_image_view; color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.resolveImageView = resolve_image_view; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; @@ -4041,7 +4041,7 @@ TEST_F(NegativeDynamicRendering, RenderingInfoColorAttachment) { color_attachment.resolveMode = VK_RESOLVE_MODE_NONE; const uint32_t max_color_attachments = m_device->Physical().limits_.maxColorAttachments + 1; - std::vector color_attachments(max_color_attachments); + std::vector color_attachments(max_color_attachments); for (auto &attachment : color_attachments) { attachment = vku::InitStructHelper(); attachment.imageView = image_view; @@ -4113,7 +4113,7 @@ TEST_F(NegativeDynamicRendering, RenderingInfoDepthAttachment) { stencil_attachment.imageView = stencil_image_view; stencil_attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.pDepthAttachment = &depth_attachment; begin_rendering_info.pStencilAttachment = &stencil_attachment; @@ -4260,7 +4260,7 @@ TEST_F(NegativeDynamicRendering, RenderAreaNegativeOffset) { RETURN_IF_SKIP(InitBasicDynamicRendering()); InitRenderTarget(); - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea.offset.x = -1; begin_rendering_info.renderArea.extent.width = 32; @@ -4286,10 +4286,10 @@ TEST_F(NegativeDynamicRendering, ZeroRenderArea) { TEST_DESCRIPTION("renderArea set to zero"); RETURN_IF_SKIP(InitBasicDynamicRendering()); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {64, 64}}; begin_rendering_info.colorAttachmentCount = 1; @@ -4318,7 +4318,7 @@ TEST_F(NegativeDynamicRendering, Pipeline) { CreatePipelineHelper pipe(*this); pipe.CreateGraphicsPipeline(); - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; @@ -4366,7 +4366,7 @@ TEST_F(NegativeDynamicRendering, BeginRenderingFragmentShadingRateAttachmentSize fragment_shading_rate.imageLayout = VK_IMAGE_LAYOUT_GENERAL; fragment_shading_rate.shadingRateAttachmentTexelSize = fsr_properties.minFragmentShadingRateAttachmentTexelSize; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(&fragment_shading_rate); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(&fragment_shading_rate); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; begin_rendering_info.renderArea.offset.x = fragment_shading_rate.shadingRateAttachmentTexelSize.width * 64; @@ -4413,7 +4413,7 @@ TEST_F(NegativeDynamicRendering, FragmentShadingRateAttachmentSizeWithDeviceGrou fragment_shading_rate.imageLayout = VK_IMAGE_LAYOUT_GENERAL; fragment_shading_rate.shadingRateAttachmentTexelSize = fsr_properties.minFragmentShadingRateAttachmentTexelSize; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(&fragment_shading_rate); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(&fragment_shading_rate); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; begin_rendering_info.renderArea.offset.x = fragment_shading_rate.shadingRateAttachmentTexelSize.width * 64; @@ -4604,7 +4604,7 @@ TEST_F(NegativeDynamicRendering, SuspendingRenderPassInstanceQueueSubmit2) { command_buffer_submit_info[0].commandBuffer = cmd_buffer1.handle(); command_buffer_submit_info[1].commandBuffer = cmd_buffer2.handle(); - VkSubmitInfo2KHR submit_info = vku::InitStructHelper(); + VkSubmitInfo2 submit_info = vku::InitStructHelper(); submit_info.commandBufferInfoCount = 2; submit_info.pCommandBufferInfos = command_buffer_submit_info; vk::QueueSubmit2KHR(m_default_queue->handle(), 1, &submit_info, VK_NULL_HANDLE); @@ -4650,7 +4650,7 @@ TEST_F(NegativeDynamicRendering, NullDepthStencilExecuteCommands) { VkFormat depth_stencil_format = FindSupportedDepthStencilFormat(Gpu()); - VkCommandBufferInheritanceRenderingInfoKHR cbiri = vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo cbiri = vku::InitStructHelper(); // format is defined, although no image view provided in dynamic rendering cbiri.depthAttachmentFormat = depth_stencil_format; cbiri.stencilAttachmentFormat = depth_stencil_format; @@ -4669,8 +4669,8 @@ TEST_F(NegativeDynamicRendering, NullDepthStencilExecuteCommands) { rai.imageView = depth_stencil_view; rai.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR ri = vku::InitStructHelper(); - ri.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR; + VkRenderingInfo ri = vku::InitStructHelper(); + ri.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; ri.layerCount = 1; ri.pDepthAttachment = &rai; ri.pStencilAttachment = &rai; @@ -4730,11 +4730,11 @@ TEST_F(NegativeDynamicRendering, BeginRenderingWithSecondaryContents) { TEST_DESCRIPTION("Test that an error is produced when a secondary command buffer calls BeginRendering with secondary contents"); RETURN_IF_SKIP(InitBasicDynamicRendering()); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); - begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR; + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); + begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; begin_rendering_info.layerCount = 1; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; @@ -4754,21 +4754,20 @@ TEST_F(NegativeDynamicRendering, BeginRenderingWithSecondaryContents) { TEST_F(NegativeDynamicRendering, BadRenderPassContentsWhenCallingCmdExecuteCommands) { TEST_DESCRIPTION( "Test CmdExecuteCommands inside a render pass begun with CmdBeginRendering that hasn't set " - "VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR"); + "VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT"); RETURN_IF_SKIP(InitBasicDynamicRendering()); constexpr VkFormat color_formats = {VK_FORMAT_UNDEFINED}; // undefined because no image view will be used - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkCommandBufferInheritanceRenderingInfoKHR inheritance_rendering_info = - vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo inheritance_rendering_info = vku::InitStructHelper(); inheritance_rendering_info.colorAttachmentCount = 1; inheritance_rendering_info.pColorAttachmentFormats = &color_formats; inheritance_rendering_info.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -4825,17 +4824,16 @@ TEST_F(NegativeDynamicRendering, ExecuteCommandsWithNonNullRenderPass) { VkFormat color_formats = {VK_FORMAT_R8G8B8A8_UNORM}; - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkCommandBufferInheritanceRenderingInfoKHR inheritance_rendering_info = - vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo inheritance_rendering_info = vku::InitStructHelper(); inheritance_rendering_info.colorAttachmentCount = 1; inheritance_rendering_info.pColorAttachmentFormats = &color_formats; inheritance_rendering_info.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); - begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR; + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); + begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -4876,18 +4874,17 @@ TEST_F(NegativeDynamicRendering, ExecuteCommandsWithMismatchingFlags) { constexpr VkFormat color_formats = {VK_FORMAT_UNDEFINED}; // undefined because no image view will be used - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkCommandBufferInheritanceRenderingInfoKHR inheritance_rendering_info = - vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo inheritance_rendering_info = vku::InitStructHelper(); inheritance_rendering_info.colorAttachmentCount = 1; inheritance_rendering_info.pColorAttachmentFormats = &color_formats; inheritance_rendering_info.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.flags = - VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR | VK_RENDERING_SUSPENDING_BIT_KHR | VK_RENDERING_RESUMING_BIT_KHR; + VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT | VK_RENDERING_SUSPENDING_BIT | VK_RENDERING_RESUMING_BIT; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -4929,17 +4926,16 @@ TEST_F(NegativeDynamicRendering, ExecuteCommandsWithMismatchingColorAttachmentCo VkFormat color_formats = {VK_FORMAT_R8G8B8A8_UNORM}; - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkCommandBufferInheritanceRenderingInfoKHR inheritance_rendering_info = - vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo inheritance_rendering_info = vku::InitStructHelper(); inheritance_rendering_info.colorAttachmentCount = 0; inheritance_rendering_info.pColorAttachmentFormats = &color_formats; inheritance_rendering_info.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); - begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR; + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); + begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -4982,19 +4978,19 @@ TEST_F(NegativeDynamicRendering, ExecuteCommandsWithMismatchingColorImageViewFor vkt::Image image(*m_device, 32, 32, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView imageView = image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.imageView = imageView; constexpr std::array bad_color_formats = {VK_FORMAT_R8G8B8A8_UINT}; - VkCommandBufferInheritanceRenderingInfoKHR inheritance_rendering_info = vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo inheritance_rendering_info = vku::InitStructHelper(); inheritance_rendering_info.colorAttachmentCount = bad_color_formats.size(); inheritance_rendering_info.pColorAttachmentFormats = bad_color_formats.data(); inheritance_rendering_info.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); - begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR; + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); + begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -5029,19 +5025,19 @@ TEST_F(NegativeDynamicRendering, ExecuteCommandsWithNullImageView) { "CmdBeginRendering where the same image is specified as null"); RETURN_IF_SKIP(InitBasicDynamicRendering()); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.imageView = VK_NULL_HANDLE; constexpr std::array bad_color_formats = {VK_FORMAT_R8G8B8A8_UINT}; - VkCommandBufferInheritanceRenderingInfoKHR inheritance_rendering_info = vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo inheritance_rendering_info = vku::InitStructHelper(); inheritance_rendering_info.colorAttachmentCount = bad_color_formats.size(); inheritance_rendering_info.pColorAttachmentFormats = bad_color_formats.data(); inheritance_rendering_info.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); - begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR; + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); + begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -5086,18 +5082,17 @@ TEST_F(NegativeDynamicRendering, ExecuteCommandsWithMismatchingDepthStencilImage image.SetLayout(VK_IMAGE_LAYOUT_GENERAL); vkt::ImageView imageView = image.CreateView(VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT); - VkRenderingAttachmentInfoKHR depth_stencil_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo depth_stencil_attachment = vku::InitStructHelper(); depth_stencil_attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; depth_stencil_attachment.imageView = imageView; - VkCommandBufferInheritanceRenderingInfoKHR inheritance_rendering_info = - vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo inheritance_rendering_info = vku::InitStructHelper(); inheritance_rendering_info.depthAttachmentFormat = VK_FORMAT_D32_SFLOAT_S8_UINT; inheritance_rendering_info.stencilAttachmentFormat = VK_FORMAT_D32_SFLOAT_S8_UINT; inheritance_rendering_info.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); - begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR; + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); + begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; begin_rendering_info.pDepthAttachment = &depth_stencil_attachment; begin_rendering_info.pStencilAttachment = &depth_stencil_attachment; begin_rendering_info.layerCount = 1; @@ -5137,20 +5132,19 @@ TEST_F(NegativeDynamicRendering, ExecuteCommandsWithMismatchingViewMask) { AddRequiredFeature(vkt::Feature::multiview); RETURN_IF_SKIP(InitBasicDynamicRendering()); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; VkFormat color_formats = {VK_FORMAT_UNDEFINED}; // undefined because no image view will be used - VkCommandBufferInheritanceRenderingInfoKHR inheritance_rendering_info = - vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo inheritance_rendering_info = vku::InitStructHelper(); inheritance_rendering_info.viewMask = 0; inheritance_rendering_info.colorAttachmentCount = 1; inheritance_rendering_info.pColorAttachmentFormats = &color_formats; inheritance_rendering_info.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); - begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR; + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); + begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; begin_rendering_info.viewMask = 1; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; @@ -5191,20 +5185,19 @@ TEST_F(NegativeDynamicRendering, ExecuteCommandsWithMismatchingImageViewRasteriz image.SetLayout(VK_IMAGE_LAYOUT_GENERAL); vkt::ImageView imageView = image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.imageView = imageView; VkFormat color_formats = {VK_FORMAT_R8G8B8A8_UNORM}; - VkCommandBufferInheritanceRenderingInfoKHR inheritance_rendering_info = - vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo inheritance_rendering_info = vku::InitStructHelper(); inheritance_rendering_info.colorAttachmentCount = 1; inheritance_rendering_info.pColorAttachmentFormats = &color_formats; inheritance_rendering_info.rasterizationSamples = VK_SAMPLE_COUNT_2_BIT; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); - begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR; + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); + begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -5242,7 +5235,7 @@ TEST_F(NegativeDynamicRendering, ExecuteCommandsWithMismatchingImageViewRasteriz vkt::Image depthStencilImage(*m_device, 32, 32, 1, depth_stencil_format, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT); vkt::ImageView depthStencilImageView = depthStencilImage.CreateView(VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT); - VkRenderingAttachmentInfoKHR depth_stencil_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo depth_stencil_attachment = vku::InitStructHelper(); depth_stencil_attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; depth_stencil_attachment.imageView = depthStencilImageView; @@ -5297,7 +5290,7 @@ TEST_F(NegativeDynamicRendering, ExecuteCommandsWithMismatchingImageViewAttachme image.SetLayout(VK_IMAGE_LAYOUT_GENERAL); vkt::ImageView imageView = image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.imageView = imageView; @@ -5308,13 +5301,13 @@ TEST_F(NegativeDynamicRendering, ExecuteCommandsWithMismatchingImageViewAttachme samples_info.colorAttachmentCount = 1; samples_info.pColorAttachmentSamples = &counts; - VkCommandBufferInheritanceRenderingInfoKHR inheritance_rendering_info = vku::InitStructHelper(&samples_info); + VkCommandBufferInheritanceRenderingInfo inheritance_rendering_info = vku::InitStructHelper(&samples_info); inheritance_rendering_info.colorAttachmentCount = 1; inheritance_rendering_info.pColorAttachmentFormats = &color_formats; inheritance_rendering_info.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); - begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR; + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); + begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -5352,7 +5345,7 @@ TEST_F(NegativeDynamicRendering, ExecuteCommandsWithMismatchingImageViewAttachme vkt::Image depthStencilImage(*m_device, 32, 32, 1, depth_stencil_format, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT); vkt::ImageView depthStencilImageView = depthStencilImage.CreateView(VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT); - VkRenderingAttachmentInfoKHR depth_stencil_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo depth_stencil_attachment = vku::InitStructHelper(); depth_stencil_attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; depth_stencil_attachment.imageView = depthStencilImageView; @@ -5398,15 +5391,14 @@ TEST_F(NegativeDynamicRendering, InSecondaryCommandBuffers) { VkFormat format = VK_FORMAT_R32G32B32A32_UINT; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &format; CreatePipelineHelper pipe(*this, &pipeline_rendering_info); pipe.CreateGraphicsPipeline(); - VkCommandBufferInheritanceRenderingInfoKHR inheritanceRenderingInfo = - vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo inheritanceRenderingInfo = vku::InitStructHelper(); inheritanceRenderingInfo.colorAttachmentCount = 1; inheritanceRenderingInfo.pColorAttachmentFormats = &format; inheritanceRenderingInfo.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; @@ -5426,8 +5418,7 @@ TEST_F(NegativeDynamicRendering, InSecondaryCommandBuffers) { } TEST_F(NegativeDynamicRendering, CommandBufferInheritanceDepthFormat) { - TEST_DESCRIPTION( - "Test VkCommandBufferInheritanceRenderingInfoKHR with depthAttachmentFormat that does not include depth aspect"); + TEST_DESCRIPTION("Test VkCommandBufferInheritanceRenderingInfo with depthAttachmentFormat that does not include depth aspect"); AddRequiredFeature(vkt::Feature::variableMultisampleRate); RETURN_IF_SKIP(InitBasicDynamicRendering()); @@ -5436,7 +5427,7 @@ TEST_F(NegativeDynamicRendering, CommandBufferInheritanceDepthFormat) { GTEST_SKIP() << "Couldn't find a stencil only image format"; } - VkCommandBufferInheritanceRenderingInfoKHR inheritance_rendering_info = vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo inheritance_rendering_info = vku::InitStructHelper(); inheritance_rendering_info.depthAttachmentFormat = stencil_format; vkt::CommandBuffer secondary(*m_device, m_command_pool, VK_COMMAND_BUFFER_LEVEL_SECONDARY); @@ -5463,11 +5454,11 @@ TEST_F(NegativeDynamicRendering, DeviceGroupRenderArea) { device_group_render_pass_begin_info.deviceRenderAreaCount = 1; device_group_render_pass_begin_info.pDeviceRenderAreas = &renderArea; - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(&device_group_render_pass_begin_info); - begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR; + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(&device_group_render_pass_begin_info); + begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; begin_rendering_info.layerCount = 1; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; @@ -5510,10 +5501,10 @@ TEST_F(NegativeDynamicRendering, MaxFramebufferLayers) { TEST_DESCRIPTION("Go over maxFramebufferLayers"); RETURN_IF_SKIP(InitBasicDynamicRendering()); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = m_device->Physical().limits_.maxFramebufferLayers + 1; begin_rendering_info.renderArea = {{0, 0}, {64, 64}}; begin_rendering_info.colorAttachmentCount = 1; @@ -5558,8 +5549,7 @@ TEST_F(NegativeDynamicRendering, EndRenderingWithIncorrectlyStartedRenderpassIns VkFormat color_formats = {VK_FORMAT_R8G8B8A8_UNORM}; - VkCommandBufferInheritanceRenderingInfoKHR inheritance_rendering_info = - vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo inheritance_rendering_info = vku::InitStructHelper(); inheritance_rendering_info.colorAttachmentCount = 1; inheritance_rendering_info.pColorAttachmentFormats = &color_formats; inheritance_rendering_info.rasterizationSamples = VK_SAMPLE_COUNT_16_BIT; @@ -5592,11 +5582,11 @@ TEST_F(NegativeDynamicRendering, EndRenderpassWithBeginRenderingRenderpassInstan vkt::Image image(*m_device, 32, 32, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView imageView = image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.imageView = imageView; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -5609,7 +5599,7 @@ TEST_F(NegativeDynamicRendering, EndRenderpassWithBeginRenderingRenderpassInstan m_command_buffer.EndRenderPass(); m_errorMonitor->VerifyFound(); - VkSubpassEndInfoKHR subpassEndInfo = {VK_STRUCTURE_TYPE_SUBPASS_END_INFO_KHR, nullptr}; + VkSubpassEndInfo subpassEndInfo = {VK_STRUCTURE_TYPE_SUBPASS_END_INFO_KHR, nullptr}; vkt::CommandBuffer primary(*m_device, m_command_pool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); @@ -5629,7 +5619,7 @@ TEST_F(NegativeDynamicRendering, BeginRenderingDisabled) { InitRenderTarget(); bool vulkan_13 = (DeviceValidationVersion() >= VK_API_VERSION_1_3); - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; @@ -5672,7 +5662,7 @@ TEST_F(NegativeDynamicRendering, PipelineRenderingParameters) { } VkFormat color_formats = {depth_format}; - auto pipeline_rendering_info = vku::InitStruct(); + auto pipeline_rendering_info = vku::InitStruct(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_formats; @@ -5733,7 +5723,7 @@ TEST_F(NegativeDynamicRendering, PipelineRenderingViewMaskParameter) { AddRequiredFeature(vkt::Feature::multiview); RETURN_IF_SKIP(InitBasicDynamicRendering()); - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); VkFormat color_formats = {VK_FORMAT_R8G8B8A8_UNORM}; pipeline_rendering_info.colorAttachmentCount = 1; @@ -5773,7 +5763,7 @@ TEST_F(NegativeDynamicRendering, CreateGraphicsPipeline) { const vkt::PipelineLayout pl(*m_device, {&dsl}); VkFormat color_format = VK_FORMAT_R8G8B8A8_UNORM; - VkPipelineRenderingCreateInfoKHR rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo rendering_info = vku::InitStructHelper(); rendering_info.colorAttachmentCount = 1; rendering_info.pColorAttachmentFormats = &color_format; @@ -5819,7 +5809,7 @@ TEST_F(NegativeDynamicRendering, DynamicColorBlendAttchment) { RETURN_IF_SKIP(InitBasicDynamicRendering()); VkFormat color_formats = VK_FORMAT_UNDEFINED; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_formats; @@ -5827,10 +5817,10 @@ TEST_F(NegativeDynamicRendering, DynamicColorBlendAttchment) { pipe.AddDynamicState(VK_DYNAMIC_STATE_COLOR_WRITE_MASK_EXT); pipe.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -5858,10 +5848,10 @@ TEST_F(NegativeDynamicRendering, BeginTwice) { TEST_DESCRIPTION("Call vkCmdBeginRendering twice in a row"); RETURN_IF_SKIP(InitBasicDynamicRendering()); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {64, 64}}; begin_rendering_info.colorAttachmentCount = 1; @@ -5880,10 +5870,10 @@ TEST_F(NegativeDynamicRendering, EndTwice) { TEST_DESCRIPTION("Call vkCmdEndRendering twice in a row"); RETURN_IF_SKIP(InitBasicDynamicRendering()); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {64, 64}}; begin_rendering_info.colorAttachmentCount = 1; @@ -5939,7 +5929,7 @@ TEST_F(NegativeDynamicRendering, MismatchingDepthAttachmentFormatInSecondaryCmdB GTEST_SKIP() << "Could not find 2 ds attachment formats"; } - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.depthAttachmentFormat = depth_format1; CreatePipelineHelper pipe(*this, &pipeline_rendering_info); @@ -6013,12 +6003,12 @@ TEST_F(NegativeDynamicRendering, MissingImageCreateSubsampled) { } TEST_F(NegativeDynamicRendering, DynamicRenderingInlineContents) { - TEST_DESCRIPTION("Use dynamic rendering with VK_RENDERING_CONTENTS_INLINE_BIT_EXT"); + TEST_DESCRIPTION("Use dynamic rendering with VK_RENDERING_CONTENTS_INLINE_BIT_KHR"); AddRequiredExtensions(VK_EXT_NESTED_COMMAND_BUFFER_EXTENSION_NAME); RETURN_IF_SKIP(InitBasicDynamicRendering()); VkRenderingInfo rendering_info = vku::InitStructHelper(); - rendering_info.flags = VK_RENDERING_CONTENTS_INLINE_BIT_EXT; + rendering_info.flags = VK_RENDERING_CONTENTS_INLINE_BIT_KHR; rendering_info.renderArea = {{0, 0}, {32u, 32u}}; rendering_info.layerCount = 1u; @@ -6038,7 +6028,7 @@ TEST_F(NegativeDynamicRendering, IdentitySwizzleColor) { view_info.components.r = VK_COMPONENT_SWIZZLE_G; vkt::ImageView image_view(*m_device, view_info); - VkRenderingAttachmentInfoKHR attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo attachment = vku::InitStructHelper(); attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; attachment.imageView = image_view.handle(); @@ -6065,7 +6055,7 @@ TEST_F(NegativeDynamicRendering, IdentitySwizzleDepthStencil) { view_info.components.r = VK_COMPONENT_SWIZZLE_G; vkt::ImageView image_view(*m_device, view_info); - VkRenderingAttachmentInfoKHR attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo attachment = vku::InitStructHelper(); attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; attachment.imageView = image_view.handle(); @@ -6169,7 +6159,7 @@ TEST_F(NegativeDynamicRendering, ResolveAttachmentUsage) { vkt::Image resolve_image(*m_device, 32, 32, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView resolve_image_view = resolve_image.CreateView(); - VkRenderingAttachmentInfoKHR attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo attachment = vku::InitStructHelper(); attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; attachment.imageView = image_view.handle(); attachment.resolveImageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; @@ -6207,7 +6197,7 @@ TEST_F(NegativeDynamicRendering, BeginRenderingWithRenderPassStriped) { const uint32_t stripe_width = rp_striped_props.renderPassStripeGranularity.width; const uint32_t stripe_height = rp_striped_props.renderPassStripeGranularity.height; - VkRenderingInfoKHR rendering_info = vku::InitStructHelper(); + VkRenderingInfo rendering_info = vku::InitStructHelper(); rendering_info.layerCount = 1; uint32_t stripe_count = rp_striped_props.maxRenderPassStripes + 1; @@ -6350,7 +6340,7 @@ TEST_F(NegativeDynamicRendering, RenderPassStripeInfoQueueSubmit2) { rp_stripe_info.stripeInfoCount = stripe_count; rp_stripe_info.pStripeInfos = stripe_infos.data(); - VkRenderingInfoKHR rendering_info = vku::InitStructHelper(&rp_stripe_info); + VkRenderingInfo rendering_info = vku::InitStructHelper(&rp_stripe_info); rendering_info.layerCount = 1; rendering_info.renderArea = {{0, 0}, {stripe_width * stripe_count, stripe_height}}; @@ -6369,7 +6359,7 @@ TEST_F(NegativeDynamicRendering, RenderPassStripeInfoQueueSubmit2) { m_errorMonitor->SetDesiredError("VUID-VkCommandBufferSubmitInfo-commandBuffer-09445"); - VkSubmitInfo2KHR submit_info = vku::InitStructHelper(); + VkSubmitInfo2 submit_info = vku::InitStructHelper(); submit_info.commandBufferInfoCount = 1; submit_info.pCommandBufferInfos = &cb_submit_info; vk::QueueSubmit2KHR(m_default_queue->handle(), 1, &submit_info, VK_NULL_HANDLE); @@ -6378,8 +6368,8 @@ TEST_F(NegativeDynamicRendering, RenderPassStripeInfoQueueSubmit2) { m_errorMonitor->VerifyFound(); VkSemaphoreCreateInfo semaphore_create_info = vku::InitStructHelper(); - VkSemaphoreTypeCreateInfoKHR semaphore_type_create_info = vku::InitStructHelper(); - semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE_KHR; + VkSemaphoreTypeCreateInfo semaphore_type_create_info = vku::InitStructHelper(); + semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE; VkSemaphoreCreateInfo semaphore_timeline_create_info = vku::InitStructHelper(&semaphore_type_create_info); vkt::Semaphore semaphore[stripe_count + 1]; VkSemaphoreSubmitInfo semaphore_submit_infos[stripe_count + 1]; @@ -6411,21 +6401,21 @@ TEST_F(NegativeDynamicRendering, PipelineLegacyDithering) { AddRequiredFeature(vkt::Feature::maintenance5); RETURN_IF_SKIP(InitBasicDynamicRendering()); - VkPipelineCreateFlags2CreateInfoKHR create_flags_2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo create_flags_2 = vku::InitStructHelper(); create_flags_2.flags = VK_PIPELINE_CREATE_2_ENABLE_LEGACY_DITHERING_BIT_EXT; VkFormat color_formats = VK_FORMAT_UNDEFINED; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(&create_flags_2); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(&create_flags_2); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_formats; CreatePipelineHelper pipe(*this, &pipeline_rendering_info); pipe.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -6447,17 +6437,17 @@ TEST_F(NegativeDynamicRendering, RenderPassLegacyDithering) { RETURN_IF_SKIP(InitBasicDynamicRendering()); VkFormat color_formats = VK_FORMAT_UNDEFINED; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_formats; CreatePipelineHelper pipe(*this, &pipeline_rendering_info); pipe.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.flags = VK_RENDERING_ENABLE_LEGACY_DITHERING_BIT_EXT; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; diff --git a/tests/unit/dynamic_rendering_local_read.cpp b/tests/unit/dynamic_rendering_local_read.cpp index 8ce61fae349..7306993f8ff 100644 --- a/tests/unit/dynamic_rendering_local_read.cpp +++ b/tests/unit/dynamic_rendering_local_read.cpp @@ -21,7 +21,7 @@ class NegativeDynamicRenderingLocalRead : public DynamicRenderingTest {}; TEST_F(NegativeDynamicRenderingLocalRead, AttachmentLayout) { - TEST_DESCRIPTION("Feature is disabled, but attachment descriptor and/or reference uses VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR"); + TEST_DESCRIPTION("Feature is disabled, but attachment descriptor and/or reference uses VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ"); // Add extention, but keep feature disabled AddRequiredExtensions(VK_KHR_DYNAMIC_RENDERING_LOCAL_READ_EXTENSION_NAME); @@ -42,18 +42,18 @@ TEST_F(NegativeDynamicRenderingLocalRead, AttachmentLayout) { auto rpci = vku::InitStruct(nullptr, 0u, 1u, attach, 1u, subpasses, 0u, nullptr); - refs[0].layout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR; + refs[0].layout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, true, "VUID-VkAttachmentReference-dynamicRenderingLocalRead-09546", "VUID-VkAttachmentReference2-dynamicRenderingLocalRead-09546"); refs[0].layout = VK_IMAGE_LAYOUT_GENERAL; - attach->initialLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR; + attach->initialLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, true, "VUID-VkAttachmentDescription-dynamicRenderingLocalRead-09544", "VUID-VkAttachmentDescription2-dynamicRenderingLocalRead-09544"); attach->initialLayout = VK_IMAGE_LAYOUT_GENERAL; - attach->finalLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR; + attach->finalLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, true, "VUID-VkAttachmentDescription-dynamicRenderingLocalRead-09545", "VUID-VkAttachmentDescription2-dynamicRenderingLocalRead-09545"); @@ -66,10 +66,10 @@ TEST_F(NegativeDynamicRenderingLocalRead, CmdDrawColorLocation) { VkFormat color_formats[] = {VK_FORMAT_UNDEFINED, VK_FORMAT_UNDEFINED}; uint32_t locations[] = {1, 0, 2}; - VkRenderingAttachmentLocationInfoKHR pipeline_location_info = vku::InitStructHelper(); + VkRenderingAttachmentLocationInfo pipeline_location_info = vku::InitStructHelper(); pipeline_location_info.colorAttachmentCount = 2; pipeline_location_info.pColorAttachmentLocations = locations; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(&pipeline_location_info); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(&pipeline_location_info); pipeline_rendering_info.colorAttachmentCount = 2; pipeline_rendering_info.pColorAttachmentFormats = color_formats; @@ -84,7 +84,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, CmdDrawColorLocation) { pipe.gp_ci_.pColorBlendState = &cbi; pipe.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachment[2] = {vku::InitStructHelper(), vku::InitStructHelper()}; + VkRenderingAttachmentInfo color_attachment[2] = {vku::InitStructHelper(), vku::InitStructHelper()}; color_attachment[0].imageLayout = VK_IMAGE_LAYOUT_UNDEFINED; color_attachment[1].imageLayout = VK_IMAGE_LAYOUT_UNDEFINED; @@ -99,7 +99,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, CmdDrawColorLocation) { m_command_buffer.BeginRendering(rendering_info); - VkRenderingAttachmentLocationInfoKHR location_info = vku::InitStructHelper(); + VkRenderingAttachmentLocationInfo location_info = vku::InitStructHelper(); location_info.colorAttachmentCount = 2; location_info.pColorAttachmentLocations = &locations[1]; vk::CmdSetRenderingAttachmentLocationsKHR(m_command_buffer.handle(), &location_info); @@ -117,15 +117,15 @@ TEST_F(NegativeDynamicRenderingLocalRead, CmdDrawColorIndex) { uint32_t locations[] = {0, 1}; uint32_t inputs[] = {0, 1, 0}; - VkRenderingInputAttachmentIndexInfoKHR inputs_info = vku::InitStructHelper(); + VkRenderingInputAttachmentIndexInfo inputs_info = vku::InitStructHelper(); inputs_info.colorAttachmentCount = 2; inputs_info.pColorAttachmentInputIndices = inputs; - VkRenderingAttachmentLocationInfoKHR locations_info = vku::InitStructHelper(&inputs_info); + VkRenderingAttachmentLocationInfo locations_info = vku::InitStructHelper(&inputs_info); locations_info.colorAttachmentCount = 2; locations_info.pColorAttachmentLocations = locations; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(&locations_info); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(&locations_info); pipeline_rendering_info.colorAttachmentCount = 2; pipeline_rendering_info.pColorAttachmentFormats = color_formats; @@ -139,7 +139,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, CmdDrawColorIndex) { pipe.gp_ci_.pColorBlendState = &cbi; pipe.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachment[2] = {vku::InitStructHelper(), vku::InitStructHelper()}; + VkRenderingAttachmentInfo color_attachment[2] = {vku::InitStructHelper(), vku::InitStructHelper()}; color_attachment[0].imageLayout = VK_IMAGE_LAYOUT_UNDEFINED; color_attachment[1].imageLayout = VK_IMAGE_LAYOUT_UNDEFINED; @@ -154,11 +154,11 @@ TEST_F(NegativeDynamicRenderingLocalRead, CmdDrawColorIndex) { m_command_buffer.BeginRendering(rendering_info); - VkRenderingAttachmentLocationInfoKHR location_info = vku::InitStructHelper(); + VkRenderingAttachmentLocationInfo location_info = vku::InitStructHelper(); location_info.colorAttachmentCount = 2; location_info.pColorAttachmentLocations = locations; - VkRenderingInputAttachmentIndexInfoKHR input_info = vku::InitStructHelper(); + VkRenderingInputAttachmentIndexInfo input_info = vku::InitStructHelper(); input_info.colorAttachmentCount = 2; input_info.pColorAttachmentInputIndices = &inputs[1]; @@ -175,7 +175,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, CmdClearAttachments) { RETURN_IF_SKIP(InitBasicDynamicRenderingLocalRead()); VkFormat color_format = VK_FORMAT_R8G8B8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -183,7 +183,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, CmdClearAttachments) { pipe.gp_ci_.renderPass = VK_NULL_HANDLE; pipe.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_UNDEFINED; m_command_buffer.Begin(); @@ -198,7 +198,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, CmdClearAttachments) { m_command_buffer.BeginRendering(rendering_info); uint32_t location = VK_ATTACHMENT_UNUSED; - VkRenderingAttachmentLocationInfoKHR location_info = vku::InitStructHelper(); + VkRenderingAttachmentLocationInfo location_info = vku::InitStructHelper(); location_info.colorAttachmentCount = 1; location_info.pColorAttachmentLocations = &location; @@ -235,7 +235,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, ImageBarrier) { VkImageMemoryBarrier img_barrier = vku::InitStructHelper(); img_barrier.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED; img_barrier.srcAccessMask = VK_ACCESS_NONE; - img_barrier.newLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR; + img_barrier.newLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ; img_barrier.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; img_barrier.image = image.handle(); img_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; @@ -251,7 +251,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, ImageBarrier) { auto img_barrier2 = ConvertVkImageMemoryBarrierToV2(img_barrier, VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT); - VkDependencyInfoKHR dependency_info = vku::InitStructHelper(); + VkDependencyInfo dependency_info = vku::InitStructHelper(); dependency_info.dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT; dependency_info.imageMemoryBarrierCount = 1; dependency_info.pImageMemoryBarriers = img_barrier2.ptr(); @@ -270,7 +270,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, ImageBarrier) { img_barrier2.newLayout = VK_IMAGE_LAYOUT_GENERAL; img_barrier2.dstAccessMask = VK_ACCESS_NONE; - img_barrier2.oldLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR; + img_barrier2.oldLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ; img_barrier2.srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; m_errorMonitor->SetDesiredError("VUID-VkImageMemoryBarrier2-dynamicRenderingLocalRead-09551"); @@ -280,7 +280,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, ImageBarrier) { img_barrier.newLayout = VK_IMAGE_LAYOUT_GENERAL; img_barrier.dstAccessMask = VK_ACCESS_NONE; - img_barrier.oldLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR; + img_barrier.oldLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ; img_barrier.srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; m_errorMonitor->SetDesiredError("VUID-VkImageMemoryBarrier-dynamicRenderingLocalRead-09551"); @@ -313,7 +313,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, ImageBarrierOwnership) { VkImageMemoryBarrier img_barrier = vku::InitStructHelper(); img_barrier.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED; img_barrier.srcAccessMask = VK_ACCESS_NONE; - img_barrier.newLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR; + img_barrier.newLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ; img_barrier.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; img_barrier.image = image.handle(); img_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; @@ -329,7 +329,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, ImageBarrierOwnership) { auto img_barrier2 = ConvertVkImageMemoryBarrierToV2(img_barrier, VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT); - VkDependencyInfoKHR dependency_info = vku::InitStructHelper(); + VkDependencyInfo dependency_info = vku::InitStructHelper(); dependency_info.dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT; dependency_info.imageMemoryBarrierCount = 1; dependency_info.pImageMemoryBarriers = img_barrier2.ptr(); @@ -385,7 +385,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, ImageBarrierNoBufferOrImage) { auto img_barrier2 = ConvertVkImageMemoryBarrierToV2(img_barrier, VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT); - VkDependencyInfoKHR dependency_info = vku::InitStructHelper(); + VkDependencyInfo dependency_info = vku::InitStructHelper(); dependency_info.dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT; dependency_info.imageMemoryBarrierCount = 1; dependency_info.pImageMemoryBarriers = img_barrier2.ptr(); @@ -420,7 +420,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, ImageBarrierFramebufferStagesOnly) { barrier2.dstStageMask = VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT; barrier2.dstAccessMask = VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT; - VkDependencyInfoKHR dependency_info = vku::InitStructHelper(); + VkDependencyInfo dependency_info = vku::InitStructHelper(); dependency_info.dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT; dependency_info.memoryBarrierCount = 1; dependency_info.pMemoryBarriers = &barrier2; @@ -479,7 +479,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, ImageBarrierRequireFeature) { barrier2.dstStageMask = VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT; barrier2.dstAccessMask = VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT; - VkDependencyInfoKHR dependency_info = vku::InitStructHelper(); + VkDependencyInfo dependency_info = vku::InitStructHelper(); dependency_info.dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT; dependency_info.memoryBarrierCount = 1; dependency_info.pMemoryBarriers = &barrier2; @@ -504,7 +504,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, ImageBarrierRequireFeature) { TEST_F(NegativeDynamicRenderingLocalRead, ImageBarrierInProperLayout) { TEST_DESCRIPTION( "Barrier within a render pass instance started with vkCmdBeginRendering, then the image must be in the " - "VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR or VK_IMAGE_LAYOUT_GENERAL layout"); + "VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ or VK_IMAGE_LAYOUT_GENERAL layout"); SetTargetApiVersion(VK_API_VERSION_1_3); AddRequiredFeature(vkt::Feature::synchronization2); RETURN_IF_SKIP(InitBasicDynamicRenderingLocalRead()); @@ -515,11 +515,11 @@ TEST_F(NegativeDynamicRenderingLocalRead, ImageBarrierInProperLayout) { vkt::Image image(*m_device, m_width, m_height, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView imageView = image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.imageView = imageView; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); VkClearRect clear_rect = {{{0, 0}, {m_width, m_height}}, 0, 1}; begin_rendering_info.renderArea = clear_rect.rect; begin_rendering_info.layerCount = 1; @@ -545,7 +545,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, ImageBarrierInProperLayout) { auto img_barrier2 = ConvertVkImageMemoryBarrierToV2(img_barrier, VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT); - VkDependencyInfoKHR dependency_info = vku::InitStructHelper(); + VkDependencyInfo dependency_info = vku::InitStructHelper(); dependency_info.dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT; dependency_info.imageMemoryBarrierCount = 1; dependency_info.pImageMemoryBarriers = img_barrier2.ptr(); @@ -588,11 +588,11 @@ TEST_F(NegativeDynamicRenderingLocalRead, BeginWithinRenderPass) { att.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; att.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - att.initialLayout = i == 0 ? VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR : VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - att.finalLayout = i == 1 ? VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR : VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + att.initialLayout = i == 0 ? VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ : VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + att.finalLayout = i == 1 ? VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ : VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; VkAttachmentReference ref = {}; - ref.layout = i == 2 ? VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR : VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + ref.layout = i == 2 ? VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ : VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; ref.attachment = 0; m_renderPassClearValues.clear(); @@ -658,7 +658,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, BeginWithinRenderPass) { m_errorMonitor->VerifyFound(); if (rp2Supported) { - auto subpassBeginInfo = vku::InitStruct(nullptr, VK_SUBPASS_CONTENTS_INLINE); + auto subpassBeginInfo = vku::InitStruct(nullptr, VK_SUBPASS_CONTENTS_INLINE); m_errorMonitor->SetDesiredError("VUID-vkCmdBeginRenderPass2-initialLayout-09538"); vk::CmdBeginRenderPass2KHR(m_command_buffer.handle(), &m_renderPassBeginInfo, &subpassBeginInfo); @@ -675,16 +675,16 @@ TEST_F(NegativeDynamicRenderingLocalRead, RemappingAtCreatePipeline) { TEST_DESCRIPTION("Color attachment count in Inputs Info must match to Rendering Create Info"); RETURN_IF_SKIP(InitBasicDynamicRenderingLocalRead()); - VkRenderingAttachmentLocationInfoKHR location_info = vku::InitStructHelper(); + VkRenderingAttachmentLocationInfo location_info = vku::InitStructHelper(); location_info.colorAttachmentCount = 0; location_info.pColorAttachmentLocations = nullptr; - VkRenderingInputAttachmentIndexInfoKHR input_info = vku::InitStructHelper(&location_info); + VkRenderingInputAttachmentIndexInfo input_info = vku::InitStructHelper(&location_info); input_info.colorAttachmentCount = 0; input_info.pColorAttachmentInputIndices = nullptr; VkFormat color_format = VK_FORMAT_R8G8B8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(&input_info); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(&input_info); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -706,12 +706,12 @@ TEST_F(NegativeDynamicRenderingLocalRead, InputAttachmentIndexColorAttachmentCou input_attachment_indices[i] = static_cast(i); } - VkRenderingInputAttachmentIndexInfoKHR input_info = vku::InitStructHelper(); + VkRenderingInputAttachmentIndexInfo input_info = vku::InitStructHelper(); input_info.colorAttachmentCount = static_cast(input_attachment_indices.size()); input_info.pColorAttachmentInputIndices = input_attachment_indices.data(); VkFormat color_format = VK_FORMAT_R8G8B8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(&input_info); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(&input_info); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -730,7 +730,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, ColorAttachmentCountInPipelineRenderin std::vector color_attachments(m_device->Physical().limits_.maxColorAttachments + 1, VK_FORMAT_R8G8B8A8_UNORM); - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = color_attachments.size(); pipeline_rendering_info.pColorAttachmentFormats = color_attachments.data(); @@ -747,7 +747,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, CmdSetAttachmentIndicesColorAttachment RETURN_IF_SKIP(InitBasicDynamicRenderingLocalRead()); VkFormat color_format = VK_FORMAT_R8G8B8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -755,7 +755,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, CmdSetAttachmentIndicesColorAttachment pipe.gp_ci_.renderPass = VK_NULL_HANDLE; pipe.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachment[2] = {vku::InitStructHelper(), vku::InitStructHelper()}; + VkRenderingAttachmentInfo color_attachment[2] = {vku::InitStructHelper(), vku::InitStructHelper()}; color_attachment[0].imageLayout = VK_IMAGE_LAYOUT_UNDEFINED; color_attachment[1].imageLayout = VK_IMAGE_LAYOUT_UNDEFINED; @@ -771,7 +771,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, CmdSetAttachmentIndicesColorAttachment m_command_buffer.BeginRendering(rendering_info); uint32_t locations[] = {0}; - VkRenderingInputAttachmentIndexInfoKHR input_info = vku::InitStructHelper(); + VkRenderingInputAttachmentIndexInfo input_info = vku::InitStructHelper(); input_info.colorAttachmentCount = 1; input_info.pColorAttachmentInputIndices = locations; @@ -792,7 +792,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, CmdSetAttachmentIndices) { vk::CmdBindPipeline(m_command_buffer.handle(), VK_PIPELINE_BIND_POINT_GRAPHICS, pipe.Handle()); m_command_buffer.BeginRenderPass(m_renderPassBeginInfo); - VkRenderingInputAttachmentIndexInfoKHR input_info = vku::InitStructHelper(); + VkRenderingInputAttachmentIndexInfo input_info = vku::InitStructHelper(); input_info.colorAttachmentCount = 0; input_info.pColorAttachmentInputIndices = nullptr; @@ -810,7 +810,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, InputAttachmentIndexSetToUnused) { RETURN_IF_SKIP(Init()); VkFormat color_format = VK_FORMAT_R8G8B8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -818,7 +818,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, InputAttachmentIndexSetToUnused) { pipe.gp_ci_.renderPass = VK_NULL_HANDLE; pipe.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_UNDEFINED; m_command_buffer.Begin(); @@ -834,7 +834,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, InputAttachmentIndexSetToUnused) { uint32_t locations[] = {0}; uint32_t unused = VK_ATTACHMENT_UNUSED; - VkRenderingInputAttachmentIndexInfoKHR input_info[3] = { + VkRenderingInputAttachmentIndexInfo input_info[3] = { {VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO_KHR, nullptr, 1, &locations[0], nullptr, nullptr}, {VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO_KHR, nullptr, 1, &unused, &locations[0], nullptr}, {VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO_KHR, nullptr, 1, &unused, nullptr, &locations[0]}}; @@ -855,7 +855,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, InputAttachmentIndexUnique) { RETURN_IF_SKIP(InitBasicDynamicRenderingLocalRead()); VkFormat color_format = VK_FORMAT_R8G8B8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -863,7 +863,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, InputAttachmentIndexUnique) { pipe.gp_ci_.renderPass = VK_NULL_HANDLE; pipe.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachments[2] = {vku::InitStructHelper(), vku::InitStructHelper()}; + VkRenderingAttachmentInfo color_attachments[2] = {vku::InitStructHelper(), vku::InitStructHelper()}; m_command_buffer.Begin(); vk::CmdBindPipeline(m_command_buffer.handle(), VK_PIPELINE_BIND_POINT_GRAPHICS, pipe.Handle()); @@ -878,7 +878,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, InputAttachmentIndexUnique) { uint32_t locations_bad[] = {0, 0}; uint32_t locations_good[] = {0, 1}; - VkRenderingInputAttachmentIndexInfoKHR input_info[3] = { + VkRenderingInputAttachmentIndexInfo input_info[3] = { {VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO_KHR, nullptr, 2, &locations_bad[0], nullptr, nullptr}, {VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO_KHR, nullptr, 2, &locations_good[0], &locations_bad[0], nullptr}, {VK_STRUCTURE_TYPE_RENDERING_INPUT_ATTACHMENT_INDEX_INFO_KHR, nullptr, 2, &locations_good[0], nullptr, &locations_bad[0]}}; @@ -898,7 +898,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, CmdSetAttachmentLocationsColorAttachme RETURN_IF_SKIP(InitBasicDynamicRenderingLocalRead()); VkFormat color_format = VK_FORMAT_R8G8B8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -906,7 +906,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, CmdSetAttachmentLocationsColorAttachme pipe.gp_ci_.renderPass = VK_NULL_HANDLE; pipe.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachment[2] = {vku::InitStructHelper(), vku::InitStructHelper()}; + VkRenderingAttachmentInfo color_attachment[2] = {vku::InitStructHelper(), vku::InitStructHelper()}; color_attachment[0].imageLayout = VK_IMAGE_LAYOUT_UNDEFINED; color_attachment[1].imageLayout = VK_IMAGE_LAYOUT_UNDEFINED; @@ -922,7 +922,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, CmdSetAttachmentLocationsColorAttachme m_command_buffer.BeginRendering(rendering_info); uint32_t locations[] = {0}; - VkRenderingAttachmentLocationInfoKHR location_info = vku::InitStructHelper(); + VkRenderingAttachmentLocationInfo location_info = vku::InitStructHelper(); location_info.colorAttachmentCount = 1; location_info.pColorAttachmentLocations = locations; @@ -940,7 +940,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, NewFunctionsReportErrorExtensionDisabl RETURN_IF_SKIP(Init()); VkFormat color_format = VK_FORMAT_R8G8B8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -957,7 +957,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, NewFunctionsReportErrorExtensionDisabl m_command_buffer.BeginRendering(rendering_info); - VkRenderingAttachmentLocationInfoKHR location_info = vku::InitStructHelper(); + VkRenderingAttachmentLocationInfo location_info = vku::InitStructHelper(); location_info.colorAttachmentCount = 0; location_info.pColorAttachmentLocations = nullptr; @@ -965,7 +965,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, NewFunctionsReportErrorExtensionDisabl vk::CmdSetRenderingAttachmentLocationsKHR(m_command_buffer.handle(), &location_info); m_errorMonitor->VerifyFound(); - VkRenderingInputAttachmentIndexInfoKHR input_info = vku::InitStructHelper(); + VkRenderingInputAttachmentIndexInfo input_info = vku::InitStructHelper(); input_info.colorAttachmentCount = 0; input_info.pColorAttachmentInputIndices = nullptr; @@ -986,7 +986,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, CmdSetRenderingAttachmentLocations) { vk::CmdBindPipeline(m_command_buffer.handle(), VK_PIPELINE_BIND_POINT_GRAPHICS, pipe.Handle()); m_command_buffer.BeginRenderPass(m_renderPassBeginInfo); - VkRenderingAttachmentLocationInfoKHR location_info = vku::InitStructHelper(); + VkRenderingAttachmentLocationInfo location_info = vku::InitStructHelper(); location_info.colorAttachmentCount = 0; location_info.pColorAttachmentLocations = nullptr; @@ -1005,7 +1005,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, AttachmentLocationsValidity) { RETURN_IF_SKIP(Init()); VkFormat color_format = VK_FORMAT_R8G8B8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -1013,7 +1013,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, AttachmentLocationsValidity) { pipe.gp_ci_.renderPass = VK_NULL_HANDLE; pipe.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachments[2] = {vku::InitStructHelper(), vku::InitStructHelper()}; + VkRenderingAttachmentInfo color_attachments[2] = {vku::InitStructHelper(), vku::InitStructHelper()}; color_attachments[0].imageLayout = VK_IMAGE_LAYOUT_UNDEFINED; color_attachments[1].imageLayout = VK_IMAGE_LAYOUT_UNDEFINED; @@ -1029,7 +1029,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, AttachmentLocationsValidity) { m_command_buffer.BeginRendering(rendering_info); uint32_t color_attachment_locations[2] = {1, 1}; - VkRenderingAttachmentLocationInfoKHR location_info = vku::InitStructHelper(); + VkRenderingAttachmentLocationInfo location_info = vku::InitStructHelper(); location_info.colorAttachmentCount = 2; location_info.pColorAttachmentLocations = color_attachment_locations; @@ -1046,7 +1046,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, AttachmentLocationsMax) { RETURN_IF_SKIP(InitBasicDynamicRenderingLocalRead()); VkFormat color_format = VK_FORMAT_R8G8B8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -1068,7 +1068,7 @@ TEST_F(NegativeDynamicRenderingLocalRead, AttachmentLocationsMax) { color_attachment_locations[i] = static_cast(i); } - VkRenderingAttachmentLocationInfoKHR location_info = vku::InitStructHelper(); + VkRenderingAttachmentLocationInfo location_info = vku::InitStructHelper(); location_info.colorAttachmentCount = static_cast(color_attachment_locations.size()); location_info.pColorAttachmentLocations = color_attachment_locations.data(); @@ -1088,13 +1088,13 @@ TEST_F(NegativeDynamicRenderingLocalRead, DependencyViewLocalInsideRendering) { m_command_buffer.Begin(); m_command_buffer.BeginRenderingColor(GetDynamicRenderTarget(), GetRenderTargetArea()); - VkMemoryBarrier2KHR memory_barrier_2 = vku::InitStructHelper(); + VkMemoryBarrier2 memory_barrier_2 = vku::InitStructHelper(); memory_barrier_2.srcStageMask = VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT; memory_barrier_2.srcAccessMask = VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT; memory_barrier_2.dstStageMask = VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT; memory_barrier_2.dstAccessMask = VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT; - VkDependencyInfoKHR dependency_info = vku::InitStructHelper(); + VkDependencyInfo dependency_info = vku::InitStructHelper(); dependency_info.dependencyFlags = VK_DEPENDENCY_VIEW_LOCAL_BIT; dependency_info.memoryBarrierCount = 1; dependency_info.pMemoryBarriers = &memory_barrier_2; @@ -1113,13 +1113,13 @@ TEST_F(NegativeDynamicRenderingLocalRead, DependencyViewLocalOutsideRendering) { m_command_buffer.Begin(); - VkMemoryBarrier2KHR memory_barrier_2 = vku::InitStructHelper(); + VkMemoryBarrier2 memory_barrier_2 = vku::InitStructHelper(); memory_barrier_2.srcStageMask = VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT; memory_barrier_2.srcAccessMask = VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT; memory_barrier_2.dstStageMask = VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT; memory_barrier_2.dstAccessMask = VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT; - VkDependencyInfoKHR dependency_info = vku::InitStructHelper(); + VkDependencyInfo dependency_info = vku::InitStructHelper(); dependency_info.dependencyFlags = VK_DEPENDENCY_VIEW_LOCAL_BIT; dependency_info.memoryBarrierCount = 1; dependency_info.pMemoryBarriers = &memory_barrier_2; @@ -1140,13 +1140,13 @@ TEST_F(NegativeDynamicRenderingLocalRead, FramebufferSpaceStagesDst) { m_command_buffer.Begin(); m_command_buffer.BeginRenderingColor(GetDynamicRenderTarget(), GetRenderTargetArea()); - VkMemoryBarrier2KHR memory_barrier_2 = vku::InitStructHelper(); + VkMemoryBarrier2 memory_barrier_2 = vku::InitStructHelper(); memory_barrier_2.srcStageMask = VK_PIPELINE_STAGE_2_COLOR_ATTACHMENT_OUTPUT_BIT; memory_barrier_2.srcAccessMask = VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT; memory_barrier_2.dstStageMask = VK_PIPELINE_STAGE_2_BOTTOM_OF_PIPE_BIT; memory_barrier_2.dstAccessMask = VK_ACCESS_2_NONE; - VkDependencyInfoKHR dependency_info = vku::InitStructHelper(); + VkDependencyInfo dependency_info = vku::InitStructHelper(); dependency_info.dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT; dependency_info.memoryBarrierCount = 1; dependency_info.pMemoryBarriers = &memory_barrier_2; @@ -1179,11 +1179,11 @@ TEST_F(NegativeDynamicRenderingLocalRead, RenderingAttachmentLocationInfoMismatc uint32_t color_attachment_locations[1] = {0}; uint32_t invalid_attachment_locations[1] = {1}; - VkRenderingAttachmentLocationInfoKHR rendering_attachment_location_info = vku::InitStructHelper{}; + VkRenderingAttachmentLocationInfo rendering_attachment_location_info = vku::InitStructHelper{}; rendering_attachment_location_info.colorAttachmentCount = 1; rendering_attachment_location_info.pColorAttachmentLocations = color_attachment_locations; - VkRenderingAttachmentLocationInfoKHR invalid_rendering_attachment_location_info = vku::InitStructHelper{}; + VkRenderingAttachmentLocationInfo invalid_rendering_attachment_location_info = vku::InitStructHelper{}; invalid_rendering_attachment_location_info.colorAttachmentCount = 0; invalid_rendering_attachment_location_info.pColorAttachmentLocations = nullptr; @@ -1204,14 +1204,14 @@ TEST_F(NegativeDynamicRenderingLocalRead, RenderingAttachmentLocationInfoMismatc m_command_buffer.Begin(); - VkRenderingAttachmentInfoKHR color_attachment_info = vku::InitStructHelper{}; + VkRenderingAttachmentInfo color_attachment_info = vku::InitStructHelper{}; color_attachment_info.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment_info.imageView = render_target_view.handle(); VkClearRect clear_rect = {{{0, 0}, {m_width, m_height}}, 0, 1}; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper{}; - begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR; + VkRenderingInfo begin_rendering_info = vku::InitStructHelper{}; + begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; begin_rendering_info.renderArea = clear_rect.rect; begin_rendering_info.layerCount = 2; begin_rendering_info.colorAttachmentCount = 1; @@ -1273,13 +1273,13 @@ TEST_F(NegativeDynamicRenderingLocalRead, RenderingInputAttachmentIndexInfoMisma const uint32_t invalid_depth_attachment_index = 0; const uint32_t invalid_stencil_attachment_index = 0; - VkRenderingInputAttachmentIndexInfoKHR rendering_input_attachment_index_info = vku::InitStructHelper{}; + VkRenderingInputAttachmentIndexInfo rendering_input_attachment_index_info = vku::InitStructHelper{}; rendering_input_attachment_index_info.colorAttachmentCount = 1; rendering_input_attachment_index_info.pColorAttachmentInputIndices = color_attachment_indices; rendering_input_attachment_index_info.pDepthInputAttachmentIndex = &depth_attachment_index; rendering_input_attachment_index_info.pStencilInputAttachmentIndex = &stencil_attachment_index; - VkRenderingInputAttachmentIndexInfoKHR invalid_rendering_input_attachment_index_info = vku::InitStructHelper{}; + VkRenderingInputAttachmentIndexInfo invalid_rendering_input_attachment_index_info = vku::InitStructHelper{}; invalid_rendering_input_attachment_index_info.colorAttachmentCount = 1; invalid_rendering_input_attachment_index_info.pColorAttachmentInputIndices = color_attachment_indices; invalid_rendering_input_attachment_index_info.pDepthInputAttachmentIndex = &depth_attachment_index; @@ -1297,14 +1297,14 @@ TEST_F(NegativeDynamicRenderingLocalRead, RenderingInputAttachmentIndexInfoMisma VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT | VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT; secondary_cmd_buffer_begin_info.pInheritanceInfo = &cmd_buffer_inheritance_info; - VkRenderingAttachmentInfoKHR color_attachment_info = vku::InitStructHelper{}; + VkRenderingAttachmentInfo color_attachment_info = vku::InitStructHelper{}; color_attachment_info.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment_info.imageView = render_target_view.handle(); VkClearRect clear_rect = {{{0, 0}, {m_width, m_height}}, 0, 1}; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper{}; - begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR; + VkRenderingInfo begin_rendering_info = vku::InitStructHelper{}; + begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; begin_rendering_info.renderArea = clear_rect.rect; begin_rendering_info.layerCount = 2; begin_rendering_info.colorAttachmentCount = 1; diff --git a/tests/unit/dynamic_rendering_local_read_positive.cpp b/tests/unit/dynamic_rendering_local_read_positive.cpp index b5db7e9596f..6252bb28da2 100644 --- a/tests/unit/dynamic_rendering_local_read_positive.cpp +++ b/tests/unit/dynamic_rendering_local_read_positive.cpp @@ -50,15 +50,15 @@ TEST_F(PositiveDynamicRenderingLocalRead, BasicUsage) { uint32_t locations[] = {i, 1 - i}; uint32_t inputs[] = {i, 1 - i}; - VkRenderingInputAttachmentIndexInfoKHR inputs_info = vku::InitStructHelper(); + VkRenderingInputAttachmentIndexInfo inputs_info = vku::InitStructHelper(); inputs_info.colorAttachmentCount = 2; inputs_info.pColorAttachmentInputIndices = inputs; - VkRenderingAttachmentLocationInfoKHR locations_info = vku::InitStructHelper(&inputs_info); + VkRenderingAttachmentLocationInfo locations_info = vku::InitStructHelper(&inputs_info); locations_info.colorAttachmentCount = 2; locations_info.pColorAttachmentLocations = locations; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(&locations_info); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(&locations_info); pipeline_rendering_info.colorAttachmentCount = 2; pipeline_rendering_info.pColorAttachmentFormats = color_formats; @@ -71,11 +71,11 @@ TEST_F(PositiveDynamicRenderingLocalRead, BasicUsage) { pipe->CreateGraphicsPipeline(); } - VkRenderingAttachmentInfoKHR color_attachments[2] = {vku::InitStructHelper(), vku::InitStructHelper()}; - color_attachments[0].imageLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR; - color_attachments[1].imageLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR; + VkRenderingAttachmentInfo color_attachments[2] = {vku::InitStructHelper(), vku::InitStructHelper()}; + color_attachments[0].imageLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ; + color_attachments[1].imageLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 2; begin_rendering_info.pColorAttachments = &color_attachments[0]; begin_rendering_info.layerCount = 1; @@ -86,7 +86,7 @@ TEST_F(PositiveDynamicRenderingLocalRead, BasicUsage) { VkImageMemoryBarrier pre_barriers[2] = {vku::InitStructHelper(), vku::InitStructHelper()}; pre_barriers[0].oldLayout = VK_IMAGE_LAYOUT_UNDEFINED; pre_barriers[0].srcAccessMask = 0; - pre_barriers[0].newLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR; + pre_barriers[0].newLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ; pre_barriers[0].dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; pre_barriers[0].srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; pre_barriers[0].dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; @@ -97,12 +97,12 @@ TEST_F(PositiveDynamicRenderingLocalRead, BasicUsage) { VkImageMemoryBarrier post_barriers[2] = {pre_barriers[0], pre_barriers[1]}; - post_barriers[0].oldLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR; - post_barriers[0].newLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR; + post_barriers[0].oldLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ; + post_barriers[0].newLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ; post_barriers[0].srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; post_barriers[0].dstAccessMask = VK_ACCESS_INPUT_ATTACHMENT_READ_BIT; - post_barriers[1].oldLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR; - post_barriers[1].newLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR; + post_barriers[1].oldLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ; + post_barriers[1].newLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ; post_barriers[1].srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; post_barriers[1].dstAccessMask = VK_ACCESS_INPUT_ATTACHMENT_READ_BIT; @@ -117,12 +117,12 @@ TEST_F(PositiveDynamicRenderingLocalRead, BasicUsage) { vk::CmdBindPipeline(m_command_buffer.handle(), VK_PIPELINE_BIND_POINT_GRAPHICS, pipe2.Handle()); uint32_t locations[] = {1, 0}; - VkRenderingAttachmentLocationInfoKHR location_info = vku::InitStructHelper(); + VkRenderingAttachmentLocationInfo location_info = vku::InitStructHelper(); location_info.colorAttachmentCount = 2; location_info.pColorAttachmentLocations = locations; vk::CmdSetRenderingAttachmentLocationsKHR(m_command_buffer.handle(), &location_info); - VkRenderingInputAttachmentIndexInfoKHR input_info = vku::InitStructHelper(); + VkRenderingInputAttachmentIndexInfo input_info = vku::InitStructHelper(); input_info.colorAttachmentCount = 2; input_info.pColorAttachmentInputIndices = locations; vk::CmdSetRenderingInputAttachmentIndicesKHR(m_command_buffer.handle(), &input_info); @@ -137,7 +137,7 @@ TEST_F(PositiveDynamicRenderingLocalRead, CmdClearAttachments) { RETURN_IF_SKIP(InitBasicDynamicRenderingLocalRead()); VkFormat color_format = VK_FORMAT_R8G8B8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -145,7 +145,7 @@ TEST_F(PositiveDynamicRenderingLocalRead, CmdClearAttachments) { pipe.gp_ci_.renderPass = VK_NULL_HANDLE; pipe.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachments[2]; + VkRenderingAttachmentInfo color_attachments[2]; color_attachments[0] = vku::InitStructHelper(); color_attachments[0].imageLayout = VK_IMAGE_LAYOUT_UNDEFINED; color_attachments[1] = vku::InitStructHelper(); @@ -163,7 +163,7 @@ TEST_F(PositiveDynamicRenderingLocalRead, CmdClearAttachments) { m_command_buffer.BeginRendering(rendering_info); uint32_t locations[2] = {0, VK_ATTACHMENT_UNUSED}; - VkRenderingAttachmentLocationInfoKHR location_info = vku::InitStructHelper(); + VkRenderingAttachmentLocationInfo location_info = vku::InitStructHelper(); location_info.colorAttachmentCount = 2; location_info.pColorAttachmentLocations = locations; @@ -197,7 +197,7 @@ TEST_F(PositiveDynamicRenderingLocalRead, CmdClearDepthAttachment) { VkRenderingAttachmentInfo depthAttachment = vku::InitStructHelper(); depthAttachment.imageView = depthImageView; - depthAttachment.imageLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR; + depthAttachment.imageLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ; depthAttachment.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; depthAttachment.storeOp = VK_ATTACHMENT_STORE_OP_STORE; depthAttachment.clearValue = clearValue; @@ -207,7 +207,7 @@ TEST_F(PositiveDynamicRenderingLocalRead, CmdClearDepthAttachment) { renderingInfo.layerCount = 1u; renderingInfo.pDepthAttachment = &depthAttachment; - VkRenderingAttachmentLocationInfoKHR locationInfo = vku::InitStructHelper(); + VkRenderingAttachmentLocationInfo locationInfo = vku::InitStructHelper(); locationInfo.colorAttachmentCount = 0u; locationInfo.pColorAttachmentLocations = nullptr; diff --git a/tests/unit/dynamic_rendering_positive.cpp b/tests/unit/dynamic_rendering_positive.cpp index ad24af68efd..18ac7e9d703 100644 --- a/tests/unit/dynamic_rendering_positive.cpp +++ b/tests/unit/dynamic_rendering_positive.cpp @@ -28,10 +28,10 @@ TEST_F(PositiveDynamicRendering, BasicUsage) { TEST_DESCRIPTION("Most simple way to use dynamic rendering"); RETURN_IF_SKIP(InitBasicDynamicRendering()); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {64, 64}}; begin_rendering_info.colorAttachmentCount = 1; @@ -48,17 +48,17 @@ TEST_F(PositiveDynamicRendering, Draw) { RETURN_IF_SKIP(InitBasicDynamicRendering()); VkFormat color_formats = VK_FORMAT_UNDEFINED; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_formats; CreatePipelineHelper pipe(*this, &pipeline_rendering_info); pipe.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -79,7 +79,7 @@ TEST_F(PositiveDynamicRendering, DrawMultiBind) { const auto depth_format = FindSupportedDepthOnlyFormat(Gpu()); VkFormat color_formats = VK_FORMAT_UNDEFINED; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_formats; pipeline_rendering_info.depthAttachmentFormat = depth_format; @@ -92,10 +92,10 @@ TEST_F(PositiveDynamicRendering, DrawMultiBind) { CreatePipelineHelper pipe2(*this, &pipeline_rendering_info); pipe2.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -122,7 +122,7 @@ TEST_F(PositiveDynamicRendering, BeginQuery) { InitRenderTarget(); - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; @@ -147,7 +147,7 @@ TEST_F(PositiveDynamicRendering, PipeWithDiscard) { ds_ci.depthWriteEnable = VK_TRUE; VkFormat color_formats = {VK_FORMAT_R8G8B8A8_UNORM}; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_formats; pipeline_rendering_info.depthAttachmentFormat = VK_FORMAT_D16_UNORM; // D16_UNORM has guaranteed support @@ -190,14 +190,14 @@ TEST_F(PositiveDynamicRendering, UseStencilAttachmentWithIntegerFormatAndDepthSt vkt::Image resolve_image(*m_device, image_create_info, vkt::set_layout); vkt::ImageView resolve_image_view = resolve_image.CreateView(VK_IMAGE_ASPECT_STENCIL_BIT); - VkRenderingAttachmentInfoKHR stencil_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo stencil_attachment = vku::InitStructHelper(); stencil_attachment.imageView = image_view; stencil_attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; stencil_attachment.resolveMode = VK_RESOLVE_MODE_AVERAGE_BIT; stencil_attachment.resolveImageLayout = VK_IMAGE_LAYOUT_GENERAL; stencil_attachment.resolveImageView = resolve_image_view; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.pStencilAttachment = &stencil_attachment; begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; @@ -237,7 +237,7 @@ TEST_F(PositiveDynamicRendering, FragmentDensityMapSubsampledBit) { vkt::Image fdm_image(*m_device, image_ci, vkt::set_layout); vkt::ImageView fdm_image_view = fdm_image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_GENERAL; color_attachment.imageView = image_view; @@ -245,7 +245,7 @@ TEST_F(PositiveDynamicRendering, FragmentDensityMapSubsampledBit) { fragment_density_map.imageView = fdm_image_view; fragment_density_map.imageLayout = VK_IMAGE_LAYOUT_GENERAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(&fragment_density_map); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(&fragment_density_map); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; @@ -260,7 +260,7 @@ TEST_F(PositiveDynamicRendering, SuspendResumeDraw) { RETURN_IF_SKIP(InitBasicDynamicRendering()); VkFormat color_formats = VK_FORMAT_UNDEFINED; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_formats; @@ -268,11 +268,11 @@ TEST_F(PositiveDynamicRendering, SuspendResumeDraw) { pipe.ds_ci_ = vku::InitStructHelper(); pipe.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); - begin_rendering_info.flags = VK_RENDERING_SUSPENDING_BIT_KHR; + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); + begin_rendering_info.flags = VK_RENDERING_SUSPENDING_BIT; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -288,7 +288,7 @@ TEST_F(PositiveDynamicRendering, SuspendResumeDraw) { m_command_buffer.EndRendering(); m_command_buffer.End(); - begin_rendering_info.flags = VK_RENDERING_RESUMING_BIT_KHR | VK_RENDERING_SUSPENDING_BIT_KHR; + begin_rendering_info.flags = VK_RENDERING_RESUMING_BIT | VK_RENDERING_SUSPENDING_BIT; cb1.Begin(); cb1.BeginRendering(begin_rendering_info); vk::CmdBindPipeline(cb1.handle(), VK_PIPELINE_BIND_POINT_GRAPHICS, pipe.Handle()); @@ -296,7 +296,7 @@ TEST_F(PositiveDynamicRendering, SuspendResumeDraw) { cb1.EndRendering(); cb1.End(); - begin_rendering_info.flags = VK_RENDERING_RESUMING_BIT_KHR; + begin_rendering_info.flags = VK_RENDERING_RESUMING_BIT; cb2.Begin(); cb2.BeginRendering(begin_rendering_info); vk::CmdBindPipeline(cb2.handle(), VK_PIPELINE_BIND_POINT_GRAPHICS, pipe.Handle()); @@ -329,7 +329,7 @@ TEST_F(PositiveDynamicRendering, CreateGraphicsPipeline) { const vkt::PipelineLayout pl(*m_device, {&dsl}); VkFormat color_format = VK_FORMAT_R8G8B8A8_UNORM; - VkPipelineRenderingCreateInfoKHR rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo rendering_info = vku::InitStructHelper(); rendering_info.colorAttachmentCount = 1; rendering_info.pColorAttachmentFormats = &color_format; @@ -395,7 +395,7 @@ TEST_F(PositiveDynamicRendering, CommandDrawWithShaderTileImageRead) { VkFormat depth_format = VK_FORMAT_D32_SFLOAT_S8_UINT; VkFormat color_format = VK_FORMAT_B8G8R8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; pipeline_rendering_info.depthAttachmentFormat = depth_format; @@ -421,15 +421,15 @@ TEST_F(PositiveDynamicRendering, CommandDrawWithShaderTileImageRead) { vkt::Image color_image(*m_device, 32, 32, 1, color_format, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView color_image_view = color_image.CreateView(); - VkRenderingAttachmentInfoKHR depth_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo depth_attachment = vku::InitStructHelper(); depth_attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; depth_attachment.imageView = depth_image_view.handle(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.imageView = color_image_view.handle(); - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.pDepthAttachment = &depth_attachment; @@ -464,7 +464,7 @@ TEST_F(PositiveDynamicRendering, DualSourceBlending) { cb_attachments.alphaBlendOp = VK_BLEND_OP_ADD; VkFormat color_formats = VK_FORMAT_UNDEFINED; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_formats; @@ -472,10 +472,10 @@ TEST_F(PositiveDynamicRendering, DualSourceBlending) { pipe.cb_attachments_ = cb_attachments; pipe.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -498,19 +498,19 @@ TEST_F(PositiveDynamicRendering, ExecuteCommandsWithNullImageView) { "CmdBeginRendering where the same image is specified as null"); RETURN_IF_SKIP(InitBasicDynamicRendering()); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.imageView = VK_NULL_HANDLE; constexpr std::array bad_color_formats = {VK_FORMAT_UNDEFINED}; - VkCommandBufferInheritanceRenderingInfoKHR inheritance_rendering_info = vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo inheritance_rendering_info = vku::InitStructHelper(); inheritance_rendering_info.colorAttachmentCount = bad_color_formats.size(); inheritance_rendering_info.pColorAttachmentFormats = bad_color_formats.data(); inheritance_rendering_info.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); - begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT_KHR; + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); + begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -541,18 +541,18 @@ TEST_F(PositiveDynamicRendering, SuspendPrimaryResumeInSecondary) { TEST_DESCRIPTION("Suspend in primary and resume in secondary"); RETURN_IF_SKIP(InitBasicDynamicRendering()); VkFormat color_formats = {VK_FORMAT_UNDEFINED}; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_formats; CreatePipelineHelper pipe(*this, &pipeline_rendering_info); pipe.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); - begin_rendering_info.flags = VK_RENDERING_SUSPENDING_BIT_KHR; + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); + begin_rendering_info.flags = VK_RENDERING_SUSPENDING_BIT; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -567,7 +567,7 @@ TEST_F(PositiveDynamicRendering, SuspendPrimaryResumeInSecondary) { // Secondary resumes render vkt::CommandBuffer secondary(*m_device, m_command_pool, VK_COMMAND_BUFFER_LEVEL_SECONDARY); - begin_rendering_info.flags = VK_RENDERING_RESUMING_BIT_KHR; + begin_rendering_info.flags = VK_RENDERING_RESUMING_BIT; secondary.Begin(); secondary.BeginRendering(begin_rendering_info); vk::CmdBindPipeline(secondary.handle(), VK_PIPELINE_BIND_POINT_GRAPHICS, pipe.Handle()); @@ -588,17 +588,17 @@ TEST_F(PositiveDynamicRendering, SuspendSecondaryResumeInPrimary) { RETURN_IF_SKIP(InitBasicDynamicRendering()); VkFormat color_formats = {VK_FORMAT_UNDEFINED}; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_formats; CreatePipelineHelper pipe(*this, &pipeline_rendering_info); pipe.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.flags = 0; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; @@ -613,7 +613,7 @@ TEST_F(PositiveDynamicRendering, SuspendSecondaryResumeInPrimary) { m_command_buffer.EndRendering(); vkt::CommandBuffer secondary(*m_device, m_command_pool, VK_COMMAND_BUFFER_LEVEL_SECONDARY); - begin_rendering_info.flags = VK_RENDERING_SUSPENDING_BIT_KHR; + begin_rendering_info.flags = VK_RENDERING_SUSPENDING_BIT; secondary.Begin(); secondary.BeginRendering(begin_rendering_info); vk::CmdBindPipeline(secondary.handle(), VK_PIPELINE_BIND_POINT_GRAPHICS, pipe.Handle()); @@ -628,7 +628,7 @@ TEST_F(PositiveDynamicRendering, SuspendSecondaryResumeInPrimary) { // Second Primary resumes render vkt::CommandBuffer cb(*m_device, m_command_pool); - begin_rendering_info.flags = VK_RENDERING_RESUMING_BIT_KHR; + begin_rendering_info.flags = VK_RENDERING_RESUMING_BIT; cb.Begin(); cb.BeginRendering(begin_rendering_info); vk::CmdBindPipeline(cb.handle(), VK_PIPELINE_BIND_POINT_GRAPHICS, pipe.Handle()); @@ -655,18 +655,18 @@ TEST_F(PositiveDynamicRendering, WithShaderTileImageAndBarrier) { m_command_buffer.Begin(); - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); VkClearRect clear_rect = {{{0, 0}, {m_width, m_height}}, 0, 1}; begin_rendering_info.renderArea = clear_rect.rect; begin_rendering_info.layerCount = 1; - VkMemoryBarrier2KHR memory_barrier_2 = vku::InitStructHelper(); + VkMemoryBarrier2 memory_barrier_2 = vku::InitStructHelper(); memory_barrier_2.srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; memory_barrier_2.srcAccessMask = VK_ACCESS_2_COLOR_ATTACHMENT_WRITE_BIT; memory_barrier_2.dstStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT; memory_barrier_2.dstAccessMask = VK_ACCESS_2_COLOR_ATTACHMENT_READ_BIT; - VkDependencyInfoKHR dependency_info = vku::InitStructHelper(); + VkDependencyInfo dependency_info = vku::InitStructHelper(); dependency_info.dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT; dependency_info.memoryBarrierCount = 1; dependency_info.pMemoryBarriers = &memory_barrier_2; @@ -694,7 +694,7 @@ TEST_F(PositiveDynamicRendering, IgnoreUnusedColorAttachment) { TEST_DESCRIPTION("Case from https://gitlab.khronos.org/vulkan/vulkan/-/merge_requests/6518"); RETURN_IF_SKIP(InitBasicDynamicRendering()); VkFormat color_formats[] = {VK_FORMAT_UNDEFINED, VK_FORMAT_UNDEFINED}; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 2; pipeline_rendering_info.pColorAttachmentFormats = color_formats; @@ -706,11 +706,11 @@ TEST_F(PositiveDynamicRendering, IgnoreUnusedColorAttachment) { TEST_F(PositiveDynamicRendering, MatchingAttachmentFormats) { TEST_DESCRIPTION( - "Draw with Dynamic Rendering with attachment specified as VK_NULL_HANDLE in VkRenderingInfoKHR, and with corresponding " - "format in VkPipelineRenderingCreateInfoKHR set to VK_FORMAT_UNDEFINED"); + "Draw with Dynamic Rendering with attachment specified as VK_NULL_HANDLE in VkRenderingInfo, and with corresponding " + "format in VkPipelineRenderingCreateInfo set to VK_FORMAT_UNDEFINED"); RETURN_IF_SKIP(InitBasicDynamicRendering()); - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); VkFormat color_formats[] = {VK_FORMAT_UNDEFINED}; pipeline_rendering_info.colorAttachmentCount = 1; @@ -742,11 +742,11 @@ TEST_F(PositiveDynamicRendering, MatchingAttachmentFormats) { const VkFormat depthStencilFormat = FindSupportedDepthStencilFormat(Gpu()); vkt::Image depthStencilImage(*m_device, 32, 32, 1, depthStencilFormat, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.imageView = VK_NULL_HANDLE; - VkRenderingAttachmentInfoKHR depth_stencil_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo depth_stencil_attachment = vku::InitStructHelper(); depth_stencil_attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; depth_stencil_attachment.imageView = VK_NULL_HANDLE; @@ -754,7 +754,7 @@ TEST_F(PositiveDynamicRendering, MatchingAttachmentFormats) { { // Mismatching color formats - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; @@ -767,7 +767,7 @@ TEST_F(PositiveDynamicRendering, MatchingAttachmentFormats) { { // Mismatching depth format - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.pDepthAttachment = &depth_stencil_attachment; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; @@ -779,7 +779,7 @@ TEST_F(PositiveDynamicRendering, MatchingAttachmentFormats) { { // Mismatching stencil format - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.pStencilAttachment = &depth_stencil_attachment; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; @@ -798,7 +798,7 @@ TEST_F(PositiveDynamicRendering, MatchingAttachmentFormats2) { AddRequiredFeature(vkt::Feature::dynamicRenderingUnusedAttachments); RETURN_IF_SKIP(InitBasicDynamicRendering()); - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); VkFormat color_formats[] = {VK_FORMAT_R8G8B8A8_UNORM}; pipeline_rendering_info.colorAttachmentCount = 1; @@ -832,11 +832,11 @@ TEST_F(PositiveDynamicRendering, MatchingAttachmentFormats2) { vkt::Image depthStencilImage(*m_device, 32, 32, 1, depthStencilFormat, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.imageView = VK_NULL_HANDLE; - VkRenderingAttachmentInfoKHR depth_stencil_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo depth_stencil_attachment = vku::InitStructHelper(); depth_stencil_attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; depth_stencil_attachment.imageView = VK_NULL_HANDLE; @@ -844,7 +844,7 @@ TEST_F(PositiveDynamicRendering, MatchingAttachmentFormats2) { { // Null color image view - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; @@ -865,7 +865,7 @@ TEST_F(PositiveDynamicRendering, MatchingAttachmentFormats2) { { // Null depth image view - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.pDepthAttachment = &depth_stencil_attachment; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; @@ -886,7 +886,7 @@ TEST_F(PositiveDynamicRendering, MatchingAttachmentFormats2) { { // Null stencil image view - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.pStencilAttachment = &depth_stencil_attachment; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; @@ -923,7 +923,7 @@ TEST_F(PositiveDynamicRendering, ExecuteCommandsFlags) { inheritance_rendering_info.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; inheritance_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; @@ -964,7 +964,7 @@ TEST_F(PositiveDynamicRendering, ColorAttachmentMismatch) { AddRequiredFeature(vkt::Feature::extendedDynamicState3ColorWriteMask); RETURN_IF_SKIP(InitBasicDynamicRendering()); - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 0; CreatePipelineHelper pipe(*this, &pipeline_rendering_info); @@ -985,7 +985,7 @@ TEST_F(PositiveDynamicRendering, PipelineUnusedAttachments) { RETURN_IF_SKIP(InitBasicDynamicRendering()); VkFormat color_formats[] = {VK_FORMAT_R8G8B8A8_UNORM, VK_FORMAT_R8G8B8A8_UNORM}; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 2; pipeline_rendering_info.pColorAttachmentFormats = color_formats; @@ -1002,11 +1002,11 @@ TEST_F(PositiveDynamicRendering, PipelineUnusedAttachments) { vkt::Image colorImage(*m_device, 32, 32, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView colorImageView = colorImage.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; color_attachment.imageView = colorImageView; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {1, 1}}; begin_rendering_info.colorAttachmentCount = 1u; @@ -1030,7 +1030,7 @@ TEST_F(PositiveDynamicRendering, DynamicColorBlendEnable) { RETURN_IF_SKIP(Init()); VkFormat color_formats = VK_FORMAT_UNDEFINED; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_formats; @@ -1039,10 +1039,10 @@ TEST_F(PositiveDynamicRendering, DynamicColorBlendEnable) { pipe.AddDynamicState(VK_DYNAMIC_STATE_COLOR_BLEND_ENABLE_EXT); pipe.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -1068,7 +1068,7 @@ TEST_F(PositiveDynamicRendering, UnusedAttachmentsMismatchedFormats) { AddRequiredFeature(vkt::Feature::dynamicRenderingUnusedAttachments); RETURN_IF_SKIP(Init()); - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 0; pipeline_rendering_info.pColorAttachmentFormats = nullptr; pipeline_rendering_info.depthAttachmentFormat = VK_FORMAT_D16_UNORM; @@ -1078,7 +1078,7 @@ TEST_F(PositiveDynamicRendering, UnusedAttachmentsMismatchedFormats) { pipeline_depth.cb_ci_.attachmentCount = 0; pipeline_depth.CreateGraphicsPipeline(); - VkCommandBufferInheritanceRenderingInfoKHR inheritance_rendering_info = vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo inheritance_rendering_info = vku::InitStructHelper(); inheritance_rendering_info.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; vkt::CommandBuffer secondary(*m_device, m_command_pool, VK_COMMAND_BUFFER_LEVEL_SECONDARY); @@ -1123,7 +1123,7 @@ TEST_F(PositiveDynamicRendering, BeginRenderingWithRenderPassStriped) { rp_striped_info.stripeInfoCount = stripe_count; rp_striped_info.pStripeInfos = stripe_infos.data(); - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(&rp_striped_info); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(&rp_striped_info); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {width, height}}; @@ -1153,7 +1153,7 @@ TEST_F(PositiveDynamicRendering, BeginRenderingWithRenderPassStriped) { VkCommandBufferSubmitInfo cb_submit_info = vku::InitStructHelper(&rp_stripe_submit_info); cb_submit_info.commandBuffer = cmd_buffer.handle(); - VkSubmitInfo2KHR submit_info = vku::InitStructHelper(); + VkSubmitInfo2 submit_info = vku::InitStructHelper(); submit_info.commandBufferInfoCount = 1; submit_info.pCommandBufferInfos = &cb_submit_info; vk::QueueSubmit2KHR(m_default_queue->handle(), 1, &submit_info, VK_NULL_HANDLE); @@ -1167,21 +1167,21 @@ TEST_F(PositiveDynamicRendering, LegacyDithering) { AddRequiredFeature(vkt::Feature::maintenance5); RETURN_IF_SKIP(InitBasicDynamicRendering()); - VkPipelineCreateFlags2CreateInfoKHR create_flags_2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo create_flags_2 = vku::InitStructHelper(); create_flags_2.flags = VK_PIPELINE_CREATE_2_ENABLE_LEGACY_DITHERING_BIT_EXT; VkFormat color_formats = VK_FORMAT_UNDEFINED; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(&create_flags_2); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(&create_flags_2); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_formats; CreatePipelineHelper pipe(*this, &pipeline_rendering_info); pipe.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.flags = VK_RENDERING_ENABLE_LEGACY_DITHERING_BIT_EXT; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; @@ -1211,7 +1211,7 @@ TEST_F(PositiveDynamicRendering, AttachmentCountDynamicState) { color_blend_state_create_info.pAttachments = nullptr; VkFormat color_format = VK_FORMAT_UNDEFINED; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -1248,7 +1248,7 @@ TEST_F(PositiveDynamicRendering, VertexOnlyDepth) { CreatePipelineHelper pipe(*this, &pipeline_rendering_info); pipe.shader_stages_ = {pipe.vs_->GetStageCreateInfo()}; - pipe.AddDynamicState(VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE_EXT); + pipe.AddDynamicState(VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE); pipe.gp_ci_.renderPass = VK_NULL_HANDLE; pipe.gp_ci_.pMultisampleState = &ms_ci; pipe.gp_ci_.pDepthStencilState = &ds_state; diff --git a/tests/unit/dynamic_state.cpp b/tests/unit/dynamic_state.cpp index 5b946dfb086..5758cfb8a69 100644 --- a/tests/unit/dynamic_state.cpp +++ b/tests/unit/dynamic_state.cpp @@ -80,11 +80,11 @@ TEST_F(NegativeDynamicState, LineStippleNotBound) { InitRenderTarget(); CreatePipelineHelper pipe(*this); - VkPipelineRasterizationLineStateCreateInfoKHR line_state = vku::InitStructHelper(); - pipe.AddDynamicState(VK_DYNAMIC_STATE_LINE_STIPPLE_KHR); + VkPipelineRasterizationLineStateCreateInfo line_state = vku::InitStructHelper(); + pipe.AddDynamicState(VK_DYNAMIC_STATE_LINE_STIPPLE); pipe.ia_ci_.topology = VK_PRIMITIVE_TOPOLOGY_LINE_LIST; - line_state.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR; + line_state.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_BRESENHAM; line_state.stippledLineEnable = VK_TRUE; line_state.lineStippleFactor = 1; line_state.lineStipplePattern = 0; @@ -111,8 +111,8 @@ TEST_F(NegativeDynamicState, InvalidateStaticPipeline) { RETURN_IF_SKIP(Init()); InitRenderTarget(); - VkPipelineRasterizationLineStateCreateInfoKHR line_state = vku::InitStructHelper(); - line_state.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR; + VkPipelineRasterizationLineStateCreateInfo line_state = vku::InitStructHelper(); + line_state.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_BRESENHAM; line_state.stippledLineEnable = VK_TRUE; line_state.lineStippleFactor = 1; line_state.lineStipplePattern = 0; @@ -121,7 +121,7 @@ TEST_F(NegativeDynamicState, InvalidateStaticPipeline) { name_info.objectType = VK_OBJECT_TYPE_PIPELINE; CreatePipelineHelper pipe_0(*this); - pipe_0.AddDynamicState(VK_DYNAMIC_STATE_LINE_STIPPLE_KHR); + pipe_0.AddDynamicState(VK_DYNAMIC_STATE_LINE_STIPPLE); pipe_0.AddDynamicState(VK_DYNAMIC_STATE_LINE_STIPPLE_ENABLE_EXT); pipe_0.ia_ci_.topology = VK_PRIMITIVE_TOPOLOGY_LINE_LIST; pipe_0.rs_state_ci_.pNext = &line_state; @@ -458,12 +458,12 @@ TEST_F(NegativeDynamicState, ExtendedDynamicStateDisabled) { CreatePipelineHelper pipe(*this); const VkDynamicState dyn_states[] = { - VK_DYNAMIC_STATE_CULL_MODE_EXT, VK_DYNAMIC_STATE_FRONT_FACE_EXT, - VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT, VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT, - VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT, VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT, - VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT, VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT, - VK_DYNAMIC_STATE_DEPTH_COMPARE_OP_EXT, VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE_EXT, - VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE_EXT, VK_DYNAMIC_STATE_STENCIL_OP_EXT, + VK_DYNAMIC_STATE_CULL_MODE, VK_DYNAMIC_STATE_FRONT_FACE, + VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY, VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT, + VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT, VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE, + VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE, VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE, + VK_DYNAMIC_STATE_DEPTH_COMPARE_OP, VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE, + VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE, VK_DYNAMIC_STATE_STENCIL_OP, }; VkPipelineDynamicStateCreateInfo dyn_state_ci = vku::InitStructHelper(); dyn_state_ci.dynamicStateCount = size(dyn_states); @@ -572,12 +572,12 @@ TEST_F(NegativeDynamicState, ExtendedDynamicStateDuplicate) { InitRenderTarget(); const VkDynamicState dyn_states[] = { - VK_DYNAMIC_STATE_CULL_MODE_EXT, VK_DYNAMIC_STATE_FRONT_FACE_EXT, - VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT, VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT, - VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT, VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT, - VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT, VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT, - VK_DYNAMIC_STATE_DEPTH_COMPARE_OP_EXT, VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE_EXT, - VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE_EXT, VK_DYNAMIC_STATE_STENCIL_OP_EXT, + VK_DYNAMIC_STATE_CULL_MODE, VK_DYNAMIC_STATE_FRONT_FACE, + VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY, VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT, + VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT, VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE, + VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE, VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE, + VK_DYNAMIC_STATE_DEPTH_COMPARE_OP, VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE, + VK_DYNAMIC_STATE_STENCIL_TEST_ENABLE, VK_DYNAMIC_STATE_STENCIL_OP, }; // Verify dupes of every state. @@ -607,7 +607,7 @@ TEST_F(NegativeDynamicState, ExtendedDynamicStateBindVertexBuffers) { // Verify each vkCmdSet command CreatePipelineHelper pipe(*this); - pipe.AddDynamicState(VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT); + pipe.AddDynamicState(VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE); pipe.AddDynamicState(VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT); pipe.AddDynamicState(VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT); pipe.vp_state_ci_.viewportCount = 0; @@ -889,9 +889,9 @@ TEST_F(NegativeDynamicState, ExtendedDynamicState2Disabled) { InitRenderTarget(); CreatePipelineHelper pipe(*this); - pipe.AddDynamicState(VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE_EXT); - pipe.AddDynamicState(VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE_EXT); - pipe.AddDynamicState(VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT); + pipe.AddDynamicState(VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE); + pipe.AddDynamicState(VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE); + pipe.AddDynamicState(VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE); m_errorMonitor->SetDesiredError("VUID-VkGraphicsPipelineCreateInfo-pDynamicStates-04868"); pipe.CreateGraphicsPipeline(); m_errorMonitor->VerifyFound(); @@ -975,8 +975,8 @@ TEST_F(NegativeDynamicState, ExtendedDynamicState2Enabled) { RETURN_IF_SKIP(Init()); InitRenderTarget(); - const VkDynamicState dyn_states[] = {VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE_EXT, VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE_EXT, - VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT}; + const VkDynamicState dyn_states[] = {VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE, VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE, + VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE}; for (size_t i = 0; i < size(dyn_states); ++i) { // Verify duplicates of every dynamic state. @@ -1001,11 +1001,10 @@ TEST_F(NegativeDynamicState, ExtendedDynamicState2Enabled) { vk::CmdBindPipeline(command_buffer.handle(), VK_PIPELINE_BIND_POINT_GRAPHICS, pipe.Handle()); - if (dyn_states[i] == VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE_EXT) + if (dyn_states[i] == VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE) m_errorMonitor->SetDesiredError("VUID-vkCmdDraw-None-04876"); - if (dyn_states[i] == VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE_EXT) - m_errorMonitor->SetDesiredError("VUID-vkCmdDraw-None-04877"); - if (dyn_states[i] == VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT) + if (dyn_states[i] == VK_DYNAMIC_STATE_DEPTH_BIAS_ENABLE) m_errorMonitor->SetDesiredError("VUID-vkCmdDraw-None-04877"); + if (dyn_states[i] == VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE) m_errorMonitor->SetDesiredError("VUID-vkCmdDraw-None-04879"); vk::CmdDraw(command_buffer.handle(), 1, 1, 0, 0); m_errorMonitor->VerifyFound(); @@ -1025,7 +1024,7 @@ TEST_F(NegativeDynamicState, ExtendedDynamicState2InvalidateStaticPipeline) { InitRenderTarget(); CreatePipelineHelper pipe(*this); - pipe.AddDynamicState(VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT); + pipe.AddDynamicState(VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE); pipe.CreateGraphicsPipeline(); CreatePipelineHelper pipe_static(*this); @@ -1439,7 +1438,7 @@ TEST_F(NegativeDynamicState, ExtendedDynamicState3CmdSetFeatureDisabled) { } { m_errorMonitor->SetDesiredError("VUID-vkCmdSetLineRasterizationModeEXT-None-09423"); - vk::CmdSetLineRasterizationModeEXT(command_buffer.handle(), VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR); + vk::CmdSetLineRasterizationModeEXT(command_buffer.handle(), VK_LINE_RASTERIZATION_MODE_DEFAULT); m_errorMonitor->VerifyFound(); } { @@ -2055,13 +2054,13 @@ TEST_F(NegativeDynamicState, DrawNotSetLineRasterizationMode) { vk::CmdDraw(m_command_buffer.handle(), 1, 1, 0, 0); m_errorMonitor->VerifyFound(); m_errorMonitor->SetDesiredError("VUID-vkCmdSetLineRasterizationModeEXT-lineRasterizationMode-07418"); - vk::CmdSetLineRasterizationModeEXT(m_command_buffer.handle(), VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR); + vk::CmdSetLineRasterizationModeEXT(m_command_buffer.handle(), VK_LINE_RASTERIZATION_MODE_RECTANGULAR); m_errorMonitor->VerifyFound(); m_errorMonitor->SetDesiredError("VUID-vkCmdSetLineRasterizationModeEXT-lineRasterizationMode-07419"); - vk::CmdSetLineRasterizationModeEXT(m_command_buffer.handle(), VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR); + vk::CmdSetLineRasterizationModeEXT(m_command_buffer.handle(), VK_LINE_RASTERIZATION_MODE_BRESENHAM); m_errorMonitor->VerifyFound(); m_errorMonitor->SetDesiredError("VUID-vkCmdSetLineRasterizationModeEXT-lineRasterizationMode-07420"); - vk::CmdSetLineRasterizationModeEXT(m_command_buffer.handle(), VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR); + vk::CmdSetLineRasterizationModeEXT(m_command_buffer.handle(), VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH); m_errorMonitor->VerifyFound(); m_command_buffer.EndRenderPass(); @@ -2455,14 +2454,14 @@ void NegativeDynamicState::InitLineRasterizationFeatureDisabled() { } TEST_F(NegativeDynamicState, RasterizationLineModeDefault) { - TEST_DESCRIPTION("tests VK_EXT_line_rasterization dynamic state with VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR"); + TEST_DESCRIPTION("tests VK_EXT_line_rasterization dynamic state with VK_LINE_RASTERIZATION_MODE_DEFAULT"); RETURN_IF_SKIP(InitLineRasterizationFeatureDisabled()); - // set both from dynamic state, don't need a VkPipelineRasterizationLineStateCreateInfoKHR in pNext + // set both from dynamic state, don't need a VkPipelineRasterizationLineStateCreateInfo in pNext CreatePipelineHelper pipe(*this); pipe.AddDynamicState(VK_DYNAMIC_STATE_LINE_RASTERIZATION_MODE_EXT); pipe.AddDynamicState(VK_DYNAMIC_STATE_LINE_STIPPLE_ENABLE_EXT); - pipe.line_state_ci_.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR; // ignored + pipe.line_state_ci_.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_RECTANGULAR; // ignored pipe.line_state_ci_.stippledLineEnable = VK_TRUE; // ignored pipe.line_state_ci_.lineStippleFactor = 1; pipe.CreateGraphicsPipeline(); @@ -2472,7 +2471,7 @@ TEST_F(NegativeDynamicState, RasterizationLineModeDefault) { vk::CmdBindPipeline(m_command_buffer.handle(), VK_PIPELINE_BIND_POINT_GRAPHICS, pipe.Handle()); vk::CmdSetLineStippleEnableEXT(m_command_buffer.handle(), VK_TRUE); - vk::CmdSetLineRasterizationModeEXT(m_command_buffer.handle(), VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR); + vk::CmdSetLineRasterizationModeEXT(m_command_buffer.handle(), VK_LINE_RASTERIZATION_MODE_DEFAULT); m_errorMonitor->SetDesiredError("VUID-vkCmdDraw-stippledLineEnable-07498"); vk::CmdDraw(m_command_buffer.handle(), 3, 1, 0, 0); m_errorMonitor->VerifyFound(); @@ -2486,12 +2485,12 @@ TEST_F(NegativeDynamicState, RasterizationLineModeDefault) { } TEST_F(NegativeDynamicState, RasterizationLineModeRectangular) { - TEST_DESCRIPTION("tests VK_EXT_line_rasterization dynamic state with VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR"); + TEST_DESCRIPTION("tests VK_EXT_line_rasterization dynamic state with VK_LINE_RASTERIZATION_MODE_RECTANGULAR"); RETURN_IF_SKIP(InitLineRasterizationFeatureDisabled()); CreatePipelineHelper pipe(*this); pipe.AddDynamicState(VK_DYNAMIC_STATE_LINE_STIPPLE_ENABLE_EXT); - pipe.line_state_ci_.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR; + pipe.line_state_ci_.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_RECTANGULAR; pipe.line_state_ci_.stippledLineEnable = VK_TRUE; // ignored pipe.line_state_ci_.lineStippleFactor = 1; pipe.CreateGraphicsPipeline(); @@ -2510,12 +2509,12 @@ TEST_F(NegativeDynamicState, RasterizationLineModeRectangular) { } TEST_F(NegativeDynamicState, RasterizationLineModeBresenham) { - TEST_DESCRIPTION("tests VK_EXT_line_rasterization dynamic state with VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR"); + TEST_DESCRIPTION("tests VK_EXT_line_rasterization dynamic state with VK_LINE_RASTERIZATION_MODE_BRESENHAM"); RETURN_IF_SKIP(InitLineRasterizationFeatureDisabled()); CreatePipelineHelper pipe(*this); pipe.AddDynamicState(VK_DYNAMIC_STATE_LINE_STIPPLE_ENABLE_EXT); - pipe.line_state_ci_.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR; + pipe.line_state_ci_.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_BRESENHAM; pipe.line_state_ci_.lineStippleFactor = 1; pipe.CreateGraphicsPipeline(); @@ -2533,12 +2532,12 @@ TEST_F(NegativeDynamicState, RasterizationLineModeBresenham) { } TEST_F(NegativeDynamicState, RasterizationLineModeSmooth) { - TEST_DESCRIPTION("tests VK_EXT_line_rasterization dynamic state with VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR"); + TEST_DESCRIPTION("tests VK_EXT_line_rasterization dynamic state with VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH"); RETURN_IF_SKIP(InitLineRasterizationFeatureDisabled()); CreatePipelineHelper pipe(*this); pipe.AddDynamicState(VK_DYNAMIC_STATE_LINE_STIPPLE_ENABLE_EXT); - pipe.line_state_ci_.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR; + pipe.line_state_ci_.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH; pipe.line_state_ci_.lineStippleFactor = 1; pipe.CreateGraphicsPipeline(); @@ -4867,7 +4866,7 @@ TEST_F(NegativeDynamicState, MissingCmdSetVertexInput) { CreatePipelineHelper pipe(*this); pipe.AddDynamicState(VK_DYNAMIC_STATE_VERTEX_INPUT_EXT); - pipe.AddDynamicState(VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT); + pipe.AddDynamicState(VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE); pipe.CreateGraphicsPipeline(); m_command_buffer.Begin(); @@ -4892,7 +4891,7 @@ TEST_F(NegativeDynamicState, MissingCmdBindVertexBuffers2) { InitRenderTarget(); CreatePipelineHelper pipe(*this); - pipe.AddDynamicState(VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT); + pipe.AddDynamicState(VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE); pipe.CreateGraphicsPipeline(); m_command_buffer.Begin(); @@ -5903,7 +5902,7 @@ TEST_F(NegativeDynamicState, RasterizationSamplesDynamicRendering) { vkt::Image resolve_image(*m_device, 32u, 32u, 1, color_format, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView resolve_image_view = resolve_image.CreateView(); - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; diff --git a/tests/unit/dynamic_state_positive.cpp b/tests/unit/dynamic_state_positive.cpp index 12b8826633d..04e56d4bd9d 100644 --- a/tests/unit/dynamic_state_positive.cpp +++ b/tests/unit/dynamic_state_positive.cpp @@ -123,7 +123,7 @@ TEST_F(PositiveDynamicState, CmdSetVertexInputEXTStride) { CreatePipelineHelper pipe(*this); pipe.AddDynamicState(VK_DYNAMIC_STATE_VERTEX_INPUT_EXT); - pipe.AddDynamicState(VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT); + pipe.AddDynamicState(VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE); pipe.gp_ci_.pVertexInputState = nullptr; pipe.CreateGraphicsPipeline(); @@ -281,7 +281,7 @@ TEST_F(PositiveDynamicState, DepthTestEnableOverridesPipelineDepthWriteEnable) { ds_state.depthWriteEnable = VK_TRUE; CreatePipelineHelper pipe(*this); - pipe.AddDynamicState(VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT); + pipe.AddDynamicState(VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE); pipe.gp_ci_.renderPass = rp.Handle(); pipe.ds_ci_ = ds_state; pipe.CreateGraphicsPipeline(); @@ -322,8 +322,8 @@ TEST_F(PositiveDynamicState, DepthTestEnableOverridesDynamicDepthWriteEnable) { VkPipelineDepthStencilStateCreateInfo ds_state = vku::InitStructHelper(); CreatePipelineHelper pipe(*this); - pipe.AddDynamicState(VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT); - pipe.AddDynamicState(VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT); + pipe.AddDynamicState(VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE); + pipe.AddDynamicState(VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE); pipe.gp_ci_.renderPass = rp.Handle(); pipe.ds_ci_ = ds_state; pipe.CreateGraphicsPipeline(); @@ -824,7 +824,7 @@ TEST_F(PositiveDynamicState, RasterizationSamplesDynamicRendering) { vkt::Image resolve_image(*m_device, 32u, 32u, 1, color_format, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::ImageView resolve_image_view = resolve_image.CreateView(); - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; @@ -1147,7 +1147,7 @@ TEST_F(PositiveDynamicState, DynamicColorBlendEnable) { vkt::Image depth_image(*m_device, 32, 32, 1, depth_stencil_format, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT); vkt::ImageView depth_image_view = depth_image.CreateView(VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT); - VkRenderingAttachmentInfoKHR color_attachments[3]; + VkRenderingAttachmentInfo color_attachments[3]; color_attachments[0] = vku::InitStructHelper(); color_attachments[0].imageView = image_view1.handle(); color_attachments[0].imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -1156,7 +1156,7 @@ TEST_F(PositiveDynamicState, DynamicColorBlendEnable) { color_attachments[2] = color_attachments[0]; color_attachments[2].imageView = image_view3.handle(); - VkRenderingAttachmentInfoKHR depth_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo depth_attachment = vku::InitStructHelper(); depth_attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; depth_attachment.imageView = depth_image_view.handle(); @@ -1166,7 +1166,7 @@ TEST_F(PositiveDynamicState, DynamicColorBlendEnable) { rendering_info.colorAttachmentCount = 3u; rendering_info.pColorAttachments = color_attachments; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; pipeline_rendering_info.depthAttachmentFormat = depth_stencil_format; diff --git a/tests/unit/external_memory_sync.cpp b/tests/unit/external_memory_sync.cpp index 8c56bc2f600..65b28ce81f8 100644 --- a/tests/unit/external_memory_sync.cpp +++ b/tests/unit/external_memory_sync.cpp @@ -451,11 +451,11 @@ TEST_F(NegativeExternalMemorySync, ExportBufferHandleType) { TEST_F(NegativeExternalMemorySync, TimelineSemaphore) { #ifdef VK_USE_PLATFORM_WIN32_KHR const auto extension_name = VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR; + const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT; const char *no_tempory_tl_vuid = "VUID-VkImportSemaphoreWin32HandleInfoKHR-flags-03322"; #else const auto extension_name = VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR; + const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT; const char *no_tempory_tl_vuid = "VUID-VkImportSemaphoreFdInfoKHR-flags-03323"; #endif AddRequiredExtensions(VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_EXTENSION_NAME); @@ -470,15 +470,15 @@ TEST_F(NegativeExternalMemorySync, TimelineSemaphore) { { VkSemaphoreTypeCreateInfo sti = vku::InitStructHelper(); sti.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE; - VkPhysicalDeviceExternalSemaphoreInfoKHR esi = vku::InitStructHelper(&sti); + VkPhysicalDeviceExternalSemaphoreInfo esi = vku::InitStructHelper(&sti); esi.handleType = handle_type; VkExternalSemaphorePropertiesKHR esp = vku::InitStructHelper(); vk::GetPhysicalDeviceExternalSemaphorePropertiesKHR(Gpu(), &esi, &esp); - if (!(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT_KHR) || - !(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT_KHR)) { + if (!(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT) || + !(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT)) { GTEST_SKIP() << "External semaphore does not support importing and exporting, skipping test"; } } @@ -486,10 +486,10 @@ TEST_F(NegativeExternalMemorySync, TimelineSemaphore) { VkResult err; // Create a semaphore to export payload from - VkExportSemaphoreCreateInfoKHR esci = vku::InitStructHelper(); + VkExportSemaphoreCreateInfo esci = vku::InitStructHelper(); esci.handleTypes = handle_type; - VkSemaphoreTypeCreateInfoKHR stci = vku::InitStructHelper(&esci); - stci.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE_KHR; + VkSemaphoreTypeCreateInfo stci = vku::InitStructHelper(&esci); + stci.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE; VkSemaphoreCreateInfo sci = vku::InitStructHelper(&stci); vkt::Semaphore export_semaphore(*m_device, sci); @@ -503,7 +503,7 @@ TEST_F(NegativeExternalMemorySync, TimelineSemaphore) { ASSERT_EQ(VK_SUCCESS, err); m_errorMonitor->SetDesiredError(no_tempory_tl_vuid); - err = import_semaphore.ImportHandle(ext_handle, handle_type, VK_SEMAPHORE_IMPORT_TEMPORARY_BIT_KHR); + err = import_semaphore.ImportHandle(ext_handle, handle_type, VK_SEMAPHORE_IMPORT_TEMPORARY_BIT); m_errorMonitor->VerifyFound(); err = import_semaphore.ImportHandle(ext_handle, handle_type); @@ -522,15 +522,15 @@ TEST_F(NegativeExternalMemorySync, SyncFdSemaphore) { RETURN_IF_SKIP(Init()); // Check for external semaphore import and export capability - VkPhysicalDeviceExternalSemaphoreInfoKHR esi = vku::InitStructHelper(); + VkPhysicalDeviceExternalSemaphoreInfo esi = vku::InitStructHelper(); esi.handleType = handle_type; VkExternalSemaphorePropertiesKHR esp = vku::InitStructHelper(); vk::GetPhysicalDeviceExternalSemaphorePropertiesKHR(Gpu(), &esi, &esp); - if (!(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT_KHR) || - !(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT_KHR)) { + if (!(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT) || + !(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT)) { GTEST_SKIP() << "External semaphore does not support importing and exporting"; } @@ -540,7 +540,7 @@ TEST_F(NegativeExternalMemorySync, SyncFdSemaphore) { // create a timeline semaphore. // Note that adding a sync fd VkExportSemaphoreCreateInfo will cause creation to fail. - VkSemaphoreTypeCreateInfoKHR stci = vku::InitStructHelper(); + VkSemaphoreTypeCreateInfo stci = vku::InitStructHelper(); stci.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE; VkSemaphoreCreateInfo sci = vku::InitStructHelper(&stci); @@ -605,8 +605,8 @@ TEST_F(NegativeExternalMemorySync, SyncFdSemaphoreTimelineDependency) { external_semahpore_info.handleType = handle_type; VkExternalSemaphoreProperties external_semahpore_props = vku::InitStructHelper(); vk::GetPhysicalDeviceExternalSemaphoreProperties(Gpu(), &external_semahpore_info, &external_semahpore_props); - if (!(external_semahpore_props.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT_KHR) || - !(external_semahpore_props.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT_KHR)) { + if (!(external_semahpore_props.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT) || + !(external_semahpore_props.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT)) { GTEST_SKIP() << "External semaphore does not support importing and exporting"; } if (!(external_semahpore_props.compatibleHandleTypes & handle_type)) { @@ -764,8 +764,8 @@ TEST_F(NegativeExternalMemorySync, SyncFdSemaphoreType) { VkExternalSemaphoreProperties external_semahpore_props = vku::InitStructHelper(); vk::GetPhysicalDeviceExternalSemaphoreProperties(Gpu(), &external_semahpore_info, &external_semahpore_props); - if (!(external_semahpore_props.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT_KHR) || - !(external_semahpore_props.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT_KHR)) { + if (!(external_semahpore_props.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT) || + !(external_semahpore_props.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT)) { GTEST_SKIP() << "External semaphore does not support importing and exporting"; } if (!(external_semahpore_props.compatibleHandleTypes & handle_type)) { @@ -800,10 +800,10 @@ TEST_F(NegativeExternalMemorySync, SyncFdSemaphoreType) { TEST_F(NegativeExternalMemorySync, TemporaryFence) { #ifdef VK_USE_PLATFORM_WIN32_KHR const auto extension_name = VK_KHR_EXTERNAL_FENCE_WIN32_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR; + const auto handle_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_BIT; #else const auto extension_name = VK_KHR_EXTERNAL_FENCE_FD_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR; + const auto handle_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT; #endif AddRequiredExtensions(VK_KHR_EXTERNAL_FENCE_CAPABILITIES_EXTENSION_NAME); AddRequiredExtensions(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME); @@ -812,18 +812,18 @@ TEST_F(NegativeExternalMemorySync, TemporaryFence) { RETURN_IF_SKIP(Init()); // Check for external fence import and export capability - VkPhysicalDeviceExternalFenceInfoKHR efi = vku::InitStructHelper(); + VkPhysicalDeviceExternalFenceInfo efi = vku::InitStructHelper(); efi.handleType = handle_type; VkExternalFencePropertiesKHR efp = vku::InitStructHelper(); vk::GetPhysicalDeviceExternalFencePropertiesKHR(Gpu(), &efi, &efp); - if (!(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT_KHR) || - !(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT_KHR)) { + if (!(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT) || + !(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT)) { GTEST_SKIP() << "External fence does not support importing and exporting, skipping test."; } // Create a fence to export payload from - VkExportFenceCreateInfoKHR efci = vku::InitStructHelper(); + VkExportFenceCreateInfo efci = vku::InitStructHelper(); efci.handleTypes = handle_type; VkFenceCreateInfo fci = vku::InitStructHelper(&efci); vkt::Fence export_fence(*m_device, fci); @@ -835,7 +835,7 @@ TEST_F(NegativeExternalMemorySync, TemporaryFence) { // Export fence payload to an opaque handle ExternalHandle ext_fence{}; export_fence.ExportHandle(ext_fence, handle_type); - import_fence.ImportHandle(ext_fence, handle_type, VK_FENCE_IMPORT_TEMPORARY_BIT_KHR); + import_fence.ImportHandle(ext_fence, handle_type, VK_FENCE_IMPORT_TEMPORARY_BIT); // Undo the temporary import vk::ResetFences(device(), 1, &import_fence.handle()); @@ -860,15 +860,15 @@ TEST_F(NegativeExternalMemorySync, Fence) { const auto extension_name = VK_KHR_EXTERNAL_FENCE_WIN32_EXTENSION_NAME; const auto handle_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_BIT; const auto other_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT; - const auto bad_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR; + const auto bad_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT; const char *bad_export_type_vuid = "VUID-VkFenceGetWin32HandleInfoKHR-handleType-01452"; const char *other_export_type_vuid = "VUID-VkFenceGetWin32HandleInfoKHR-handleType-01448"; const char *bad_import_type_vuid = "VUID-VkImportFenceWin32HandleInfoKHR-handleType-01457"; #else const auto extension_name = VK_KHR_EXTERNAL_FENCE_FD_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR; - const auto other_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT_KHR; - const auto bad_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR; + const auto handle_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT; + const auto other_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT; + const auto bad_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT; const char *bad_export_type_vuid = "VUID-VkFenceGetFdInfoKHR-handleType-01456"; const char *other_export_type_vuid = "VUID-VkFenceGetFdInfoKHR-handleType-01453"; const char *bad_import_type_vuid = "VUID-VkImportFenceFdInfoKHR-handleType-01464"; @@ -880,18 +880,18 @@ TEST_F(NegativeExternalMemorySync, Fence) { RETURN_IF_SKIP(Init()); // Check for external fence import and export capability - VkPhysicalDeviceExternalFenceInfoKHR efi = vku::InitStructHelper(); + VkPhysicalDeviceExternalFenceInfo efi = vku::InitStructHelper(); efi.handleType = handle_type; VkExternalFencePropertiesKHR efp = vku::InitStructHelper(); vk::GetPhysicalDeviceExternalFencePropertiesKHR(Gpu(), &efi, &efp); - if (!(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT_KHR) || - !(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT_KHR)) { + if (!(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT) || + !(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT)) { GTEST_SKIP() << "External fence does not support importing and exporting, skipping test."; } // Create a fence to export payload from - VkExportFenceCreateInfoKHR efci = vku::InitStructHelper(); + VkExportFenceCreateInfo efci = vku::InitStructHelper(); efci.handleTypes = handle_type; VkFenceCreateInfo fci = vku::InitStructHelper(&efci); vkt::Fence export_fence(*m_device, fci); @@ -909,7 +909,7 @@ TEST_F(NegativeExternalMemorySync, Fence) { // a valid type for the platform which we didn't ask for during create m_errorMonitor->SetDesiredError(other_export_type_vuid); - if constexpr (other_type == VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT_KHR) { + if constexpr (other_type == VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT) { // SYNC_FD is a special snowflake m_errorMonitor->SetAllowedFailureMsg("VUID-VkFenceGetFdInfoKHR-handleType-01454"); } @@ -944,7 +944,7 @@ TEST_F(NegativeExternalMemorySync, Fence) { } TEST_F(NegativeExternalMemorySync, SyncFdFence) { - const auto handle_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT_KHR; + const auto handle_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT; AddRequiredExtensions(VK_KHR_EXTERNAL_FENCE_CAPABILITIES_EXTENSION_NAME); AddRequiredExtensions(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME); @@ -953,18 +953,18 @@ TEST_F(NegativeExternalMemorySync, SyncFdFence) { RETURN_IF_SKIP(Init()); // Check for external fence import and export capability - VkPhysicalDeviceExternalFenceInfoKHR efi = vku::InitStructHelper(); + VkPhysicalDeviceExternalFenceInfo efi = vku::InitStructHelper(); efi.handleType = handle_type; VkExternalFencePropertiesKHR efp = vku::InitStructHelper(); vk::GetPhysicalDeviceExternalFencePropertiesKHR(Gpu(), &efi, &efp); - if (!(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT_KHR) || - !(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT_KHR)) { + if (!(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT) || + !(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT)) { GTEST_SKIP() << "External fence does not support importing and exporting, skipping test."; } // Create a fence to export payload from - VkExportFenceCreateInfoKHR efci = vku::InitStructHelper(); + VkExportFenceCreateInfo efci = vku::InitStructHelper(); efci.handleTypes = handle_type; VkFenceCreateInfo fci = vku::InitStructHelper(&efci); vkt::Fence export_fence(*m_device, fci); @@ -997,10 +997,10 @@ TEST_F(NegativeExternalMemorySync, SyncFdFence) { TEST_F(NegativeExternalMemorySync, TemporarySemaphore) { #ifdef VK_USE_PLATFORM_WIN32_KHR const auto extension_name = VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR; + const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT; #else const auto extension_name = VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR; + const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT; #endif AddRequiredExtensions(VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_EXTENSION_NAME); AddRequiredExtensions(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME); @@ -1009,20 +1009,20 @@ TEST_F(NegativeExternalMemorySync, TemporarySemaphore) { RETURN_IF_SKIP(Init()); // Check for external semaphore import and export capability - VkPhysicalDeviceExternalSemaphoreInfoKHR esi = vku::InitStructHelper(); + VkPhysicalDeviceExternalSemaphoreInfo esi = vku::InitStructHelper(); esi.handleType = handle_type; VkExternalSemaphorePropertiesKHR esp = vku::InitStructHelper(); vk::GetPhysicalDeviceExternalSemaphorePropertiesKHR(Gpu(), &esi, &esp); - if (!(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT_KHR) || - !(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT_KHR)) { + if (!(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT) || + !(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT)) { GTEST_SKIP() << "External semaphore does not support importing and exporting, skipping test"; } // Create a semaphore to export payload from - VkExportSemaphoreCreateInfoKHR esci = vku::InitStructHelper(); + VkExportSemaphoreCreateInfo esci = vku::InitStructHelper(); esci.handleTypes = handle_type; VkSemaphoreCreateInfo sci = vku::InitStructHelper(&esci); @@ -1034,7 +1034,7 @@ TEST_F(NegativeExternalMemorySync, TemporarySemaphore) { ExternalHandle ext_handle{}; export_semaphore.ExportHandle(ext_handle, handle_type); - import_semaphore.ImportHandle(ext_handle, handle_type, VK_SEMAPHORE_IMPORT_TEMPORARY_BIT_KHR); + import_semaphore.ImportHandle(ext_handle, handle_type, VK_SEMAPHORE_IMPORT_TEMPORARY_BIT); // Wait on the imported semaphore twice in vk::QueueSubmit, the second wait should be an error VkPipelineStageFlags flags = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT; @@ -1078,17 +1078,17 @@ TEST_F(NegativeExternalMemorySync, Semaphore) { TEST_DESCRIPTION("Import and export invalid external semaphores, no queue sumbits involved."); #ifdef VK_USE_PLATFORM_WIN32_KHR const auto extension_name = VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR; - const auto bad_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR; - const auto other_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR; + const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT; + const auto bad_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT; + const auto other_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT; const char *bad_export_type_vuid = "VUID-VkSemaphoreGetWin32HandleInfoKHR-handleType-01131"; const char *other_export_type_vuid = "VUID-VkSemaphoreGetWin32HandleInfoKHR-handleType-01126"; const char *bad_import_type_vuid = "VUID-VkImportSemaphoreWin32HandleInfoKHR-handleType-01140"; #else const auto extension_name = VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR; - const auto bad_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR; - const auto other_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR; + const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT; + const auto bad_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT; + const auto other_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT; const char *bad_export_type_vuid = "VUID-VkSemaphoreGetFdInfoKHR-handleType-01136"; const char *other_export_type_vuid = "VUID-VkSemaphoreGetFdInfoKHR-handleType-01132"; const char *bad_import_type_vuid = "VUID-VkImportSemaphoreFdInfoKHR-handleType-01143"; @@ -1100,19 +1100,19 @@ TEST_F(NegativeExternalMemorySync, Semaphore) { RETURN_IF_SKIP(Init()); // Check for external semaphore import and export capability - VkPhysicalDeviceExternalSemaphoreInfoKHR esi = vku::InitStructHelper(); + VkPhysicalDeviceExternalSemaphoreInfo esi = vku::InitStructHelper(); esi.handleType = handle_type; VkExternalSemaphorePropertiesKHR esp = vku::InitStructHelper(); vk::GetPhysicalDeviceExternalSemaphorePropertiesKHR(Gpu(), &esi, &esp); - if (!(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT_KHR) || - !(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT_KHR)) { + if (!(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT) || + !(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT)) { GTEST_SKIP() << "External semaphore does not support importing and exporting, skipping test"; } // Create a semaphore to export payload from - VkExportSemaphoreCreateInfoKHR esci = vku::InitStructHelper(); + VkExportSemaphoreCreateInfo esci = vku::InitStructHelper(); esci.handleTypes = handle_type; VkSemaphoreCreateInfo sci = vku::InitStructHelper(&esci); @@ -1129,7 +1129,7 @@ TEST_F(NegativeExternalMemorySync, Semaphore) { m_errorMonitor->VerifyFound(); // not specified during create - if constexpr (other_type == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT_KHR) { + if constexpr (other_type == VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_SYNC_FD_BIT) { // SYNC_FD must have pending signal m_errorMonitor->SetDesiredError("VUID-VkSemaphoreGetFdInfoKHR-handleType-03254"); } @@ -1149,10 +1149,10 @@ TEST_F(NegativeExternalMemorySync, ImportMemoryHandleType) { SetTargetApiVersion(VK_API_VERSION_1_1); #ifdef _WIN32 const auto ext_mem_extension_name = VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR; + const auto handle_type = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT; #else const auto ext_mem_extension_name = VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR; + const auto handle_type = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT; #endif AddRequiredExtensions(ext_mem_extension_name); RETURN_IF_SKIP(Init()); @@ -1170,8 +1170,8 @@ TEST_F(NegativeExternalMemorySync, ImportMemoryHandleType) { VkExternalBufferPropertiesKHR ebp = vku::InitStructHelper(); vk::GetPhysicalDeviceExternalBufferProperties(Gpu(), &ebi, &ebp); if (!(ebp.externalMemoryProperties.compatibleHandleTypes & handle_type) || - !(ebp.externalMemoryProperties.externalMemoryFeatures & VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT_KHR) || - !(ebp.externalMemoryProperties.externalMemoryFeatures & VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_KHR)) { + !(ebp.externalMemoryProperties.externalMemoryFeatures & VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT) || + !(ebp.externalMemoryProperties.externalMemoryFeatures & VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT)) { GTEST_SKIP() << "External buffer does not support importing and exporting, skipping test"; } @@ -1211,7 +1211,7 @@ TEST_F(NegativeExternalMemorySync, ImportMemoryHandleType) { auto alloc_info = vkt::DeviceMemory::GetResourceAllocInfo(*m_device, buffer_export_reqs, mem_flags); // Add export allocation info to pNext chain - VkExportMemoryAllocateInfoKHR export_info = vku::InitStructHelper(); + VkExportMemoryAllocateInfo export_info = vku::InitStructHelper(); export_info.handleTypes = handle_type; alloc_info.pNext = &export_info; @@ -1231,7 +1231,7 @@ TEST_F(NegativeExternalMemorySync, ImportMemoryHandleType) { // Bind exported memory buffer_export.BindMemory(memory_buffer_export, 0); - VkExternalMemoryImageCreateInfoKHR external_image_info = vku::InitStructHelper(); + VkExternalMemoryImageCreateInfo external_image_info = vku::InitStructHelper(); external_image_info.handleTypes = handle_type; VkImageCreateInfo image_info = vku::InitStructHelper(&external_image_info); @@ -1311,7 +1311,7 @@ TEST_F(NegativeExternalMemorySync, ImportMemoryHandleType) { // Import memory alloc_info = vkt::DeviceMemory::GetResourceAllocInfo(*m_device, buffer_import_reqs, mem_flags); alloc_info.pNext = &import_info_buffer; - if constexpr (handle_type == VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR) { + if constexpr (handle_type == VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT) { alloc_info.allocationSize = buffer_export_reqs.size; } vkt::DeviceMemory memory_buffer_import; @@ -1324,7 +1324,7 @@ TEST_F(NegativeExternalMemorySync, ImportMemoryHandleType) { } alloc_info = vkt::DeviceMemory::GetResourceAllocInfo(*m_device, image_import_reqs, mem_flags); alloc_info.pNext = &import_info_image; - if constexpr (handle_type == VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR) { + if constexpr (handle_type == VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT) { alloc_info.allocationSize = image_export.MemoryRequirements().size; } vkt::DeviceMemory memory_image_import; @@ -1645,8 +1645,7 @@ TEST_F(NegativeExternalMemorySync, ImportMemoryFromFdHandle) { VkExternalMemoryFeatureFlags external_features = 0; { - constexpr auto required_features = - VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT_KHR | VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_KHR; + constexpr auto required_features = VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT | VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT; VkPhysicalDeviceExternalBufferInfo external_info = vku::InitStructHelper(); external_info.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT; external_info.handleType = handle_type; @@ -1800,8 +1799,7 @@ TEST_F(NegativeExternalMemorySync, ImportMemoryFromWin32Handle) { VkExternalMemoryFeatureFlags external_features = 0; { - constexpr auto required_features = - VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT_KHR | VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_KHR; + constexpr auto required_features = VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT | VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT; VkPhysicalDeviceExternalImageFormatInfo external_info = vku::InitStructHelper(); external_info.handleType = handle_type; VkPhysicalDeviceImageFormatInfo2 image_info = vku::InitStructHelper(&external_info); @@ -2107,7 +2105,7 @@ TEST_F(NegativeExternalMemorySync, ImportMemoryWin32ImageNoDedicated) { vkt::Image image(*m_device, image_info, vkt::no_mem); - VkExportMemoryAllocateInfoKHR export_info = vku::InitStructHelper(); + VkExportMemoryAllocateInfo export_info = vku::InitStructHelper(); export_info.handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT; auto alloc_info = vkt::DeviceMemory::GetResourceAllocInfo(*m_device, image.MemoryRequirements(), 0, &export_info); @@ -2121,7 +2119,7 @@ TEST_F(NegativeExternalMemorySync, ImportMemoryWin32ImageNoDedicated) { HANDLE handle = NULL; vk::GetMemoryWin32HandleKHR(device(), &get_handle_info, &handle); - VkMemoryDedicatedAllocateInfoKHR dedicated_info = vku::InitStructHelper(); + VkMemoryDedicatedAllocateInfo dedicated_info = vku::InitStructHelper(); dedicated_info.image = image; VkImportMemoryWin32HandleInfoKHR import_info = vku::InitStructHelper(&dedicated_info); @@ -2159,10 +2157,10 @@ TEST_F(NegativeExternalMemorySync, ImportMemoryWin32BufferDifferentDedicated) { vkt::Buffer buffer(*m_device, buffer_info, vkt::no_mem); - VkMemoryDedicatedAllocateInfoKHR dedicated_info = vku::InitStructHelper(); + VkMemoryDedicatedAllocateInfo dedicated_info = vku::InitStructHelper(); dedicated_info.buffer = buffer.handle(); - VkExportMemoryAllocateInfoKHR export_info = vku::InitStructHelper(&dedicated_info); + VkExportMemoryAllocateInfo export_info = vku::InitStructHelper(&dedicated_info); export_info.handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT; auto alloc_info = vkt::DeviceMemory::GetResourceAllocInfo(*m_device, buffer.MemoryRequirements(), 0, &export_info); @@ -2306,7 +2304,7 @@ TEST_F(NegativeExternalMemorySync, ImportMemoryFdBufferNoDedicated) { vkt::Buffer buffer(*m_device, buffer_info, vkt::no_mem); - VkExportMemoryAllocateInfoKHR export_info = vku::InitStructHelper(); + VkExportMemoryAllocateInfo export_info = vku::InitStructHelper(); export_info.handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT; auto alloc_info = vkt::DeviceMemory::GetResourceAllocInfo(*m_device, buffer.MemoryRequirements(), 0, &export_info); @@ -2323,7 +2321,7 @@ TEST_F(NegativeExternalMemorySync, ImportMemoryFdBufferNoDedicated) { GTEST_SKIP() << "Cannot export FD memory"; } - VkMemoryDedicatedAllocateInfoKHR dedicated_info = vku::InitStructHelper(); + VkMemoryDedicatedAllocateInfo dedicated_info = vku::InitStructHelper(); dedicated_info.image = VK_NULL_HANDLE; dedicated_info.buffer = buffer.handle(); @@ -2360,11 +2358,11 @@ TEST_F(NegativeExternalMemorySync, ImportMemoryFdBufferDifferentDedicated) { vkt::Buffer buffer(*m_device, buffer_info, vkt::no_mem); - VkMemoryDedicatedAllocateInfoKHR dedicated_info = vku::InitStructHelper(); + VkMemoryDedicatedAllocateInfo dedicated_info = vku::InitStructHelper(); dedicated_info.image = VK_NULL_HANDLE; dedicated_info.buffer = buffer.handle(); - VkExportMemoryAllocateInfoKHR export_info = vku::InitStructHelper(&dedicated_info); + VkExportMemoryAllocateInfo export_info = vku::InitStructHelper(&dedicated_info); export_info.handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT; auto alloc_info = vkt::DeviceMemory::GetResourceAllocInfo(*m_device, buffer.MemoryRequirements(), 0, &export_info); @@ -2464,7 +2462,7 @@ TEST_F(NegativeExternalMemorySync, ImportMemoryFdBufferSupport) { vkt::Buffer buffer(*m_device, buffer_info, vkt::no_mem); - VkMemoryDedicatedAllocateInfoKHR dedicated_info = vku::InitStructHelper(); + VkMemoryDedicatedAllocateInfo dedicated_info = vku::InitStructHelper(); dedicated_info.image = VK_NULL_HANDLE; dedicated_info.buffer = buffer.handle(); @@ -2495,7 +2493,7 @@ TEST_F(NegativeExternalMemorySync, ImportMemoryFdImageSupport) { GTEST_SKIP() << "Need image with no import support"; } - VkMemoryDedicatedAllocateInfoKHR dedicated_info = vku::InitStructHelper(); + VkMemoryDedicatedAllocateInfo dedicated_info = vku::InitStructHelper(); dedicated_info.image = image.handle(); dedicated_info.buffer = VK_NULL_HANDLE; diff --git a/tests/unit/external_memory_sync_positive.cpp b/tests/unit/external_memory_sync_positive.cpp index e05a10e26dc..6d72dd3388a 100644 --- a/tests/unit/external_memory_sync_positive.cpp +++ b/tests/unit/external_memory_sync_positive.cpp @@ -64,11 +64,11 @@ TEST_F(PositiveExternalMemorySync, ImportMemoryFd) { vkt::Buffer buffer(*m_device, buffer_info, vkt::no_mem); - VkMemoryDedicatedAllocateInfoKHR dedicated_info = vku::InitStructHelper(); + VkMemoryDedicatedAllocateInfo dedicated_info = vku::InitStructHelper(); dedicated_info.image = VK_NULL_HANDLE; dedicated_info.buffer = buffer.handle(); - VkExportMemoryAllocateInfoKHR export_info = vku::InitStructHelper(&dedicated_info); + VkExportMemoryAllocateInfo export_info = vku::InitStructHelper(&dedicated_info); export_info.handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT; auto alloc_info = vkt::DeviceMemory::GetResourceAllocInfo(*m_device, buffer.MemoryRequirements(), 0, &export_info); @@ -136,10 +136,10 @@ TEST_F(PositiveExternalMemorySync, ExternalMemory) { #ifdef _WIN32 const auto ext_mem_extension_name = VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR; + const auto handle_type = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT; #else const auto ext_mem_extension_name = VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR; + const auto handle_type = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT; #endif AddRequiredExtensions(VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME); @@ -154,14 +154,13 @@ TEST_F(PositiveExternalMemorySync, ExternalMemory) { VkExternalBufferPropertiesKHR ebp = {VK_STRUCTURE_TYPE_EXTERNAL_BUFFER_PROPERTIES_KHR, nullptr, {0, 0, 0}}; vk::GetPhysicalDeviceExternalBufferPropertiesKHR(Gpu(), &ebi, &ebp); if (!(ebp.externalMemoryProperties.compatibleHandleTypes & handle_type) || - !(ebp.externalMemoryProperties.externalMemoryFeatures & VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT_KHR) || - !(ebp.externalMemoryProperties.externalMemoryFeatures & VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_KHR)) { + !(ebp.externalMemoryProperties.externalMemoryFeatures & VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT) || + !(ebp.externalMemoryProperties.externalMemoryFeatures & VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT)) { GTEST_SKIP() << "External buffer does not support importing and exporting"; } // Check if dedicated allocation is required - bool dedicated_allocation = - ebp.externalMemoryProperties.externalMemoryFeatures & VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT_KHR; + bool dedicated_allocation = ebp.externalMemoryProperties.externalMemoryFeatures & VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT; if (dedicated_allocation && !IsExtensionsEnabled(VK_KHR_DEDICATED_ALLOCATION_EXTENSION_NAME)) { GTEST_SKIP() << "Dedicated allocation extension not supported"; } @@ -172,8 +171,8 @@ TEST_F(PositiveExternalMemorySync, ExternalMemory) { const VkDeviceSize buffer_size = 1024; // Create export and import buffers - const VkExternalMemoryBufferCreateInfoKHR external_buffer_info = {VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO_KHR, - nullptr, handle_type}; + const VkExternalMemoryBufferCreateInfo external_buffer_info = {VK_STRUCTURE_TYPE_EXTERNAL_MEMORY_BUFFER_CREATE_INFO_KHR, + nullptr, handle_type}; auto buffer_info = vkt::Buffer::CreateInfo(buffer_size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT); buffer_info.pNext = &external_buffer_info; vkt::Buffer buffer_export(*m_device, buffer_info, vkt::no_mem); @@ -183,12 +182,12 @@ TEST_F(PositiveExternalMemorySync, ExternalMemory) { auto alloc_info = vkt::DeviceMemory::GetResourceAllocInfo(*m_device, buffer_export.MemoryRequirements(), mem_flags); // Add export allocation info to pNext chain - VkExportMemoryAllocateInfoKHR export_info = {VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHR, nullptr, handle_type}; + VkExportMemoryAllocateInfo export_info = {VK_STRUCTURE_TYPE_EXPORT_MEMORY_ALLOCATE_INFO_KHR, nullptr, handle_type}; alloc_info.pNext = &export_info; // Add dedicated allocation info to pNext chain if required - VkMemoryDedicatedAllocateInfoKHR dedicated_info = {VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR, nullptr, - VK_NULL_HANDLE, buffer_export.handle()}; + VkMemoryDedicatedAllocateInfo dedicated_info = {VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO_KHR, nullptr, VK_NULL_HANDLE, + buffer_export.handle()}; if (dedicated_allocation) { export_info.pNext = &dedicated_info; } @@ -299,8 +298,8 @@ TEST_F(PositiveExternalMemorySync, SyncFdSemaphore) { VkExternalSemaphoreProperties external_semahpore_props = vku::InitStructHelper(); vk::GetPhysicalDeviceExternalSemaphoreProperties(Gpu(), &external_semahpore_info, &external_semahpore_props); - if (!(external_semahpore_props.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT_KHR) || - !(external_semahpore_props.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT_KHR)) { + if (!(external_semahpore_props.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT) || + !(external_semahpore_props.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT)) { GTEST_SKIP() << "External semaphore does not support importing and exporting"; } if (!(external_semahpore_props.compatibleHandleTypes & handle_type)) { @@ -516,10 +515,10 @@ TEST_F(PositiveExternalMemorySync, ImportMemoryWin32BufferDifferentDedicated) { vkt::Buffer buffer(*m_device, buffer_info, vkt::no_mem); - VkMemoryDedicatedAllocateInfoKHR dedicated_info = vku::InitStructHelper(); + VkMemoryDedicatedAllocateInfo dedicated_info = vku::InitStructHelper(); dedicated_info.buffer = buffer.handle(); - VkExportMemoryAllocateInfoKHR export_info = vku::InitStructHelper(&dedicated_info); + VkExportMemoryAllocateInfo export_info = vku::InitStructHelper(&dedicated_info); export_info.handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT; auto alloc_info = vkt::DeviceMemory::GetResourceAllocInfo(*m_device, buffer.MemoryRequirements(), 0, &export_info); @@ -597,11 +596,11 @@ TEST_F(PositiveExternalMemorySync, ImportMemoryFdBufferDifferentDedicated) { vkt::Buffer buffer(*m_device, buffer_info, vkt::no_mem); - VkMemoryDedicatedAllocateInfoKHR dedicated_info = vku::InitStructHelper(); + VkMemoryDedicatedAllocateInfo dedicated_info = vku::InitStructHelper(); dedicated_info.image = VK_NULL_HANDLE; dedicated_info.buffer = buffer.handle(); - VkExportMemoryAllocateInfoKHR export_info = vku::InitStructHelper(&dedicated_info); + VkExportMemoryAllocateInfo export_info = vku::InitStructHelper(&dedicated_info); export_info.handleTypes = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT; auto alloc_info = vkt::DeviceMemory::GetResourceAllocInfo(*m_device, buffer.MemoryRequirements(), 0, &export_info); diff --git a/tests/unit/fragment_shading_rate.cpp b/tests/unit/fragment_shading_rate.cpp index b553efa8969..e848840d6b7 100644 --- a/tests/unit/fragment_shading_rate.cpp +++ b/tests/unit/fragment_shading_rate.cpp @@ -1781,7 +1781,7 @@ TEST_F(NegativeFragmentShadingRate, FragmentDensityMapOffsetQCOM) { { VkSubpassFragmentDensityMapOffsetEndInfoQCOM offsetting = vku::InitStructHelper(); - VkSubpassEndInfoKHR subpassEndInfo = vku::InitStructHelper(&offsetting); + VkSubpassEndInfo subpassEndInfo = vku::InitStructHelper(&offsetting); VkOffset2D m_vOffsets[2]; offsetting.pFragmentDensityOffsets = m_vOffsets; offsetting.fragmentDensityOffsetCount = 2; @@ -2466,14 +2466,14 @@ TEST_F(NegativeFragmentShadingRate, DISABLED_Framebuffer) { ivci.subresourceRange.levelCount = 1; ivci.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; - VkFramebufferAttachmentImageInfoKHR fb_fdm = vku::InitStructHelper(); + VkFramebufferAttachmentImageInfo fb_fdm = vku::InitStructHelper(); fb_fdm.usage = VK_IMAGE_USAGE_FRAGMENT_DENSITY_MAP_BIT_EXT; fb_fdm.width = frame_width; fb_fdm.height = frame_height; fb_fdm.layerCount = 1; fb_fdm.viewFormatCount = 1; fb_fdm.pViewFormats = &attachment_format; - VkFramebufferAttachmentsCreateInfoKHR fb_aci_fdm = vku::InitStructHelper(); + VkFramebufferAttachmentsCreateInfo fb_aci_fdm = vku::InitStructHelper(); fb_aci_fdm.attachmentImageInfoCount = 1; fb_aci_fdm.pAttachmentImageInfos = &fb_fdm; @@ -2900,7 +2900,7 @@ TEST_F(NegativeFragmentShadingRate, ImagelessAttachmentFragmentDensity) { fb_aci_fdm.pAttachmentImageInfos = &fb_fdm; VkFramebufferCreateInfo fb_info = vku::InitStructHelper(&fb_aci_fdm); - fb_info.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR; + fb_info.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT; fb_info.renderPass = render_pass.handle(); fb_info.attachmentCount = 1; fb_info.pAttachments = nullptr; diff --git a/tests/unit/geometry_tessellation.cpp b/tests/unit/geometry_tessellation.cpp index ae99404b1e6..f07b01993dc 100644 --- a/tests/unit/geometry_tessellation.cpp +++ b/tests/unit/geometry_tessellation.cpp @@ -1612,7 +1612,7 @@ TEST_F(NegativeGeometryTessellation, DrawDynamicPrimitiveTopology) { CreatePipelineHelper pipe(*this); pipe.ia_ci_.topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; - pipe.AddDynamicState(VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT); + pipe.AddDynamicState(VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY); pipe.shader_stages_ = {vs.GetStageCreateInfo(), gs.GetStageCreateInfo(), pipe.fs_->GetStageCreateInfo()}; pipe.CreateGraphicsPipeline(); diff --git a/tests/unit/geometry_tessellation_positive.cpp b/tests/unit/geometry_tessellation_positive.cpp index ec568b2ddfd..d5ac61add49 100644 --- a/tests/unit/geometry_tessellation_positive.cpp +++ b/tests/unit/geometry_tessellation_positive.cpp @@ -86,7 +86,7 @@ TEST_F(PositiveGeometryTessellation, IncompatibleDynamicPrimitiveTopology) { CreatePipelineHelper pipe(*this); pipe.ia_ci_.topology = VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST; - pipe.AddDynamicState(VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT); + pipe.AddDynamicState(VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY); pipe.shader_stages_ = {vs.GetStageCreateInfo(), gs.GetStageCreateInfo(), pipe.fs_->GetStageCreateInfo()}; pipe.CreateGraphicsPipeline(); } @@ -125,7 +125,7 @@ TEST_F(PositiveGeometryTessellation, DrawDynamicPrimitiveTopology) { CreatePipelineHelper pipe(*this); pipe.ia_ci_.topology = VK_PRIMITIVE_TOPOLOGY_POINT_LIST; - pipe.AddDynamicState(VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT); + pipe.AddDynamicState(VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY); pipe.shader_stages_ = {vs.GetStageCreateInfo(), gs.GetStageCreateInfo(), pipe.fs_->GetStageCreateInfo()}; pipe.CreateGraphicsPipeline(); diff --git a/tests/unit/gpu_av.cpp b/tests/unit/gpu_av.cpp index 27a50835cfb..602254b3c3e 100644 --- a/tests/unit/gpu_av.cpp +++ b/tests/unit/gpu_av.cpp @@ -885,8 +885,8 @@ TEST_F(NegativeGpuAV, NonMultisampleMismatchWithPipelinePartiallyBound) { buffer_ptr[0] = 1; buffer.Memory().Unmap(); - VkDescriptorBindingFlagsEXT ds_binding_flags[2] = {VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT, 0}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT ds_layout_binding_flags = vku::InitStructHelper(); + VkDescriptorBindingFlagsEXT ds_binding_flags[2] = {VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT, 0}; + VkDescriptorSetLayoutBindingFlagsCreateInfo ds_layout_binding_flags = vku::InitStructHelper(); ds_layout_binding_flags.bindingCount = 2; ds_layout_binding_flags.pBindingFlags = ds_binding_flags; @@ -1283,8 +1283,8 @@ TEST_F(NegativeGpuAV, AliasImageMultisample) { } )glsl"; - VkDescriptorBindingFlagsEXT ds_binding_flags[3] = {VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT, 0, 0}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT ds_layout_binding_flags = vku::InitStructHelper(); + VkDescriptorBindingFlagsEXT ds_binding_flags[3] = {VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT, 0, 0}; + VkDescriptorSetLayoutBindingFlagsCreateInfo ds_layout_binding_flags = vku::InitStructHelper(); ds_layout_binding_flags.bindingCount = 3; ds_layout_binding_flags.pBindingFlags = ds_binding_flags; @@ -1363,8 +1363,8 @@ TEST_F(NegativeGpuAV, AliasImageMultisampleDescriptorSetsPartiallyBound) { vkt::Image ms_image(*m_device, image_ci, vkt::set_layout); vkt::ImageView ms_image_view = ms_image.CreateView(); - VkDescriptorBindingFlagsEXT ds_binding_flags[3] = {VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT, 0, 0}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT ds_layout_binding_flags = vku::InitStructHelper(); + VkDescriptorBindingFlagsEXT ds_binding_flags[3] = {VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT, 0, 0}; + VkDescriptorSetLayoutBindingFlagsCreateInfo ds_layout_binding_flags = vku::InitStructHelper(); ds_layout_binding_flags.bindingCount = 3; ds_layout_binding_flags.pBindingFlags = ds_binding_flags; diff --git a/tests/unit/gpu_av_debug_printf.cpp b/tests/unit/gpu_av_debug_printf.cpp index bd520d18cec..f26918f8484 100644 --- a/tests/unit/gpu_av_debug_printf.cpp +++ b/tests/unit/gpu_av_debug_printf.cpp @@ -350,7 +350,7 @@ TEST_F(NegativeGpuAVDebugPrintf, DynamicRendering) { descriptor_set_0.UpdateDescriptorSets(); VkFormat color_formats = {GetRenderTargetFormat()}; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_formats; diff --git a/tests/unit/gpu_av_descriptor_indexing.cpp b/tests/unit/gpu_av_descriptor_indexing.cpp index d2939539253..608feb6cd2a 100644 --- a/tests/unit/gpu_av_descriptor_indexing.cpp +++ b/tests/unit/gpu_av_descriptor_indexing.cpp @@ -163,8 +163,8 @@ TEST_F(NegativeGpuAVDescriptorIndexing, ArrayOOBVertex) { {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, {1, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 6, VK_SHADER_STAGE_ALL, nullptr}, }, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, - &layout_createinfo_binding_flags, VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &layout_createinfo_binding_flags, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout(*m_device, {&descriptor_set.layout_}); vkt::Image image(*m_device, 16, 16, 1, VK_FORMAT_B8G8R8A8_UNORM, VK_IMAGE_USAGE_SAMPLED_BIT); @@ -272,8 +272,8 @@ TEST_F(NegativeGpuAVDescriptorIndexing, ArrayOOBFragment) { {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, {1, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 6, VK_SHADER_STAGE_ALL, nullptr}, }, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, - &layout_createinfo_binding_flags, VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &layout_createinfo_binding_flags, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout(*m_device, {&descriptor_set.layout_}); vkt::Image image(*m_device, 16, 16, 1, VK_FORMAT_B8G8R8A8_UNORM, VK_IMAGE_USAGE_SAMPLED_BIT); @@ -383,8 +383,8 @@ TEST_F(NegativeGpuAVDescriptorIndexing, ArrayOOBRuntime) { {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, {1, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 6, VK_SHADER_STAGE_ALL, nullptr}, }, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, - &layout_createinfo_binding_flags, VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &layout_createinfo_binding_flags, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout(*m_device, {&descriptor_set.layout_}); uint32_t desc_counts = 6; // We'll reserve 8 spaces in the layout, but the descriptor will only use 6 @@ -1441,7 +1441,7 @@ TEST_F(NegativeGpuAVDescriptorIndexing, UpdateAfterBind) { {2, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_FRAGMENT_BIT, nullptr}, }; VkDescriptorSetLayoutCreateInfo ds_layout_ci = vku::InitStructHelper(&flags_create_info); - ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT; + ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT; ds_layout_ci.bindingCount = 3; ds_layout_ci.pBindings = &binding[0]; vkt::DescriptorSetLayout ds_layout(*m_device, ds_layout_ci); @@ -1452,7 +1452,7 @@ TEST_F(NegativeGpuAVDescriptorIndexing, UpdateAfterBind) { {binding[2].descriptorType, binding[2].descriptorCount}, }; VkDescriptorPoolCreateInfo dspci = vku::InitStructHelper(); - dspci.flags = VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT; + dspci.flags = VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT; dspci.poolSizeCount = 3; dspci.pPoolSizes = &pool_sizes[0]; dspci.maxSets = 1; @@ -1566,8 +1566,8 @@ TEST_F(NegativeGpuAVDescriptorIndexing, UpdateAfterBindImageViewTypeMismatch) { flags_create_info.pBindingFlags = &binding_flags; OneOffDescriptorSet descriptor_set(m_device, {{0, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, VK_SHADER_STAGE_ALL, nullptr}}, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, &flags_create_info, - VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &flags_create_info, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout(*m_device, {&descriptor_set.layout_}); descriptor_set.WriteDescriptorImageInfo(0, image_view, sampler); @@ -1622,7 +1622,7 @@ TEST_F(NegativeGpuAVDescriptorIndexing, VariableDescriptorCountAllocateAfterPipe {5, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 8, VK_SHADER_STAGE_COMPUTE_BIT, nullptr}, }; VkDescriptorSetLayoutCreateInfo ds_layout_ci = vku::InitStructHelper(&flags_create_info); - ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT; + ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT; ds_layout_ci.bindingCount = 3; ds_layout_ci.pBindings = &binding[0]; vkt::DescriptorSetLayout ds_layout(*m_device, ds_layout_ci); @@ -1655,7 +1655,7 @@ TEST_F(NegativeGpuAVDescriptorIndexing, VariableDescriptorCountAllocateAfterPipe {binding[2].descriptorType, binding[2].descriptorCount}, }; VkDescriptorPoolCreateInfo dspci = vku::InitStructHelper(); - dspci.flags = VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT; + dspci.flags = VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT; dspci.poolSizeCount = 3; dspci.pPoolSizes = &pool_sizes[0]; dspci.maxSets = 1; @@ -1752,8 +1752,8 @@ TEST_F(NegativeGpuAVDescriptorIndexing, PostProcesingOnly) { flags_create_info.pBindingFlags = &binding_flags; OneOffDescriptorSet descriptor_set(m_device, {{0, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 1, VK_SHADER_STAGE_ALL, nullptr}}, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, &flags_create_info, - VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &flags_create_info, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout(*m_device, {&descriptor_set.layout_}); descriptor_set.WriteDescriptorImageInfo(0, image_view, sampler); @@ -1855,8 +1855,8 @@ TEST_F(NegativeGpuAVDescriptorIndexing, BasicHLSL) { buffer_ptr[0] = 5; // go past textures[4] buffer.Memory().Unmap(); - VkDescriptorBindingFlagsEXT ds_binding_flags[3] = {0, 0, VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT ds_layout_binding_flags = vku::InitStructHelper(); + VkDescriptorBindingFlagsEXT ds_binding_flags[3] = {0, 0, VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT}; + VkDescriptorSetLayoutBindingFlagsCreateInfo ds_layout_binding_flags = vku::InitStructHelper(); ds_layout_binding_flags.bindingCount = 3; ds_layout_binding_flags.pBindingFlags = ds_binding_flags; @@ -2246,7 +2246,7 @@ TEST_F(NegativeGpuAVDescriptorIndexing, MultipleOOBInMultipleCmdBuffers) { {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, {1, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 6, VK_SHADER_STAGE_ALL, nullptr}, }, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &layout_createinfo_binding_flags_cb_1, VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout_cb_1(*m_device, {&descriptor_set_cb_1.layout_}); @@ -2455,7 +2455,7 @@ TEST_F(NegativeGpuAVDescriptorIndexing, MultipleOOBTypesInOneCmdBuffer) { {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, {1, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 6, VK_SHADER_STAGE_ALL, nullptr}, }, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &layout_createinfo_binding_flags_cb_1, VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout_cb_1(*m_device, {&descriptor_set_cb_1.layout_}); @@ -2745,8 +2745,8 @@ TEST_F(NegativeGpuAVDescriptorIndexing, PartialBoundDescriptorSSBO) { flags_create_info.pBindingFlags = &binding_flags; OneOffDescriptorSet descriptor_set(m_device, {{0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}}, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, &flags_create_info, - VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &flags_create_info, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout(*m_device, {&descriptor_set.layout_}); CreateComputePipelineHelper pipe(*this); @@ -3069,8 +3069,8 @@ TEST_F(NegativeGpuAVDescriptorIndexing, MultipleBoundDescriptorsUpdateAfterBindF {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, {1, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 2, VK_SHADER_STAGE_ALL, nullptr}, }, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, &flags_create_info, - VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &flags_create_info, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout_1(*m_device, {&descriptor_set_1.layout_}); CreateComputePipelineHelper pipe_1(*this); @@ -3093,8 +3093,8 @@ TEST_F(NegativeGpuAVDescriptorIndexing, MultipleBoundDescriptorsUpdateAfterBindF {1, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, {2, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 2, VK_SHADER_STAGE_ALL, nullptr}, }, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, &flags_create_info, - VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &flags_create_info, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout_2(*m_device, {&descriptor_set_2.layout_}); CreateComputePipelineHelper pipe_2(*this); @@ -3170,8 +3170,8 @@ TEST_F(NegativeGpuAVDescriptorIndexing, MultipleBoundDescriptorsUpdateAfterBindL {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, {1, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 2, VK_SHADER_STAGE_ALL, nullptr}, }, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, &flags_create_info, - VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &flags_create_info, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout_1(*m_device, {&descriptor_set_1.layout_}); CreateComputePipelineHelper pipe_1(*this); @@ -3194,8 +3194,8 @@ TEST_F(NegativeGpuAVDescriptorIndexing, MultipleBoundDescriptorsUpdateAfterBindL {1, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, {2, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 2, VK_SHADER_STAGE_ALL, nullptr}, }, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, &flags_create_info, - VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &flags_create_info, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout_2(*m_device, {&descriptor_set_2.layout_}); CreateComputePipelineHelper pipe_2(*this); @@ -3342,15 +3342,15 @@ TEST_F(NegativeGpuAVDescriptorIndexing, MultipleSetSomeUninitializedUpdateAfterB {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, {1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 2, VK_SHADER_STAGE_ALL, nullptr}, }, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, &flags_create_info, - VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &flags_create_info, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); OneOffDescriptorSet ds_bad(m_device, { {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, {1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 2, VK_SHADER_STAGE_ALL, nullptr}, }, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, &flags_create_info, - VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &flags_create_info, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout(*m_device, {&ds_good.layout_}); char const *cs_source = R"glsl( @@ -3516,8 +3516,8 @@ TEST_F(NegativeGpuAVDescriptorIndexing, SpecConstantUpdateAfterBind) { flags_create_info.pBindingFlags = &binding_flags; OneOffDescriptorSet descriptor_set(m_device, {{0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 2, VK_SHADER_STAGE_ALL, nullptr}}, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, &flags_create_info, - VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &flags_create_info, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout(*m_device, {&descriptor_set.layout_}); // Create 2 pipelines with 2 values, make sure the first isn't cached or anything strange preventing the second one from diff --git a/tests/unit/gpu_av_descriptor_indexing_positive.cpp b/tests/unit/gpu_av_descriptor_indexing_positive.cpp index 8520cc75e13..86232ba81b9 100644 --- a/tests/unit/gpu_av_descriptor_indexing_positive.cpp +++ b/tests/unit/gpu_av_descriptor_indexing_positive.cpp @@ -110,8 +110,8 @@ TEST_F(PositiveGpuAVDescriptorIndexing, BasicHLSL) { buffer_ptr[0] = 1; buffer.Memory().Unmap(); - VkDescriptorBindingFlagsEXT ds_binding_flags[3] = {0, 0, VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT ds_layout_binding_flags = vku::InitStructHelper(); + VkDescriptorBindingFlagsEXT ds_binding_flags[3] = {0, 0, VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT}; + VkDescriptorSetLayoutBindingFlagsCreateInfo ds_layout_binding_flags = vku::InitStructHelper(); ds_layout_binding_flags.bindingCount = 3; ds_layout_binding_flags.pBindingFlags = ds_binding_flags; @@ -1012,8 +1012,8 @@ TEST_F(PositiveGpuAVDescriptorIndexing, PartialBoundDescriptorSSBO) { flags_create_info.pBindingFlags = &binding_flags; OneOffDescriptorSet descriptor_set(m_device, {{0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}}, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, &flags_create_info, - VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &flags_create_info, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout(*m_device, {&descriptor_set.layout_}); CreateComputePipelineHelper pipe(*this); @@ -1913,8 +1913,8 @@ TEST_F(PositiveGpuAVDescriptorIndexing, MultipleBoundDescriptorsUpdateAfterBind) {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, {1, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 2, VK_SHADER_STAGE_ALL, nullptr}, }, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, &flags_create_info, - VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &flags_create_info, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout_1(*m_device, {&descriptor_set_1.layout_}); CreateComputePipelineHelper pipe_1(*this); @@ -1937,8 +1937,8 @@ TEST_F(PositiveGpuAVDescriptorIndexing, MultipleBoundDescriptorsUpdateAfterBind) {1, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, {2, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 2, VK_SHADER_STAGE_ALL, nullptr}, }, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, &flags_create_info, - VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &flags_create_info, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout_2(*m_device, {&descriptor_set_2.layout_}); CreateComputePipelineHelper pipe_2(*this); @@ -2014,8 +2014,8 @@ TEST_F(PositiveGpuAVDescriptorIndexing, MultipleUnusedBoundDescriptorsUpdateAfte {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, {1, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 2, VK_SHADER_STAGE_ALL, nullptr}, }, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, &flags_create_info, - VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &flags_create_info, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout(*m_device, {&descriptor_set.layout_}); CreateComputePipelineHelper pipe(*this); @@ -2029,8 +2029,8 @@ TEST_F(PositiveGpuAVDescriptorIndexing, MultipleUnusedBoundDescriptorsUpdateAfte {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, {1, VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, 2, VK_SHADER_STAGE_ALL, nullptr}, }, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, &flags_create_info, - VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &flags_create_info, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout_bad_1(*m_device, {&descriptor_set_unused.layout_}); // use vaild set, but put at set == 1 so doesn't match shader const vkt::PipelineLayout pipeline_layout_bad_2(*m_device, {&descriptor_set_unused.layout_, &descriptor_set.layout_}); @@ -2175,15 +2175,15 @@ TEST_F(PositiveGpuAVDescriptorIndexing, MultipleSetSomeUninitializedUpdateAfterB {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, {1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 2, VK_SHADER_STAGE_ALL, nullptr}, }, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, &flags_create_info, - VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &flags_create_info, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); OneOffDescriptorSet ds_bad(m_device, { {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, {1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 2, VK_SHADER_STAGE_ALL, nullptr}, }, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, &flags_create_info, - VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &flags_create_info, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); const vkt::PipelineLayout pipeline_layout(*m_device, {&ds_good.layout_}); char const *cs_source = R"glsl( @@ -2339,7 +2339,7 @@ TEST_F(PositiveGpuAVDescriptorIndexing, VariableDescriptorCountAllocateAfterPipe {5, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 8, VK_SHADER_STAGE_COMPUTE_BIT, nullptr}, }; VkDescriptorSetLayoutCreateInfo ds_layout_ci = vku::InitStructHelper(&flags_create_info); - ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT; + ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT; ds_layout_ci.bindingCount = 3; ds_layout_ci.pBindings = &binding[0]; vkt::DescriptorSetLayout ds_layout(*m_device, ds_layout_ci); @@ -2372,7 +2372,7 @@ TEST_F(PositiveGpuAVDescriptorIndexing, VariableDescriptorCountAllocateAfterPipe {binding[2].descriptorType, binding[2].descriptorCount}, }; VkDescriptorPoolCreateInfo dspci = vku::InitStructHelper(); - dspci.flags = VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT; + dspci.flags = VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT; dspci.poolSizeCount = 3; dspci.pPoolSizes = &pool_sizes[0]; dspci.maxSets = 1; diff --git a/tests/unit/gpu_av_oob.cpp b/tests/unit/gpu_av_oob.cpp index d89d98ce8e4..f5685e4f6c1 100644 --- a/tests/unit/gpu_av_oob.cpp +++ b/tests/unit/gpu_av_oob.cpp @@ -58,9 +58,9 @@ TEST_F(NegativeGpuAVOOB, RobustBuffer) { VkShaderObj vs(this, vertshader, VK_SHADER_STAGE_VERTEX_BIT); - VkPipelineRobustnessCreateInfoEXT pipeline_robustness_ci = vku::InitStructHelper(); - pipeline_robustness_ci.uniformBuffers = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_EXT; - pipeline_robustness_ci.storageBuffers = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_EXT; + VkPipelineRobustnessCreateInfo pipeline_robustness_ci = vku::InitStructHelper(); + pipeline_robustness_ci.uniformBuffers = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS; + pipeline_robustness_ci.storageBuffers = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS; CreatePipelineHelper robust_pipe(*this, &pipeline_robustness_ci); robust_pipe.shader_stages_[0] = vs.GetStageCreateInfo(); @@ -201,7 +201,7 @@ void NegativeGpuAVOOB::ShaderBufferSizeTest(VkDeviceSize buffer_size, VkDeviceSi pipe.gp_ci_.layout = pipeline_layout.handle(); VkFormat color_formats = VK_FORMAT_UNDEFINED; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); const auto depth_format = FindSupportedDepthOnlyFormat(Gpu()); if (shader_objects) { @@ -1855,7 +1855,7 @@ TEST_F(NegativeGpuAVOOB, DeviceGeneratedCommandsCompute) { pre_process_size = mem_reqs2.memoryRequirements.size; } - VkBufferUsageFlags2CreateInfoKHR buffer_usage_flags = vku::InitStructHelper(); + VkBufferUsageFlags2CreateInfo buffer_usage_flags = vku::InitStructHelper(); buffer_usage_flags.usage = VK_BUFFER_USAGE_2_PREPROCESS_BUFFER_BIT_EXT | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT; VkBufferCreateInfo buffer_ci = vku::InitStructHelper(&buffer_usage_flags); buffer_ci.size = pre_process_size; diff --git a/tests/unit/gpu_av_positive.cpp b/tests/unit/gpu_av_positive.cpp index f11a1b2705a..361c00c272d 100644 --- a/tests/unit/gpu_av_positive.cpp +++ b/tests/unit/gpu_av_positive.cpp @@ -142,8 +142,8 @@ TEST_F(PositiveGpuAV, InlineUniformBlock) { vkt::Buffer buffer(*m_device, 4, VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, kHostVisibleMemProps); VkDescriptorBindingFlagsEXT ds_binding_flags[2] = {}; - ds_binding_flags[1] = VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT layout_createinfo_binding_flags[1] = {}; + ds_binding_flags[1] = VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT; + VkDescriptorSetLayoutBindingFlagsCreateInfo layout_createinfo_binding_flags[1] = {}; layout_createinfo_binding_flags[0] = vku::InitStructHelper(); layout_createinfo_binding_flags[0].bindingCount = 2; layout_createinfo_binding_flags[0].pBindingFlags = ds_binding_flags; @@ -154,7 +154,7 @@ TEST_F(PositiveGpuAV, InlineUniformBlock) { OneOffDescriptorSet descriptor_set(m_device, { {0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, - {1, VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT, 32, VK_SHADER_STAGE_ALL, nullptr}, + {1, VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, 32, VK_SHADER_STAGE_ALL, nullptr}, }, 0, layout_createinfo_binding_flags, 0, nullptr, &pool_inline_info); const vkt::PipelineLayout pipeline_layout(*m_device, {&descriptor_set.layout_}); @@ -165,7 +165,7 @@ TEST_F(PositiveGpuAV, InlineUniformBlock) { buffer_info[0].range = sizeof(uint32_t); const uint32_t test_data = 0xdeadca7; - VkWriteDescriptorSetInlineUniformBlockEXT write_inline_uniform = vku::InitStructHelper(); + VkWriteDescriptorSetInlineUniformBlock write_inline_uniform = vku::InitStructHelper(); write_inline_uniform.dataSize = 4; write_inline_uniform.pData = &test_data; @@ -182,7 +182,7 @@ TEST_F(PositiveGpuAV, InlineUniformBlock) { descriptor_writes[1].dstBinding = 1; descriptor_writes[1].dstArrayElement = 16; // Skip first 16 bytes (dummy) descriptor_writes[1].descriptorCount = 4; // Write 4 bytes to val - descriptor_writes[1].descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT; + descriptor_writes[1].descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK; vk::UpdateDescriptorSets(device(), 2, descriptor_writes, 0, NULL); char const *csSource = R"glsl( @@ -232,8 +232,8 @@ TEST_F(PositiveGpuAV, InlineUniformBlockAndRecovery) { vkt::Buffer buffer(*m_device, 4, VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, kHostVisibleMemProps); VkDescriptorBindingFlagsEXT ds_binding_flags[2] = {}; - ds_binding_flags[1] = VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT layout_createinfo_binding_flags[1] = {}; + ds_binding_flags[1] = VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT; + VkDescriptorSetLayoutBindingFlagsCreateInfo layout_createinfo_binding_flags[1] = {}; layout_createinfo_binding_flags[0] = vku::InitStructHelper(); layout_createinfo_binding_flags[0].bindingCount = 2; layout_createinfo_binding_flags[0].pBindingFlags = ds_binding_flags; @@ -244,7 +244,7 @@ TEST_F(PositiveGpuAV, InlineUniformBlockAndRecovery) { OneOffDescriptorSet descriptor_set(m_device, { {0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, - {1, VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT, 32, VK_SHADER_STAGE_ALL, nullptr}, + {1, VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, 32, VK_SHADER_STAGE_ALL, nullptr}, }, 0, layout_createinfo_binding_flags, 0, nullptr, &pool_inline_info); @@ -254,7 +254,7 @@ TEST_F(PositiveGpuAV, InlineUniformBlockAndRecovery) { buffer_info[0].range = sizeof(uint32_t); const uint32_t test_data = 0xdeadca7; - VkWriteDescriptorSetInlineUniformBlockEXT write_inline_uniform = vku::InitStructHelper(); + VkWriteDescriptorSetInlineUniformBlock write_inline_uniform = vku::InitStructHelper(); write_inline_uniform.dataSize = 4; write_inline_uniform.pData = &test_data; @@ -271,7 +271,7 @@ TEST_F(PositiveGpuAV, InlineUniformBlockAndRecovery) { descriptor_writes[1].dstBinding = 1; descriptor_writes[1].dstArrayElement = 16; // Skip first 16 bytes (dummy) descriptor_writes[1].descriptorCount = 4; // Write 4 bytes to val - descriptor_writes[1].descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT; + descriptor_writes[1].descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK; vk::UpdateDescriptorSets(device(), 2, descriptor_writes, 0, nullptr); const uint32_t set_count = m_device->Physical().limits_.maxBoundDescriptorSets + 1; // account for reserved set @@ -383,7 +383,7 @@ TEST_F(PositiveGpuAV, InlineUniformBlockUninitialized) { OneOffDescriptorSet descriptor_set(m_device, { {0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, - {1, VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT, 8, VK_SHADER_STAGE_ALL, nullptr}, + {1, VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, 8, VK_SHADER_STAGE_ALL, nullptr}, }, 0, nullptr, 0, nullptr, &pool_inline_info); const vkt::PipelineLayout pipeline_layout(*m_device, {&descriptor_set.layout_}); @@ -391,7 +391,7 @@ TEST_F(PositiveGpuAV, InlineUniformBlockUninitialized) { descriptor_set.UpdateDescriptorSets(); const uint32_t update_value = 0; - VkWriteDescriptorSetInlineUniformBlockEXT write_inline_uniform = vku::InitStructHelper(); + VkWriteDescriptorSetInlineUniformBlock write_inline_uniform = vku::InitStructHelper(); write_inline_uniform.dataSize = 4; write_inline_uniform.pData = &update_value; VkWriteDescriptorSet descriptor_writes = vku::InitStructHelper(&write_inline_uniform); @@ -399,7 +399,7 @@ TEST_F(PositiveGpuAV, InlineUniformBlockUninitialized) { descriptor_writes.dstBinding = 1; descriptor_writes.dstArrayElement = 0; descriptor_writes.descriptorCount = 4; - descriptor_writes.descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT; + descriptor_writes.descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK; vk::UpdateDescriptorSets(device(), 1, &descriptor_writes, 0, nullptr); CreateComputePipelineHelper pipe(*this); @@ -454,10 +454,10 @@ TEST_F(PositiveGpuAV, InlineUniformBlockUninitializedUpdateAfterBind) { OneOffDescriptorSet descriptor_set(m_device, { {0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, - {1, VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT, 8, VK_SHADER_STAGE_ALL, nullptr}, + {1, VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, 8, VK_SHADER_STAGE_ALL, nullptr}, }, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, &flags_create_info, - VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT, nullptr, &pool_inline_info); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &flags_create_info, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT, nullptr, &pool_inline_info); const vkt::PipelineLayout pipeline_layout(*m_device, {&descriptor_set.layout_}); descriptor_set.WriteDescriptorBufferInfo(0, buffer.handle(), 0, VK_WHOLE_SIZE, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER); descriptor_set.UpdateDescriptorSets(); @@ -475,7 +475,7 @@ TEST_F(PositiveGpuAV, InlineUniformBlockUninitializedUpdateAfterBind) { m_command_buffer.End(); const uint32_t update_value = 0; - VkWriteDescriptorSetInlineUniformBlockEXT write_inline_uniform = vku::InitStructHelper(); + VkWriteDescriptorSetInlineUniformBlock write_inline_uniform = vku::InitStructHelper(); write_inline_uniform.dataSize = 4; write_inline_uniform.pData = &update_value; VkWriteDescriptorSet descriptor_writes = vku::InitStructHelper(&write_inline_uniform); @@ -483,7 +483,7 @@ TEST_F(PositiveGpuAV, InlineUniformBlockUninitializedUpdateAfterBind) { descriptor_writes.dstBinding = 1; descriptor_writes.dstArrayElement = 0; descriptor_writes.descriptorCount = 4; - descriptor_writes.descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT; + descriptor_writes.descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK; vk::UpdateDescriptorSets(device(), 1, &descriptor_writes, 0, nullptr); m_default_queue->Submit(m_command_buffer); @@ -589,7 +589,7 @@ TEST_F(PositiveGpuAV, SetSSBOPushDescriptor) { OneOffDescriptorSet descriptor_set_0(m_device, {{0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_COMPUTE_BIT, nullptr}, {1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_COMPUTE_BIT, nullptr}}, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT); const vkt::PipelineLayout pipeline_layout(*m_device, {&descriptor_set_0.layout_}); VkComputePipelineCreateInfo pipeline_info = vku::InitStructHelper(); @@ -869,10 +869,10 @@ TEST_F(PositiveGpuAV, BindingPartiallyBound) { InitRenderTarget(); VkDescriptorBindingFlagsEXT ds_binding_flags[2] = {}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT layout_createinfo_binding_flags = vku::InitStructHelper(); + VkDescriptorSetLayoutBindingFlagsCreateInfo layout_createinfo_binding_flags = vku::InitStructHelper(); ds_binding_flags[0] = 0; // No Error - ds_binding_flags[1] = VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT; + ds_binding_flags[1] = VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT; // Uncomment for Error // ds_binding_flags[1] = 0; @@ -1209,8 +1209,8 @@ TEST_F(PositiveGpuAV, AliasImageBindingPartiallyBound) { } )glsl"; - VkDescriptorBindingFlagsEXT ds_binding_flags[2] = {VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT, 0}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT ds_layout_binding_flags = vku::InitStructHelper(); + VkDescriptorBindingFlagsEXT ds_binding_flags[2] = {VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT, 0}; + VkDescriptorSetLayoutBindingFlagsCreateInfo ds_layout_binding_flags = vku::InitStructHelper(); ds_layout_binding_flags.bindingCount = 2; ds_layout_binding_flags.pBindingFlags = ds_binding_flags; @@ -1345,8 +1345,8 @@ TEST_F(PositiveGpuAV, AliasImageMultisample) { } )glsl"; - VkDescriptorBindingFlagsEXT ds_binding_flags[3] = {VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT, 0, 0}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT ds_layout_binding_flags = vku::InitStructHelper(); + VkDescriptorBindingFlagsEXT ds_binding_flags[3] = {VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT, 0, 0}; + VkDescriptorSetLayoutBindingFlagsCreateInfo ds_layout_binding_flags = vku::InitStructHelper(); ds_layout_binding_flags.bindingCount = 3; ds_layout_binding_flags.pBindingFlags = ds_binding_flags; @@ -1499,8 +1499,8 @@ TEST_F(PositiveGpuAV, AliasImageMultisampleDescriptorSetsPartiallyBound) { image_ci.samples = VK_SAMPLE_COUNT_4_BIT; vkt::Image ms_image(*m_device, image_ci, vkt::set_layout); vkt::ImageView ms_image_view = ms_image.CreateView(); - VkDescriptorBindingFlagsEXT ds_binding_flags[3] = {VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT, 0, 0}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT ds_layout_binding_flags = vku::InitStructHelper(); + VkDescriptorBindingFlagsEXT ds_binding_flags[3] = {VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT, 0, 0}; + VkDescriptorSetLayoutBindingFlagsCreateInfo ds_layout_binding_flags = vku::InitStructHelper(); ds_layout_binding_flags.bindingCount = 3; ds_layout_binding_flags.pBindingFlags = ds_binding_flags; OneOffDescriptorSet descriptor_set0(m_device, @@ -1599,8 +1599,8 @@ TEST_F(PositiveGpuAV, AliasImageMultisampleDispatches) { vkt::Image ms_image(*m_device, image_ci, vkt::set_layout); vkt::ImageView ms_image_view = ms_image.CreateView(); - VkDescriptorBindingFlagsEXT ds_binding_flags[3] = {VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT, 0, 0}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT ds_layout_binding_flags = vku::InitStructHelper(); + VkDescriptorBindingFlagsEXT ds_binding_flags[3] = {VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT, 0, 0}; + VkDescriptorSetLayoutBindingFlagsCreateInfo ds_layout_binding_flags = vku::InitStructHelper(); ds_layout_binding_flags.bindingCount = 3; ds_layout_binding_flags.pBindingFlags = ds_binding_flags; @@ -2487,7 +2487,7 @@ TEST_F(PositiveGpuAV, DISABLED_DeviceGeneratedCommandsIES) { } )glsl"; - VkPipelineCreateFlags2CreateInfoKHR pipe_flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo pipe_flags2 = vku::InitStructHelper(); pipe_flags2.flags = VK_PIPELINE_CREATE_2_INDIRECT_BINDABLE_BIT_EXT; CreateComputePipelineHelper init_pipe(*this, &pipe_flags2); init_pipe.dsl_bindings_ = {{0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}}; @@ -2534,7 +2534,7 @@ TEST_F(PositiveGpuAV, DISABLED_DeviceGeneratedCommandsIES) { pre_process_size = mem_reqs2.memoryRequirements.size; } - VkBufferUsageFlags2CreateInfoKHR buffer_usage_flags = vku::InitStructHelper(); + VkBufferUsageFlags2CreateInfo buffer_usage_flags = vku::InitStructHelper(); buffer_usage_flags.usage = VK_BUFFER_USAGE_2_PREPROCESS_BUFFER_BIT_EXT | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT; VkBufferCreateInfo buffer_ci = vku::InitStructHelper(&buffer_usage_flags); buffer_ci.size = pre_process_size; @@ -2599,8 +2599,8 @@ TEST_F(PositiveGpuAV, NonMultisampleMismatchWithPipeline) { buffer_ptr[0] = 1; buffer.Memory().Unmap(); - VkDescriptorBindingFlagsEXT ds_binding_flags[2] = {VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT, 0}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT ds_layout_binding_flags = vku::InitStructHelper(); + VkDescriptorBindingFlagsEXT ds_binding_flags[2] = {VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT, 0}; + VkDescriptorSetLayoutBindingFlagsCreateInfo ds_layout_binding_flags = vku::InitStructHelper(); ds_layout_binding_flags.bindingCount = 2; ds_layout_binding_flags.pBindingFlags = ds_binding_flags; diff --git a/tests/unit/gpu_av_ray_tracing.cpp b/tests/unit/gpu_av_ray_tracing.cpp index 995bce71e24..3dd3c3eb5c8 100644 --- a/tests/unit/gpu_av_ray_tracing.cpp +++ b/tests/unit/gpu_av_ray_tracing.cpp @@ -92,7 +92,7 @@ TEST_F(NegativeGpuAVRayTracing, DISABLED_CmdTraceRaysIndirectKHR) { vk::GetBufferMemoryRequirements(device(), sbt_buffer.handle(), &mem_reqs); VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; VkMemoryAllocateInfo alloc_info = vku::InitStructHelper(&alloc_flags); alloc_info.allocationSize = 4096; vkt::DeviceMemory mem(*m_device, alloc_info); diff --git a/tests/unit/graphics_library.cpp b/tests/unit/graphics_library.cpp index 1bfa00f8029..76d3e48e905 100644 --- a/tests/unit/graphics_library.cpp +++ b/tests/unit/graphics_library.cpp @@ -2355,7 +2355,7 @@ TEST_F(NegativeGraphicsLibrary, DescriptorSetLayoutCreateFlags) { InitRenderTarget(); VkDescriptorBindingFlagsEXT flags[1] = {VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT flags_create_info = vku::InitStructHelper(); + VkDescriptorSetLayoutBindingFlagsCreateInfo flags_create_info = vku::InitStructHelper(); flags_create_info.bindingCount = 1; flags_create_info.pBindingFlags = flags; @@ -2367,7 +2367,7 @@ TEST_F(NegativeGraphicsLibrary, DescriptorSetLayoutCreateFlags) { {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_GEOMETRY_BIT, nullptr}, }, VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &flags_create_info, - VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); vkt::PipelineLayout pipeline_layout_vs(*m_device, {&ds.layout_}); vkt::PipelineLayout pipeline_layout_fs(*m_device, {&ds2.layout_}); diff --git a/tests/unit/graphics_library_positive.cpp b/tests/unit/graphics_library_positive.cpp index e42a6d1e53b..a45a6e4208b 100644 --- a/tests/unit/graphics_library_positive.cpp +++ b/tests/unit/graphics_library_positive.cpp @@ -327,10 +327,10 @@ TEST_F(PositiveGraphicsLibrary, VertexAttributeDivisorInstanceRateZero) { InitRenderTarget(); - VkVertexInputBindingDivisorDescriptionEXT divisor_description = {}; + VkVertexInputBindingDivisorDescription divisor_description = {}; divisor_description.binding = 0; divisor_description.divisor = 0; - VkPipelineVertexInputDivisorStateCreateInfoEXT divisor_state_create_info = vku::InitStructHelper(); + VkPipelineVertexInputDivisorStateCreateInfo divisor_state_create_info = vku::InitStructHelper(); divisor_state_create_info.vertexBindingDivisorCount = 1; divisor_state_create_info.pVertexBindingDivisors = &divisor_description; VkVertexInputBindingDescription vertex_input_binding_description = {divisor_description.binding, 12, @@ -1024,7 +1024,7 @@ TEST_F(PositiveGraphicsLibrary, GPLDynamicRenderingWithDepthDraw) { depth_attachment.imageView = depth_stencil_view.handle(); depth_attachment.imageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; begin_rendering_info.layerCount = 1; @@ -1121,7 +1121,7 @@ TEST_F(PositiveGraphicsLibrary, DepthState) { pr_lib.InitPreRasterLibInfo(&vs_stage.stage_ci); pr_lib.rs_state_ci_.rasterizerDiscardEnable = VK_TRUE; // This should get ignored due to its state being set as dynamic - pr_lib.AddDynamicState(VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE_EXT); + pr_lib.AddDynamicState(VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE); pr_lib.gp_ci_.layout = fs_lib.gp_ci_.layout; pr_lib.CreateGraphicsPipeline(false); } diff --git a/tests/unit/host_image_copy.cpp b/tests/unit/host_image_copy.cpp index e3f63f8140d..89a586432c1 100644 --- a/tests/unit/host_image_copy.cpp +++ b/tests/unit/host_image_copy.cpp @@ -25,23 +25,23 @@ TEST_F(NegativeHostImageCopy, ImageLayout) { std::vector pixels(width * height * 4); - VkMemoryToImageCopyEXT region_to_image = vku::InitStructHelper(); + VkMemoryToImageCopy region_to_image = vku::InitStructHelper(); region_to_image.pHostPointer = pixels.data(); region_to_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_to_image.imageExtent = {width, height, 1}; - VkCopyMemoryToImageInfoEXT copy_to_image = vku::InitStructHelper(); + VkCopyMemoryToImageInfo copy_to_image = vku::InitStructHelper(); copy_to_image.dstImage = image; copy_to_image.dstImageLayout = VK_IMAGE_LAYOUT_GENERAL; copy_to_image.regionCount = 1; copy_to_image.pRegions = ®ion_to_image; - VkImageToMemoryCopyEXT region_from_image = vku::InitStructHelper(); + VkImageToMemoryCopy region_from_image = vku::InitStructHelper(); region_from_image.pHostPointer = pixels.data(); region_from_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_from_image.imageExtent = {width, height, 1}; - VkCopyImageToMemoryInfoEXT copy_from_image = vku::InitStructHelper(); + VkCopyImageToMemoryInfo copy_from_image = vku::InitStructHelper(); copy_from_image.srcImage = image; copy_from_image.srcImageLayout = VK_IMAGE_LAYOUT_GENERAL; copy_from_image.regionCount = 1; @@ -71,23 +71,23 @@ TEST_F(NegativeHostImageCopy, TransferUsageFlag) { std::vector pixels(width * height * 4); - VkMemoryToImageCopyEXT region_to_image = vku::InitStructHelper(); + VkMemoryToImageCopy region_to_image = vku::InitStructHelper(); region_to_image.pHostPointer = pixels.data(); region_to_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_to_image.imageExtent = {width, height, 1}; - VkCopyMemoryToImageInfoEXT copy_to_image = vku::InitStructHelper(); + VkCopyMemoryToImageInfo copy_to_image = vku::InitStructHelper(); copy_to_image.dstImage = image; copy_to_image.dstImageLayout = layout; copy_to_image.regionCount = 1; copy_to_image.pRegions = ®ion_to_image; - VkImageToMemoryCopyEXT region_from_image = vku::InitStructHelper(); + VkImageToMemoryCopy region_from_image = vku::InitStructHelper(); region_from_image.pHostPointer = pixels.data(); region_from_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_from_image.imageExtent = {width, height, 1}; - VkCopyImageToMemoryInfoEXT copy_from_image = vku::InitStructHelper(); + VkCopyImageToMemoryInfo copy_from_image = vku::InitStructHelper(); copy_from_image.srcImage = image; copy_from_image.srcImageLayout = layout; copy_from_image.regionCount = 1; @@ -113,30 +113,30 @@ TEST_F(NegativeHostImageCopy, ImageOffset) { std::vector pixels(width * height * 4); - VkMemoryToImageCopyEXT region_to_image = vku::InitStructHelper(); + VkMemoryToImageCopy region_to_image = vku::InitStructHelper(); region_to_image.pHostPointer = pixels.data(); region_to_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_to_image.imageExtent = {width, height, 1}; - VkCopyMemoryToImageInfoEXT copy_to_image = vku::InitStructHelper(); + VkCopyMemoryToImageInfo copy_to_image = vku::InitStructHelper(); copy_to_image.dstImage = image; copy_to_image.dstImageLayout = layout; copy_to_image.regionCount = 1; copy_to_image.pRegions = ®ion_to_image; - VkImageToMemoryCopyEXT region_from_image = vku::InitStructHelper(); + VkImageToMemoryCopy region_from_image = vku::InitStructHelper(); region_from_image.pHostPointer = pixels.data(); region_from_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_from_image.imageExtent = {width, height, 1}; - VkCopyImageToMemoryInfoEXT copy_from_image = vku::InitStructHelper(); + VkCopyImageToMemoryInfo copy_from_image = vku::InitStructHelper(); copy_from_image.srcImage = image; copy_from_image.srcImageLayout = layout; copy_from_image.regionCount = 1; copy_from_image.pRegions = ®ion_from_image; // Memcpy with imageOffset x, y, or z == 0 - copy_to_image.flags = VK_HOST_IMAGE_COPY_MEMCPY_EXT; + copy_to_image.flags = VK_HOST_IMAGE_COPY_MEMCPY; region_to_image.imageOffset.x = 1; // If ImageExtent.width is left at width, offset will exceed width of image (07971). Setting it to width-1 will not match // image dimensions (09115). Pick the one with MEMCPY flag set and test for both here. @@ -146,7 +146,7 @@ TEST_F(NegativeHostImageCopy, ImageOffset) { vk::CopyMemoryToImageEXT(*m_device, ©_to_image); m_errorMonitor->VerifyFound(); - copy_from_image.flags = VK_HOST_IMAGE_COPY_MEMCPY_EXT; + copy_from_image.flags = VK_HOST_IMAGE_COPY_MEMCPY; region_from_image.imageOffset.x = 1; region_from_image.imageExtent.width = width - 1; m_errorMonitor->SetDesiredError("VUID-VkCopyImageToMemoryInfo-imageOffset-09114"); @@ -164,23 +164,23 @@ TEST_F(NegativeHostImageCopy, AspectMask) { std::vector pixels(width * height * 4); - VkMemoryToImageCopyEXT region_to_image = vku::InitStructHelper(); + VkMemoryToImageCopy region_to_image = vku::InitStructHelper(); region_to_image.pHostPointer = pixels.data(); region_to_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_to_image.imageExtent = {width, height, 1}; - VkCopyMemoryToImageInfoEXT copy_to_image = vku::InitStructHelper(); + VkCopyMemoryToImageInfo copy_to_image = vku::InitStructHelper(); copy_to_image.dstImage = image; copy_to_image.dstImageLayout = layout; copy_to_image.regionCount = 1; copy_to_image.pRegions = ®ion_to_image; - VkImageToMemoryCopyEXT region_from_image = vku::InitStructHelper(); + VkImageToMemoryCopy region_from_image = vku::InitStructHelper(); region_from_image.pHostPointer = pixels.data(); region_from_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_from_image.imageExtent = {width, height, 1}; - VkCopyImageToMemoryInfoEXT copy_from_image = vku::InitStructHelper(); + VkCopyImageToMemoryInfo copy_from_image = vku::InitStructHelper(); copy_from_image.srcImage = image; copy_from_image.srcImageLayout = layout; copy_from_image.regionCount = 1; @@ -206,23 +206,23 @@ TEST_F(NegativeHostImageCopy, CopyImageToFromMemoryNoMemory) { std::vector pixels(width * height * 4); - VkMemoryToImageCopyEXT region_to_image = vku::InitStructHelper(); + VkMemoryToImageCopy region_to_image = vku::InitStructHelper(); region_to_image.pHostPointer = pixels.data(); region_to_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_to_image.imageExtent = {width, height, 1}; - VkCopyMemoryToImageInfoEXT copy_to_image = vku::InitStructHelper(); + VkCopyMemoryToImageInfo copy_to_image = vku::InitStructHelper(); copy_to_image.dstImage = image; copy_to_image.dstImageLayout = layout; copy_to_image.regionCount = 1; copy_to_image.pRegions = ®ion_to_image; - VkImageToMemoryCopyEXT region_from_image = vku::InitStructHelper(); + VkImageToMemoryCopy region_from_image = vku::InitStructHelper(); region_from_image.pHostPointer = pixels.data(); region_from_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_from_image.imageExtent = {width, height, 1}; - VkCopyImageToMemoryInfoEXT copy_from_image = vku::InitStructHelper(); + VkCopyImageToMemoryInfo copy_from_image = vku::InitStructHelper(); copy_from_image.srcImage = image; copy_from_image.srcImageLayout = layout; copy_from_image.regionCount = 1; @@ -249,23 +249,23 @@ TEST_F(NegativeHostImageCopy, ImageSubresource) { std::vector pixels(width * height * 4); - VkMemoryToImageCopyEXT region_to_image = vku::InitStructHelper(); + VkMemoryToImageCopy region_to_image = vku::InitStructHelper(); region_to_image.pHostPointer = pixels.data(); region_to_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_to_image.imageExtent = {width, height, 1}; - VkCopyMemoryToImageInfoEXT copy_to_image = vku::InitStructHelper(); + VkCopyMemoryToImageInfo copy_to_image = vku::InitStructHelper(); copy_to_image.dstImage = image; copy_to_image.dstImageLayout = layout; copy_to_image.regionCount = 1; copy_to_image.pRegions = ®ion_to_image; - VkImageToMemoryCopyEXT region_from_image = vku::InitStructHelper(); + VkImageToMemoryCopy region_from_image = vku::InitStructHelper(); region_from_image.pHostPointer = pixels.data(); region_from_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_from_image.imageExtent = {width, height, 1}; - VkCopyImageToMemoryInfoEXT copy_from_image = vku::InitStructHelper(); + VkCopyImageToMemoryInfo copy_from_image = vku::InitStructHelper(); copy_from_image.srcImage = image; copy_from_image.srcImageLayout = layout; copy_from_image.regionCount = 1; @@ -344,23 +344,23 @@ TEST_F(NegativeHostImageCopy, ImageExtent) { std::vector pixels(width * height * 4); - VkMemoryToImageCopyEXT region_to_image = vku::InitStructHelper(); + VkMemoryToImageCopy region_to_image = vku::InitStructHelper(); region_to_image.pHostPointer = pixels.data(); region_to_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_to_image.imageExtent = {width, height, 1}; - VkCopyMemoryToImageInfoEXT copy_to_image = vku::InitStructHelper(); + VkCopyMemoryToImageInfo copy_to_image = vku::InitStructHelper(); copy_to_image.dstImage = image; copy_to_image.dstImageLayout = layout; copy_to_image.regionCount = 1; copy_to_image.pRegions = ®ion_to_image; - VkImageToMemoryCopyEXT region_from_image = vku::InitStructHelper(); + VkImageToMemoryCopy region_from_image = vku::InitStructHelper(); region_from_image.pHostPointer = pixels.data(); region_from_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_from_image.imageExtent = {width, height, 1}; - VkCopyImageToMemoryInfoEXT copy_from_image = vku::InitStructHelper(); + VkCopyImageToMemoryInfo copy_from_image = vku::InitStructHelper(); copy_from_image.srcImage = image; copy_from_image.srcImageLayout = layout; copy_from_image.regionCount = 1; @@ -422,23 +422,23 @@ TEST_F(NegativeHostImageCopy, Image1D) { std::vector pixels(width * height * 4); - VkMemoryToImageCopyEXT region_to_image = vku::InitStructHelper(); + VkMemoryToImageCopy region_to_image = vku::InitStructHelper(); region_to_image.pHostPointer = pixels.data(); region_to_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_to_image.imageExtent = {width, height, 1}; - VkCopyMemoryToImageInfoEXT copy_to_image = vku::InitStructHelper(); + VkCopyMemoryToImageInfo copy_to_image = vku::InitStructHelper(); copy_to_image.dstImage = image; copy_to_image.dstImageLayout = layout; copy_to_image.regionCount = 1; copy_to_image.pRegions = ®ion_to_image; - VkImageToMemoryCopyEXT region_from_image = vku::InitStructHelper(); + VkImageToMemoryCopy region_from_image = vku::InitStructHelper(); region_from_image.pHostPointer = pixels.data(); region_from_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_from_image.imageExtent = {width, height, 1}; - VkCopyImageToMemoryInfoEXT copy_from_image = vku::InitStructHelper(); + VkCopyImageToMemoryInfo copy_from_image = vku::InitStructHelper(); copy_from_image.srcImage = image; copy_from_image.srcImageLayout = layout; copy_from_image.regionCount = 1; @@ -506,23 +506,23 @@ TEST_F(NegativeHostImageCopy, Image1DMultiSampled) { std::vector pixels(width * height * 4); - VkMemoryToImageCopyEXT region_to_image = vku::InitStructHelper(); + VkMemoryToImageCopy region_to_image = vku::InitStructHelper(); region_to_image.pHostPointer = pixels.data(); region_to_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_to_image.imageExtent = {width, height, 1}; - VkCopyMemoryToImageInfoEXT copy_to_image = vku::InitStructHelper(); + VkCopyMemoryToImageInfo copy_to_image = vku::InitStructHelper(); copy_to_image.dstImage = image; copy_to_image.dstImageLayout = layout; copy_to_image.regionCount = 1; copy_to_image.pRegions = ®ion_to_image; - VkImageToMemoryCopyEXT region_from_image = vku::InitStructHelper(); + VkImageToMemoryCopy region_from_image = vku::InitStructHelper(); region_from_image.pHostPointer = pixels.data(); region_from_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_from_image.imageExtent = {width, height, 1}; - VkCopyImageToMemoryInfoEXT copy_from_image = vku::InitStructHelper(); + VkCopyImageToMemoryInfo copy_from_image = vku::InitStructHelper(); copy_from_image.srcImage = image; copy_from_image.srcImageLayout = layout; copy_from_image.regionCount = 1; @@ -570,23 +570,23 @@ TEST_F(NegativeHostImageCopy, CompressedFormat) { std::vector pixels(width * height * 4); - VkMemoryToImageCopyEXT region_to_image = vku::InitStructHelper(); + VkMemoryToImageCopy region_to_image = vku::InitStructHelper(); region_to_image.pHostPointer = pixels.data(); region_to_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_to_image.imageExtent = {width, height, 1}; - VkCopyMemoryToImageInfoEXT copy_to_image = vku::InitStructHelper(); + VkCopyMemoryToImageInfo copy_to_image = vku::InitStructHelper(); copy_to_image.dstImage = image; copy_to_image.dstImageLayout = layout; copy_to_image.regionCount = 1; copy_to_image.pRegions = ®ion_to_image; - VkImageToMemoryCopyEXT region_from_image = vku::InitStructHelper(); + VkImageToMemoryCopy region_from_image = vku::InitStructHelper(); region_from_image.pHostPointer = pixels.data(); region_from_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_from_image.imageExtent = {width, height, 1}; - VkCopyImageToMemoryInfoEXT copy_from_image = vku::InitStructHelper(); + VkCopyImageToMemoryInfo copy_from_image = vku::InitStructHelper(); copy_from_image.srcImage = image; copy_from_image.srcImageLayout = layout; copy_from_image.regionCount = 1; @@ -689,7 +689,7 @@ TEST_F(NegativeHostImageCopy, DepthStencil) { } auto stencil_format = FindSupportedDepthStencilFormat(Gpu()); - if (!(m_device->FormatFeaturesOptimal(stencil_format) & VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT_EXT)) { + if (!(m_device->FormatFeaturesOptimal(stencil_format) & VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT)) { GTEST_SKIP() << "Device does not support host image on depth format"; } @@ -699,23 +699,23 @@ TEST_F(NegativeHostImageCopy, DepthStencil) { std::vector pixels(width * height * 4); - VkMemoryToImageCopyEXT region_to_image = vku::InitStructHelper(); + VkMemoryToImageCopy region_to_image = vku::InitStructHelper(); region_to_image.pHostPointer = pixels.data(); region_to_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_to_image.imageExtent = {width, height, 1}; - VkCopyMemoryToImageInfoEXT copy_to_image = vku::InitStructHelper(); + VkCopyMemoryToImageInfo copy_to_image = vku::InitStructHelper(); copy_to_image.dstImage = image; copy_to_image.dstImageLayout = layout; copy_to_image.regionCount = 1; copy_to_image.pRegions = ®ion_to_image; - VkImageToMemoryCopyEXT region_from_image = vku::InitStructHelper(); + VkImageToMemoryCopy region_from_image = vku::InitStructHelper(); region_from_image.pHostPointer = pixels.data(); region_from_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_from_image.imageExtent = {width, height, 1}; - VkCopyImageToMemoryInfoEXT copy_from_image = vku::InitStructHelper(); + VkCopyImageToMemoryInfo copy_from_image = vku::InitStructHelper(); copy_from_image.srcImage = image; copy_from_image.srcImageLayout = layout; copy_from_image.regionCount = 1; @@ -727,7 +727,7 @@ TEST_F(NegativeHostImageCopy, DepthStencil) { image_stencil.SetLayout((VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_DEPTH_BIT), VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL); - // Stencil, no VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT + // Stencil, no VK_IMAGE_USAGE_HOST_TRANSFER_BIT region_to_image.imageSubresource.aspectMask = VK_IMAGE_ASPECT_STENCIL_BIT; copy_to_image.dstImage = image_stencil; copy_to_image.dstImageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL; @@ -748,7 +748,7 @@ TEST_F(NegativeHostImageCopy, DepthStencil) { image_separate_stencil.SetLayout((VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_DEPTH_BIT), VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL); - // Seperate stencil, no VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT + // Seperate stencil, no VK_IMAGE_USAGE_HOST_TRANSFER_BIT region_to_image.imageSubresource.aspectMask = VK_IMAGE_ASPECT_STENCIL_BIT; copy_to_image.dstImage = image_separate_stencil; m_errorMonitor->SetDesiredError("VUID-VkCopyMemoryToImageInfo-dstImage-09112"); @@ -763,11 +763,11 @@ TEST_F(NegativeHostImageCopy, DepthStencil) { VkImageFormatProperties img_prop = {}; if (VK_SUCCESS == vk::GetPhysicalDeviceImageFormatProperties( m_device->Physical().handle(), stencil_format, image_ci.imageType, image_ci.tiling, - VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT, image_ci.flags, + VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_IMAGE_USAGE_HOST_TRANSFER_BIT, image_ci.flags, &img_prop)) { // The aspectMask member of imageSubresource must only have a single bit set image_ci.format = stencil_format; - image_ci.usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT; + image_ci.usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_IMAGE_USAGE_HOST_TRANSFER_BIT; image_ci.pNext = nullptr; vkt::Image image_stencil2(*m_device, image_ci, vkt::set_layout); image_stencil2.SetLayout((VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_DEPTH_BIT), @@ -794,23 +794,23 @@ TEST_F(NegativeHostImageCopy, MultiPlanar) { std::vector pixels(width * height * 4); - VkMemoryToImageCopyEXT region_to_image = vku::InitStructHelper(); + VkMemoryToImageCopy region_to_image = vku::InitStructHelper(); region_to_image.pHostPointer = pixels.data(); region_to_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_to_image.imageExtent = {width, height, 1}; - VkCopyMemoryToImageInfoEXT copy_to_image = vku::InitStructHelper(); + VkCopyMemoryToImageInfo copy_to_image = vku::InitStructHelper(); copy_to_image.dstImage = image; copy_to_image.dstImageLayout = layout; copy_to_image.regionCount = 1; copy_to_image.pRegions = ®ion_to_image; - VkImageToMemoryCopyEXT region_from_image = vku::InitStructHelper(); + VkImageToMemoryCopy region_from_image = vku::InitStructHelper(); region_from_image.pHostPointer = pixels.data(); region_from_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_from_image.imageExtent = {width, height, 1}; - VkCopyImageToMemoryInfoEXT copy_from_image = vku::InitStructHelper(); + VkCopyImageToMemoryInfo copy_from_image = vku::InitStructHelper(); copy_from_image.srcImage = image; copy_from_image.srcImageLayout = layout; copy_from_image.regionCount = 1; @@ -819,11 +819,11 @@ TEST_F(NegativeHostImageCopy, MultiPlanar) { VkImageFormatProperties img_prop = {}; if (VK_SUCCESS == vk::GetPhysicalDeviceImageFormatProperties( m_device->Physical().handle(), VK_FORMAT_G8_B8R8_2PLANE_420_UNORM, VK_IMAGE_TYPE_2D, - VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, 0, + VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_HOST_TRANSFER_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, 0, &img_prop)) { // imageSubresource.aspectMask must be VK_IMAGE_ASPECT_PLANE_0_BIT or VK_IMAGE_ASPECT_PLANE_1_BIT vkt::Image image_multi_planar2(*m_device, 128, 128, 1, VK_FORMAT_G8_B8R8_2PLANE_420_UNORM, - VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); + VK_IMAGE_USAGE_HOST_TRANSFER_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); image_multi_planar2.SetLayout(VK_IMAGE_ASPECT_COLOR_BIT, layout); region_to_image.imageSubresource.aspectMask = VK_IMAGE_ASPECT_PLANE_2_BIT; copy_to_image.dstImage = image_multi_planar2; @@ -839,12 +839,12 @@ TEST_F(NegativeHostImageCopy, MultiPlanar) { if (VK_SUCCESS == vk::GetPhysicalDeviceImageFormatProperties( m_device->Physical().handle(), VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM, VK_IMAGE_TYPE_2D, - VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, 0, + VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_HOST_TRANSFER_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, 0, &img_prop)) { // imageSubresource.aspectMask must be VK_IMAGE_ASPECT_PLANE_0_BIT, VK_IMAGE_ASPECT_PLANE_1_BIT, or // VK_IMAGE_ASPECT_PLANE_2_BIT vkt::Image image_multi_planar3(*m_device, 128, 128, 1, VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM, - VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); + VK_IMAGE_USAGE_HOST_TRANSFER_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); image_multi_planar3.SetLayout(VK_IMAGE_ASPECT_COLOR_BIT, layout); region_to_image.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; copy_to_image.dstImage = image_multi_planar3; @@ -872,23 +872,23 @@ TEST_F(NegativeHostImageCopy, NonSupportedLayout) { std::vector pixels(width * height * 4); - VkMemoryToImageCopyEXT region_to_image = vku::InitStructHelper(); + VkMemoryToImageCopy region_to_image = vku::InitStructHelper(); region_to_image.pHostPointer = pixels.data(); region_to_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_to_image.imageExtent = {width, height, 1}; - VkCopyMemoryToImageInfoEXT copy_to_image = vku::InitStructHelper(); + VkCopyMemoryToImageInfo copy_to_image = vku::InitStructHelper(); copy_to_image.dstImage = image; copy_to_image.dstImageLayout = layout; copy_to_image.regionCount = 1; copy_to_image.pRegions = ®ion_to_image; - VkImageToMemoryCopyEXT region_from_image = vku::InitStructHelper(); + VkImageToMemoryCopy region_from_image = vku::InitStructHelper(); region_from_image.pHostPointer = pixels.data(); region_from_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_from_image.imageExtent = {width, height, 1}; - VkCopyImageToMemoryInfoEXT copy_from_image = vku::InitStructHelper(); + VkCopyImageToMemoryInfo copy_from_image = vku::InitStructHelper(); copy_from_image.srcImage = image; copy_from_image.srcImageLayout = layout; copy_from_image.regionCount = 1; @@ -918,23 +918,23 @@ TEST_F(NegativeHostImageCopy, ImageExtent2) { std::vector pixels(width * height * 4); - VkMemoryToImageCopyEXT region_to_image = vku::InitStructHelper(); + VkMemoryToImageCopy region_to_image = vku::InitStructHelper(); region_to_image.pHostPointer = pixels.data(); region_to_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_to_image.imageExtent = {width, height, 1}; - VkCopyMemoryToImageInfoEXT copy_to_image = vku::InitStructHelper(); + VkCopyMemoryToImageInfo copy_to_image = vku::InitStructHelper(); copy_to_image.dstImage = image; copy_to_image.dstImageLayout = layout; copy_to_image.regionCount = 1; copy_to_image.pRegions = ®ion_to_image; - VkImageToMemoryCopyEXT region_from_image = vku::InitStructHelper(); + VkImageToMemoryCopy region_from_image = vku::InitStructHelper(); region_from_image.pHostPointer = pixels.data(); region_from_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_from_image.imageExtent = {width, height, 1}; - VkCopyImageToMemoryInfoEXT copy_from_image = vku::InitStructHelper(); + VkCopyImageToMemoryInfo copy_from_image = vku::InitStructHelper(); copy_from_image.srcImage = image; copy_from_image.srcImageLayout = layout; copy_from_image.regionCount = 1; @@ -988,14 +988,14 @@ TEST_F(NegativeHostImageCopy, ImageExtent2) { region_to_image.imageExtent.height = height; region_from_image.imageExtent.height = height; - // When VK_HOST_IMAGE_COPY_MEMCPY_EXT is in flags, memoryRowLength and memoryImageHeight must be zero + // When VK_HOST_IMAGE_COPY_MEMCPY is in flags, memoryRowLength and memoryImageHeight must be zero region_to_image.memoryRowLength = width; - copy_to_image.flags = VK_HOST_IMAGE_COPY_MEMCPY_EXT; + copy_to_image.flags = VK_HOST_IMAGE_COPY_MEMCPY; m_errorMonitor->SetDesiredError("VUID-VkCopyMemoryToImageInfo-flags-09393"); vk::CopyMemoryToImageEXT(*m_device, ©_to_image); m_errorMonitor->VerifyFound(); region_from_image.memoryImageHeight = height; - copy_from_image.flags = VK_HOST_IMAGE_COPY_MEMCPY_EXT; + copy_from_image.flags = VK_HOST_IMAGE_COPY_MEMCPY; m_errorMonitor->SetDesiredError("VUID-VkCopyImageToMemoryInfo-flags-09394"); vk::CopyImageToMemoryEXT(*m_device, ©_from_image); m_errorMonitor->VerifyFound(); @@ -1004,12 +1004,12 @@ TEST_F(NegativeHostImageCopy, ImageExtent2) { TEST_F(NegativeHostImageCopy, CopyImageToImageFeature) { RETURN_IF_SKIP(InitHostImageCopyTest()); VkFormat no_hic_feature_format = - FindFormatWithoutFeatures2(Gpu(), image_ci.tiling, VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT_EXT); + FindFormatWithoutFeatures2(Gpu(), image_ci.tiling, VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT); if (no_hic_feature_format == VK_FORMAT_UNDEFINED) { GTEST_SKIP() << "Can't find format with no support"; } - // If VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT, then format features must have VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT_EXT + // If VK_IMAGE_USAGE_HOST_TRANSFER_BIT, then format features must have VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT image_ci.format = no_hic_feature_format; // Can't use vkt::Image because it does error checking VkImage image_no_feature; @@ -1037,7 +1037,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImageIdenticalCreateInfo) { image_copy_2.dstSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; image_copy_2.extent = {image_ci.extent.width, height, 1}; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -1060,7 +1060,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImageUsageFlagsStencil) { image_copy_2.srcSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; image_copy_2.dstSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; image_copy_2.extent = {width, height, 1}; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; @@ -1076,7 +1076,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImageUsageFlagsStencil) { image_stencil2.SetLayout((VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_DEPTH_BIT), VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL); - // Stencil, no VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT + // Stencil, no VK_IMAGE_USAGE_HOST_TRANSFER_BIT image_copy_2.srcSubresource.aspectMask = VK_IMAGE_ASPECT_STENCIL_BIT; copy_image_to_image.dstImage = image_stencil1; copy_image_to_image.dstImageLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL; @@ -1088,7 +1088,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImageUsageFlagsStencil) { vk::CopyImageToImageEXT(*m_device, ©_image_to_image); m_errorMonitor->VerifyFound(); - // Seperate stencil, no VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT + // Seperate stencil, no VK_IMAGE_USAGE_HOST_TRANSFER_BIT VkImageStencilUsageCreateInfo stencil_usage_ci = vku::InitStructHelper(); stencil_usage_ci.stencilUsage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; image_ci.pNext = &stencil_usage_ci; @@ -1125,7 +1125,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImageUsageFlagsNonStencil) { image_copy_2.dstSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; image_copy_2.extent = {width, height, 1}; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -1153,7 +1153,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImageOffset) { // image dimensions (09115). Pick the one with MEMCPY flag set (09115) and test for both here. image_copy_2.extent = {width = 1, height, 1}; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -1161,7 +1161,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImageOffset) { copy_image_to_image.dstImage = image1; copy_image_to_image.srcImage = image2; // Memcpy with imageOffset x, y, or z == 0 - copy_image_to_image.flags = VK_HOST_IMAGE_COPY_MEMCPY_EXT; + copy_image_to_image.flags = VK_HOST_IMAGE_COPY_MEMCPY; m_errorMonitor->SetDesiredError("VUID-VkCopyImageToImageInfo-dstOffset-09114"); m_errorMonitor->SetDesiredError("VUID-VkCopyImageToImageInfo-srcOffset-09114"); @@ -1182,7 +1182,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImageNoMemory) { image_copy_2.dstSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; image_copy_2.extent = {width, height, 1}; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -1214,7 +1214,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImageMipLevels) { image_copy_2.dstSubresource.mipLevel = image_ci.mipLevels + 1; image_copy_2.srcSubresource.mipLevel = image_ci.mipLevels + 1; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -1250,7 +1250,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImageLayers) { image_copy_2.srcSubresource.baseArrayLayer = image_ci.arrayLayers; image_copy_2.dstSubresource.baseArrayLayer = image_ci.arrayLayers; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -1276,7 +1276,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImageLargeExtent) { image_copy_2.dstSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; // Extent bigger than image - Can't get 07970 without getting 07971, 07972 or 09104, so test both 07971 and 07970 here image_copy_2.extent = {width + 1, height, 1}; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -1307,7 +1307,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImageOffsetSmall) { image_copy_2.srcOffset.y = -1; image_copy_2.dstOffset.y = -1; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -1340,7 +1340,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImagDepth) { image_copy_2.srcOffset.z = 1; image_copy_2.dstOffset.z = 1; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -1370,7 +1370,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImagDepthZero) { // extent.depth must not be 0 image_copy_2.extent = {width, height, 0}; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -1398,7 +1398,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImagDepthLayer) { image_copy_2.dstSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 1}; image_copy_2.extent = {width, height, 1}; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -1430,7 +1430,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImag1D) { image_copy_2.srcOffset.y = 1; image_copy_2.dstOffset.y = 1; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -1466,7 +1466,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImag1DDpeth) { image_copy_2.srcOffset.z = 1; image_copy_2.dstOffset.z = 1; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -1497,7 +1497,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImageAspectMask) { image_copy_2.srcSubresource = {VK_IMAGE_ASPECT_DEPTH_BIT, 0, 0, 1}; image_copy_2.dstSubresource = {VK_IMAGE_ASPECT_DEPTH_BIT, 0, 0, 1}; image_copy_2.extent = {width, height, 1}; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -1522,7 +1522,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImageAspectMask2) { image_copy_2.srcSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; image_copy_2.dstSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; image_copy_2.extent = {width, height, 1}; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -1565,7 +1565,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImagePlanar) { image_copy_2.srcSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; image_copy_2.dstSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; image_copy_2.extent = {width, height, 1}; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = layout; @@ -1573,13 +1573,13 @@ TEST_F(NegativeHostImageCopy, CopyImageToImagePlanar) { if (VK_SUCCESS == vk::GetPhysicalDeviceImageFormatProperties( m_device->Physical().handle(), VK_FORMAT_G8_B8R8_2PLANE_420_UNORM, VK_IMAGE_TYPE_2D, - VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, 0, + VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_HOST_TRANSFER_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, 0, &img_prop)) { // imageSubresource.aspectMask must be VK_IMAGE_ASPECT_PLANE_0_BIT or VK_IMAGE_ASPECT_PLANE_1_BIT vkt::Image image_multi_twoplane1(*m_device, 128, 128, 1, VK_FORMAT_G8_B8R8_2PLANE_420_UNORM, - VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); + VK_IMAGE_USAGE_HOST_TRANSFER_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::Image image_multi_twoplane2(*m_device, 128, 128, 1, VK_FORMAT_G8_B8R8_2PLANE_420_UNORM, - VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); + VK_IMAGE_USAGE_HOST_TRANSFER_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); image_multi_twoplane1.SetLayout(VK_IMAGE_ASPECT_COLOR_BIT, layout); image_multi_twoplane2.SetLayout(VK_IMAGE_ASPECT_COLOR_BIT, layout); image_copy_2.srcSubresource.aspectMask = VK_IMAGE_ASPECT_PLANE_2_BIT; @@ -1594,14 +1594,14 @@ TEST_F(NegativeHostImageCopy, CopyImageToImagePlanar) { if (VK_SUCCESS == vk::GetPhysicalDeviceImageFormatProperties( m_device->Physical().handle(), VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM, VK_IMAGE_TYPE_2D, - VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, 0, + VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_HOST_TRANSFER_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, 0, &img_prop)) { // imageSubresource.aspectMask must be VK_IMAGE_ASPECT_PLANE_0_BIT, VK_IMAGE_ASPECT_PLANE_1_BIT, or // VK_IMAGE_ASPECT_PLANE_2_BIT vkt::Image image_multi_threeplane1(*m_device, 128, 128, 1, VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM, - VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); + VK_IMAGE_USAGE_HOST_TRANSFER_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); vkt::Image image_multi_threeplane2(*m_device, 128, 128, 1, VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM, - VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); + VK_IMAGE_USAGE_HOST_TRANSFER_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); image_multi_threeplane1.SetLayout(VK_IMAGE_ASPECT_COLOR_BIT, layout); image_multi_threeplane2.SetLayout(VK_IMAGE_ASPECT_COLOR_BIT, layout); image_copy_2.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; @@ -1625,7 +1625,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImageLayout) { image_copy_2.srcSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; image_copy_2.dstSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; image_copy_2.extent = {width, height, 1}; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = VK_IMAGE_LAYOUT_GENERAL; @@ -1654,7 +1654,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImageProperties) { image_copy_2.srcSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; image_copy_2.dstSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; image_copy_2.extent = {width, height, 1}; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL; @@ -1680,7 +1680,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImageZeroExtent) { image_copy_2.dstSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; // Neither width not height can be zero image_copy_2.extent = {0, 0, 1}; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -1705,7 +1705,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImageZeroLayer) { image_copy_2.srcSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 0}; image_copy_2.dstSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; image_copy_2.extent = {width, height, 1}; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -1756,7 +1756,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImageCompressed) { image_copy_2.srcOffset = {1, 1, 0}; image_copy_2.extent = {1, 1, 1}; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -1801,23 +1801,23 @@ TEST_F(NegativeHostImageCopy, CopyImageToFromMemorySubsampled) { std::vector pixels(width * height * 4); - VkMemoryToImageCopyEXT region_to_image = vku::InitStructHelper(); + VkMemoryToImageCopy region_to_image = vku::InitStructHelper(); region_to_image.pHostPointer = pixels.data(); region_to_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_to_image.imageExtent = {width, height, 1}; - VkCopyMemoryToImageInfoEXT copy_to_image = vku::InitStructHelper(); + VkCopyMemoryToImageInfo copy_to_image = vku::InitStructHelper(); copy_to_image.dstImage = image; copy_to_image.dstImageLayout = VK_IMAGE_LAYOUT_GENERAL; copy_to_image.regionCount = 1; copy_to_image.pRegions = ®ion_to_image; - VkImageToMemoryCopyEXT region_from_image = vku::InitStructHelper(); + VkImageToMemoryCopy region_from_image = vku::InitStructHelper(); region_from_image.pHostPointer = pixels.data(); region_from_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_from_image.imageExtent = {width, height, 1}; - VkCopyImageToMemoryInfoEXT copy_from_image = vku::InitStructHelper(); + VkCopyImageToMemoryInfo copy_from_image = vku::InitStructHelper(); copy_from_image.srcImage = image; copy_from_image.srcImageLayout = VK_IMAGE_LAYOUT_GENERAL; copy_from_image.regionCount = 1; @@ -1855,7 +1855,7 @@ TEST_F(NegativeHostImageCopy, CopyImageToImageSubsampled) { image_subsampled1.SetLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); image_subsampled2.SetLayout(VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL); - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = layout; @@ -1875,7 +1875,7 @@ TEST_F(NegativeHostImageCopy, TransitionImageLayout) { vkt::Image image(*m_device, image_ci, vkt::set_layout); VkImageSubresourceRange range = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}; - VkHostImageLayoutTransitionInfoEXT transition_info = vku::InitStructHelper(); + VkHostImageLayoutTransitionInfo transition_info = vku::InitStructHelper(); transition_info.oldLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; transition_info.newLayout = VK_IMAGE_LAYOUT_GENERAL; transition_info.subresourceRange = range; @@ -1924,7 +1924,7 @@ TEST_F(NegativeHostImageCopy, TransitionImageLayoutNoMemory) { vkt::Image image(*m_device, image_ci, vkt::no_mem); VkImageSubresourceRange range = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}; - VkHostImageLayoutTransitionInfoEXT transition_info = vku::InitStructHelper(); + VkHostImageLayoutTransitionInfo transition_info = vku::InitStructHelper(); transition_info.oldLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; transition_info.newLayout = VK_IMAGE_LAYOUT_GENERAL; transition_info.subresourceRange = range; @@ -1939,7 +1939,7 @@ TEST_F(NegativeHostImageCopy, TransitionImageLayoutUsage) { RETURN_IF_SKIP(InitHostImageCopyTest()); VkImageSubresourceRange range = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}; - VkHostImageLayoutTransitionInfoEXT transition_info = vku::InitStructHelper(); + VkHostImageLayoutTransitionInfo transition_info = vku::InitStructHelper(); transition_info.oldLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; transition_info.newLayout = VK_IMAGE_LAYOUT_GENERAL; transition_info.subresourceRange = range; @@ -1960,13 +1960,13 @@ TEST_F(NegativeHostImageCopy, TransitionImageLayoutMultiPlanar) { VkImageFormatProperties img_prop = {}; if (VK_SUCCESS != vk::GetPhysicalDeviceImageFormatProperties( m_device->Physical().handle(), VK_FORMAT_G8_B8R8_2PLANE_420_UNORM, VK_IMAGE_TYPE_2D, - VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, + VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_HOST_TRANSFER_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, VK_IMAGE_CREATE_DISJOINT_BIT, &img_prop)) { GTEST_SKIP() << "Image Format Properties not supported"; } VkImageSubresourceRange range = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}; - VkHostImageLayoutTransitionInfoEXT transition_info = vku::InitStructHelper(); + VkHostImageLayoutTransitionInfo transition_info = vku::InitStructHelper(); transition_info.oldLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; transition_info.newLayout = VK_IMAGE_LAYOUT_GENERAL; transition_info.subresourceRange = range; @@ -1981,7 +1981,7 @@ TEST_F(NegativeHostImageCopy, TransitionImageLayoutMultiPlanar) { auto image_ci_multi_planar = vkt::Image::ImageCreateInfo2D(width, height, 1, 1, VK_FORMAT_G8_B8R8_2PLANE_420_UNORM, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT); // Need a multi planar, disjoint image - image_ci_multi_planar.usage = VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + image_ci_multi_planar.usage = VK_IMAGE_USAGE_HOST_TRANSFER_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; image_ci_multi_planar.flags = VK_IMAGE_CREATE_DISJOINT_BIT; vkt::Image image_multi_planar(*m_device, image_ci_multi_planar, vkt::no_mem); VkImagePlaneMemoryRequirementsInfo image_plane_req = vku::InitStructHelper(); @@ -2038,7 +2038,7 @@ TEST_F(NegativeHostImageCopy, TransitionImageLayoutNotSupported) { } VkImageSubresourceRange range = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}; - VkHostImageLayoutTransitionInfoEXT transition_info = vku::InitStructHelper(); + VkHostImageLayoutTransitionInfo transition_info = vku::InitStructHelper(); transition_info.oldLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; transition_info.newLayout = VK_IMAGE_LAYOUT_GENERAL; transition_info.subresourceRange = range; @@ -2072,20 +2072,20 @@ TEST_F(NegativeHostImageCopy, TransitionImageLayoutDepthStencil) { } auto stencil_format = FindSupportedDepthStencilFormat(Gpu()); - if (!(m_device->FormatFeaturesOptimal(stencil_format) & VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT_EXT)) { + if (!(m_device->FormatFeaturesOptimal(stencil_format) & VK_FORMAT_FEATURE_2_HOST_IMAGE_TRANSFER_BIT)) { GTEST_SKIP() << "Device does not support host image on depth format"; } VkImageFormatProperties img_prop = {}; if (VK_SUCCESS != vk::GetPhysicalDeviceImageFormatProperties( m_device->Physical().handle(), stencil_format, image_ci.imageType, image_ci.tiling, - VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT, image_ci.flags, + VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_IMAGE_USAGE_HOST_TRANSFER_BIT, image_ci.flags, &img_prop)) { GTEST_SKIP() << "Image Format Properties not supported"; } VkImageSubresourceRange range = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}; - VkHostImageLayoutTransitionInfoEXT transition_info = vku::InitStructHelper(); + VkHostImageLayoutTransitionInfo transition_info = vku::InitStructHelper(); transition_info.oldLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; transition_info.newLayout = VK_IMAGE_LAYOUT_GENERAL; transition_info.subresourceRange = range; @@ -2094,7 +2094,7 @@ TEST_F(NegativeHostImageCopy, TransitionImageLayoutDepthStencil) { transition_info.image = image; image_ci.format = stencil_format; - image_ci.usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT; + image_ci.usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT | VK_IMAGE_USAGE_HOST_TRANSFER_BIT; vkt::Image image_stencil(*m_device, image_ci, vkt::set_layout); image_stencil.SetLayout((VK_IMAGE_ASPECT_STENCIL_BIT | VK_IMAGE_ASPECT_DEPTH_BIT), VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL); @@ -2135,7 +2135,7 @@ TEST_F(NegativeHostImageCopy, Features) { AddRequiredExtensions(VK_EXT_HOST_IMAGE_COPY_EXTENSION_NAME); RETURN_IF_SKIP(Init()); m_errorMonitor->SetDesiredError("VUID-VkImageCreateInfo-usage-10245"); - image_ci = vkt::Image::ImageCreateInfo2D(32, 32, 1, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT); + image_ci = vkt::Image::ImageCreateInfo2D(32, 32, 1, 1, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_HOST_TRANSFER_BIT); vkt::Image image(*m_device, image_ci); m_errorMonitor->VerifyFound(); } @@ -2151,7 +2151,7 @@ TEST_F(NegativeHostImageCopy, ImageMemoryOverlap) { VkDeviceAddress *data = (VkDeviceAddress *)image.Memory().Map(); - VkImageToMemoryCopyEXT region = vku::InitStructHelper(); + VkImageToMemoryCopy region = vku::InitStructHelper(); region.pHostPointer = data; region.memoryRowLength = 0; region.memoryImageHeight = 0; @@ -2159,7 +2159,7 @@ TEST_F(NegativeHostImageCopy, ImageMemoryOverlap) { region.imageOffset = {0, 0, 0}; region.imageExtent = {32, 32, 1}; const uint32_t copy_size = (32 * 32 * 4) / 8; // 64 bit pointer - VkCopyImageToMemoryInfoEXT copy_image_to_memory = vku::InitStructHelper(); + VkCopyImageToMemoryInfo copy_image_to_memory = vku::InitStructHelper(); copy_image_to_memory.srcImage = image.handle(); copy_image_to_memory.srcImageLayout = layout; copy_image_to_memory.regionCount = 1; @@ -2184,7 +2184,7 @@ TEST_F(NegativeHostImageCopy, ImageMemoryOverlap) { vk::CopyImageToMemoryEXT(*m_device, ©_image_to_memory); m_errorMonitor->VerifyFound(); - VkMemoryToImageCopyEXT region2 = vku::InitStructHelper(); + VkMemoryToImageCopy region2 = vku::InitStructHelper(); region2.pHostPointer = data; region2.memoryRowLength = 0; region2.memoryImageHeight = 0; @@ -2192,7 +2192,7 @@ TEST_F(NegativeHostImageCopy, ImageMemoryOverlap) { region2.imageOffset = {0, 0, 0}; region2.imageExtent = {32, 32, 1}; - VkCopyMemoryToImageInfoEXT copy_memory_to_image = vku::InitStructHelper(); + VkCopyMemoryToImageInfo copy_memory_to_image = vku::InitStructHelper(); copy_memory_to_image.dstImage = image.handle(); copy_memory_to_image.dstImageLayout = layout; copy_memory_to_image.regionCount = 1; @@ -2210,7 +2210,7 @@ TEST_F(NegativeHostImageCopy, ImageMemorySparseUnbound) { AddRequiredFeature(vkt::Feature::sparseBinding); RETURN_IF_SKIP(InitHostImageCopyTest()); - image_ci.usage = VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT; + image_ci.usage = VK_IMAGE_USAGE_HOST_TRANSFER_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT; image_ci.flags = VK_IMAGE_CREATE_SPARSE_BINDING_BIT; VkImageFormatProperties img_prop; if (VK_SUCCESS != GPDIFPHelper(Gpu(), &image_ci, &img_prop)) { @@ -2226,7 +2226,7 @@ TEST_F(NegativeHostImageCopy, ImageMemorySparseUnbound) { const uint32_t buffer_size = width * height * 4; std::vector data(buffer_size); - VkImageToMemoryCopyEXT region = vku::InitStructHelper(); + VkImageToMemoryCopy region = vku::InitStructHelper(); region.pHostPointer = data.data(); region.memoryRowLength = 0; region.memoryImageHeight = 0; @@ -2234,7 +2234,7 @@ TEST_F(NegativeHostImageCopy, ImageMemorySparseUnbound) { region.imageOffset = {0, 0, 0}; region.imageExtent = {width, height, 1}; - VkCopyImageToMemoryInfoEXT copy_image_to_memory = vku::InitStructHelper(); + VkCopyImageToMemoryInfo copy_image_to_memory = vku::InitStructHelper(); copy_image_to_memory.srcImage = image.handle(); copy_image_to_memory.srcImageLayout = VK_IMAGE_LAYOUT_UNDEFINED; copy_image_to_memory.regionCount = 1; @@ -2246,7 +2246,7 @@ TEST_F(NegativeHostImageCopy, ImageMemorySparseUnbound) { vk::CopyImageToMemoryEXT(*m_device, ©_image_to_memory); m_errorMonitor->VerifyFound(); - VkMemoryToImageCopyEXT region2 = vku::InitStructHelper(); + VkMemoryToImageCopy region2 = vku::InitStructHelper(); region2.pHostPointer = data.data(); region2.memoryRowLength = 0; region2.memoryImageHeight = 0; @@ -2254,7 +2254,7 @@ TEST_F(NegativeHostImageCopy, ImageMemorySparseUnbound) { region2.imageOffset = {0, 0, 0}; region2.imageExtent = {width, height, 1}; - VkCopyMemoryToImageInfoEXT copy_memory_to_image = vku::InitStructHelper(); + VkCopyMemoryToImageInfo copy_memory_to_image = vku::InitStructHelper(); copy_memory_to_image.dstImage = image.handle(); copy_memory_to_image.dstImageLayout = VK_IMAGE_LAYOUT_GENERAL; copy_memory_to_image.regionCount = 1; @@ -2274,7 +2274,7 @@ TEST_F(NegativeHostImageCopy, ImageMemorySparseUnbound) { image_copy.srcSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; image_copy.dstSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; image_copy.extent = {32, 32, 1}; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy; copy_image_to_image.srcImageLayout = VK_IMAGE_LAYOUT_UNDEFINED; diff --git a/tests/unit/host_image_copy_positive.cpp b/tests/unit/host_image_copy_positive.cpp index 59cef3f094f..5d84aef0fc5 100644 --- a/tests/unit/host_image_copy_positive.cpp +++ b/tests/unit/host_image_copy_positive.cpp @@ -28,7 +28,7 @@ void HostImageCopyTest::InitHostImageCopyTest() { image_ci = vkt::Image::ImageCreateInfo2D( width, height, 1, 1, format, - VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT); + VK_IMAGE_USAGE_HOST_TRANSFER_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT); VkPhysicalDeviceHostImageCopyPropertiesEXT host_image_copy_props = vku::InitStructHelper(); GetPhysicalDeviceProperties2(host_image_copy_props); @@ -67,12 +67,12 @@ TEST_F(PositiveHostImageCopy, BasicUsage) { channel = static_cast((r & 0xffu) | ((r >> 8) & 0xff) | ((r >> 16) & 0xff) | (r >> 24)); } - VkMemoryToImageCopyEXT region_to_image = vku::InitStructHelper(); + VkMemoryToImageCopy region_to_image = vku::InitStructHelper(); region_to_image.pHostPointer = pixels.data(); region_to_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_to_image.imageExtent = {width, height, 1}; - VkCopyMemoryToImageInfoEXT copy_to_image = vku::InitStructHelper(); + VkCopyMemoryToImageInfo copy_to_image = vku::InitStructHelper(); copy_to_image.dstImage = image; copy_to_image.dstImageLayout = layout; copy_to_image.regionCount = 1; @@ -84,12 +84,12 @@ TEST_F(PositiveHostImageCopy, BasicUsage) { // Copy back to host memory std::vector welcome_back(width * height * 4); - VkImageToMemoryCopyEXT region_from_image = vku::InitStructHelper(); + VkImageToMemoryCopy region_from_image = vku::InitStructHelper(); region_from_image.pHostPointer = welcome_back.data(); region_from_image.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; region_from_image.imageExtent = {width, height, 1}; - VkCopyImageToMemoryInfoEXT copy_from_image = vku::InitStructHelper(); + VkCopyImageToMemoryInfo copy_from_image = vku::InitStructHelper(); copy_from_image.srcImage = image; copy_from_image.srcImageLayout = layout; copy_from_image.regionCount = 1; @@ -107,7 +107,7 @@ TEST_F(PositiveHostImageCopy, BasicUsage) { image_copy_2.srcSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; image_copy_2.dstSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; image_copy_2.extent = {width, height, 1}; - VkCopyImageToImageInfoEXT copy_image_to_image = vku::InitStructHelper(); + VkCopyImageToImageInfo copy_image_to_image = vku::InitStructHelper(); copy_image_to_image.regionCount = 1; copy_image_to_image.pRegions = &image_copy_2; copy_image_to_image.srcImageLayout = layout; @@ -128,7 +128,7 @@ TEST_F(PositiveHostImageCopy, BasicUsage) { ASSERT_EQ(pixels, after_image_copy); // Do a layout transition, then use the image in new layout - VkHostImageLayoutTransitionInfoEXT transition_info = vku::InitStructHelper(); + VkHostImageLayoutTransitionInfo transition_info = vku::InitStructHelper(); transition_info.newLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; transition_info.oldLayout = VK_IMAGE_LAYOUT_GENERAL; transition_info.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}; @@ -150,20 +150,20 @@ TEST_F(PositiveHostImageCopy, BasicUsage) { m_default_queue->Wait(); // Get memory size of tiled image - VkImageSubresource2KHR subresource = vku::InitStructHelper(); + VkImageSubresource2 subresource = vku::InitStructHelper(); subresource.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; - VkSubresourceHostMemcpySizeEXT host_copy_size = vku::InitStructHelper(); - VkSubresourceLayout2KHR subresource_layout = vku::InitStructHelper(&host_copy_size); + VkSubresourceHostMemcpySize host_copy_size = vku::InitStructHelper(); + VkSubresourceLayout2 subresource_layout = vku::InitStructHelper(&host_copy_size); vk::GetImageSubresourceLayout2EXT(*m_device, image, &subresource, &subresource_layout); ASSERT_NE(host_copy_size.size, 0); - VkHostImageCopyDevicePerformanceQueryEXT perf_data = vku::InitStructHelper(); + VkHostImageCopyDevicePerformanceQuery perf_data = vku::InitStructHelper(); VkImageFormatProperties2 image_format_properties = vku::InitStructHelper(&perf_data); VkPhysicalDeviceImageFormatInfo2 image_format_info = vku::InitStructHelper(); image_format_info.format = VK_FORMAT_R8G8B8A8_UNORM; image_format_info.type = VK_IMAGE_TYPE_2D; image_format_info.tiling = VK_IMAGE_TILING_OPTIMAL; - image_format_info.usage = VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT; + image_format_info.usage = VK_IMAGE_USAGE_HOST_TRANSFER_BIT; vk::GetPhysicalDeviceImageFormatProperties2(Gpu(), &image_format_info, &image_format_properties); } @@ -196,7 +196,7 @@ TEST_F(PositiveHostImageCopy, BasicUsage14) { VkImageLayout layout = VK_IMAGE_LAYOUT_GENERAL; image_ci = vkt::Image::ImageCreateInfo2D( width, height, 1, 1, format, - VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT); + VK_IMAGE_USAGE_HOST_TRANSFER_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT); vkt::Image image(*m_device, image_ci, vkt::set_layout); image.SetLayout(VK_IMAGE_ASPECT_COLOR_BIT, layout); @@ -296,10 +296,10 @@ TEST_F(PositiveHostImageCopy, BasicUsage14) { m_default_queue->Wait(); // Get memory size of tiled image - VkImageSubresource2KHR subresource = vku::InitStructHelper(); + VkImageSubresource2 subresource = vku::InitStructHelper(); subresource.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; VkSubresourceHostMemcpySize host_copy_size = vku::InitStructHelper(); - VkSubresourceLayout2KHR subresource_layout = vku::InitStructHelper(&host_copy_size); + VkSubresourceLayout2 subresource_layout = vku::InitStructHelper(&host_copy_size); vk::GetImageSubresourceLayout2(*m_device, image, &subresource, &subresource_layout); ASSERT_NE(host_copy_size.size, 0); @@ -309,7 +309,7 @@ TEST_F(PositiveHostImageCopy, BasicUsage14) { image_format_info.format = VK_FORMAT_R8G8B8A8_UNORM; image_format_info.type = VK_IMAGE_TYPE_2D; image_format_info.tiling = VK_IMAGE_TILING_OPTIMAL; - image_format_info.usage = VK_IMAGE_USAGE_HOST_TRANSFER_BIT_EXT; + image_format_info.usage = VK_IMAGE_USAGE_HOST_TRANSFER_BIT; vk::GetPhysicalDeviceImageFormatProperties2(Gpu(), &image_format_info, &image_format_properties); } @@ -325,7 +325,7 @@ TEST_F(PositiveHostImageCopy, CopyImageToMemoryMipLevel) { const uint32_t buffer_size = width * height * 4u; std::vector data(buffer_size); - VkImageToMemoryCopyEXT region = vku::InitStructHelper(); + VkImageToMemoryCopy region = vku::InitStructHelper(); region.pHostPointer = data.data(); region.memoryRowLength = 0u; region.memoryImageHeight = 0u; @@ -333,8 +333,8 @@ TEST_F(PositiveHostImageCopy, CopyImageToMemoryMipLevel) { region.imageOffset = {0u, 0u, 0u}; region.imageExtent = {4u, 4u, 1u}; - VkCopyImageToMemoryInfoEXT copy_to_image_memory = vku::InitStructHelper(); - copy_to_image_memory.flags = VK_HOST_IMAGE_COPY_MEMCPY_EXT; + VkCopyImageToMemoryInfo copy_to_image_memory = vku::InitStructHelper(); + copy_to_image_memory.flags = VK_HOST_IMAGE_COPY_MEMCPY; copy_to_image_memory.srcImage = image.handle(); copy_to_image_memory.srcImageLayout = layout; copy_to_image_memory.regionCount = 1u; diff --git a/tests/unit/image.cpp b/tests/unit/image.cpp index bdcd866f012..7e8bbc5312e 100644 --- a/tests/unit/image.cpp +++ b/tests/unit/image.cpp @@ -67,21 +67,21 @@ TEST_F(NegativeImage, UsageBits) { // equvalent test using using KHR_copy_commands2 if (copy_commands2) { - const VkBufferImageCopy2KHR region2 = {VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2_KHR, - NULL, - region.bufferRowLength, - region.bufferImageHeight, - region.bufferImageHeight, - region.imageSubresource, - region.imageOffset, - region.imageExtent}; - VkCopyBufferToImageInfo2KHR buffer_to_image_info2 = {VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2_KHR, - NULL, - buffer.handle(), - image.handle(), - VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, - 1, - ®ion2}; + const VkBufferImageCopy2 region2 = {VK_STRUCTURE_TYPE_BUFFER_IMAGE_COPY_2, + NULL, + region.bufferRowLength, + region.bufferImageHeight, + region.bufferImageHeight, + region.imageSubresource, + region.imageOffset, + region.imageExtent}; + VkCopyBufferToImageInfo2 buffer_to_image_info2 = {VK_STRUCTURE_TYPE_COPY_BUFFER_TO_IMAGE_INFO_2, + NULL, + buffer.handle(), + image.handle(), + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + 1, + ®ion2}; // two separate errors from this call: m_errorMonitor->SetDesiredError("VUID-VkCopyBufferToImageInfo2-dstImage-00177"); m_errorMonitor->SetDesiredError("VUID-VkCopyBufferToImageInfo2-srcBuffer-00174"); @@ -274,19 +274,18 @@ TEST_F(NegativeImage, BlitFormatTypes) { // equivalent test using KHR_copy_commands2 if (copy_commands2) { - const VkImageBlit2KHR blitRegion2 = { - VK_STRUCTURE_TYPE_IMAGE_BLIT_2_KHR, NULL, - blitRegion.srcSubresource, {blitRegion.srcOffsets[0], blitRegion.srcOffsets[1]}, - blitRegion.dstSubresource, {blitRegion.dstOffsets[0], blitRegion.dstOffsets[1]}}; - const VkBlitImageInfo2KHR blit_image_info2 = {VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2_KHR, - NULL, - unsigned_image.handle(), - unsigned_image.Layout(), - float_image.handle(), - float_image.Layout(), - 1, - &blitRegion2, - VK_FILTER_NEAREST}; + const VkImageBlit2 blitRegion2 = {VK_STRUCTURE_TYPE_IMAGE_BLIT_2_KHR, NULL, + blitRegion.srcSubresource, {blitRegion.srcOffsets[0], blitRegion.srcOffsets[1]}, + blitRegion.dstSubresource, {blitRegion.dstOffsets[0], blitRegion.dstOffsets[1]}}; + const VkBlitImageInfo2 blit_image_info2 = {VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2_KHR, + NULL, + unsigned_image.handle(), + unsigned_image.Layout(), + float_image.handle(), + float_image.Layout(), + 1, + &blitRegion2, + VK_FILTER_NEAREST}; // Unsigned int vs not an int m_errorMonitor->SetDesiredError("VUID-VkBlitImageInfo2-srcImage-00230"); if (usrc) m_errorMonitor->SetUnexpectedError("VUID-VkBlitImageInfo2-srcImage-01999"); @@ -304,19 +303,18 @@ TEST_F(NegativeImage, BlitFormatTypes) { // equivalent test using KHR_copy_commands2 if (copy_commands2) { - const VkImageBlit2KHR blitRegion2 = { - VK_STRUCTURE_TYPE_IMAGE_BLIT_2_KHR, NULL, - blitRegion.srcSubresource, {blitRegion.srcOffsets[0], blitRegion.srcOffsets[1]}, - blitRegion.dstSubresource, {blitRegion.dstOffsets[0], blitRegion.dstOffsets[1]}}; - const VkBlitImageInfo2KHR blit_image_info2 = {VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2_KHR, - NULL, - float_image.handle(), - float_image.Layout(), - unsigned_image.handle(), - unsigned_image.Layout(), - 1, - &blitRegion2, - VK_FILTER_NEAREST}; + const VkImageBlit2 blitRegion2 = {VK_STRUCTURE_TYPE_IMAGE_BLIT_2_KHR, NULL, + blitRegion.srcSubresource, {blitRegion.srcOffsets[0], blitRegion.srcOffsets[1]}, + blitRegion.dstSubresource, {blitRegion.dstOffsets[0], blitRegion.dstOffsets[1]}}; + const VkBlitImageInfo2 blit_image_info2 = {VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2_KHR, + NULL, + float_image.handle(), + float_image.Layout(), + unsigned_image.handle(), + unsigned_image.Layout(), + 1, + &blitRegion2, + VK_FILTER_NEAREST}; m_errorMonitor->SetDesiredError("VUID-VkBlitImageInfo2-srcImage-00230"); if (fsrc) m_errorMonitor->SetUnexpectedError("VUID-VkBlitImageInfo2-srcImage-01999"); if (udst) m_errorMonitor->SetUnexpectedError("VUID-VkBlitImageInfo2-dstImage-02000"); @@ -334,19 +332,18 @@ TEST_F(NegativeImage, BlitFormatTypes) { // equivalent test using KHR_copy_commands2 if (copy_commands2) { - const VkImageBlit2KHR blitRegion2 = { - VK_STRUCTURE_TYPE_IMAGE_BLIT_2_KHR, NULL, - blitRegion.srcSubresource, {blitRegion.srcOffsets[0], blitRegion.srcOffsets[1]}, - blitRegion.dstSubresource, {blitRegion.dstOffsets[0], blitRegion.dstOffsets[1]}}; - const VkBlitImageInfo2KHR blit_image_info2 = {VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2_KHR, - NULL, - signed_image.handle(), - signed_image.Layout(), - float_image.handle(), - float_image.Layout(), - 1, - &blitRegion2, - VK_FILTER_NEAREST}; + const VkImageBlit2 blitRegion2 = {VK_STRUCTURE_TYPE_IMAGE_BLIT_2_KHR, NULL, + blitRegion.srcSubresource, {blitRegion.srcOffsets[0], blitRegion.srcOffsets[1]}, + blitRegion.dstSubresource, {blitRegion.dstOffsets[0], blitRegion.dstOffsets[1]}}; + const VkBlitImageInfo2 blit_image_info2 = {VK_STRUCTURE_TYPE_BLIT_IMAGE_INFO_2_KHR, + NULL, + signed_image.handle(), + signed_image.Layout(), + float_image.handle(), + float_image.Layout(), + 1, + &blitRegion2, + VK_FILTER_NEAREST}; m_errorMonitor->SetDesiredError("VUID-VkBlitImageInfo2-srcImage-00229"); if (ssrc) m_errorMonitor->SetUnexpectedError("VUID-VkBlitImageInfo2-srcImage-01999"); if (fdst) m_errorMonitor->SetUnexpectedError("VUID-VkBlitImageInfo2-dstImage-02000"); @@ -868,7 +865,7 @@ TEST_F(NegativeImage, Array2DImageType) { // Trigger check by setting imagecreateflags to 2d_array_compat and imageType to 2D VkImageCreateInfo ici = {VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, nullptr, - VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR, + VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT, VK_IMAGE_TYPE_2D, VK_FORMAT_R8G8B8A8_UNORM, {32, 32, 1}, @@ -1041,7 +1038,7 @@ TEST_F(NegativeImage, ImageViewBreaksParameterCompatibilityRequirements) { VkResult res = vk::GetPhysicalDeviceImageFormatProperties( m_device->Physical().handle(), VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_TYPE_3D, VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, - VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT | VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR | VK_IMAGE_CREATE_SPARSE_BINDING_BIT, + VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT | VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT | VK_IMAGE_CREATE_SPARSE_BINDING_BIT, &formProps); // If not, skip this part of the test. @@ -1049,24 +1046,23 @@ TEST_F(NegativeImage, ImageViewBreaksParameterCompatibilityRequirements) { GTEST_SKIP() << "Missing supported features"; } - // Initialize VkImageCreateInfo with VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR and VK_IMAGE_CREATE_SPARSE_BINDING_BIT which + // Initialize VkImageCreateInfo with VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT and VK_IMAGE_CREATE_SPARSE_BINDING_BIT which // are incompatible create flags. - imgInfo = { - VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, - nullptr, - VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT | VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR | VK_IMAGE_CREATE_SPARSE_BINDING_BIT, - VK_IMAGE_TYPE_3D, - VK_FORMAT_R8G8B8A8_UNORM, - {1, 1, 1}, - 1, - 1, - VK_SAMPLE_COUNT_1_BIT, - VK_IMAGE_TILING_OPTIMAL, - VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, - VK_SHARING_MODE_EXCLUSIVE, - 0, - nullptr, - VK_IMAGE_LAYOUT_UNDEFINED}; + imgInfo = {VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO, + nullptr, + VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT | VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT | VK_IMAGE_CREATE_SPARSE_BINDING_BIT, + VK_IMAGE_TYPE_3D, + VK_FORMAT_R8G8B8A8_UNORM, + {1, 1, 1}, + 1, + 1, + VK_SAMPLE_COUNT_1_BIT, + VK_IMAGE_TILING_OPTIMAL, + VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, + VK_SHARING_MODE_EXCLUSIVE, + 0, + nullptr, + VK_IMAGE_LAYOUT_UNDEFINED}; VkImage image_sparse; // Creating a sparse image means we should not bind memory to it. @@ -1383,7 +1379,7 @@ TEST_F(NegativeImage, ImageViewStencilUsageCreateInfo) { // VkImageViewUsageCreateInfo::usage must not include any bits that were not set in VkImageCreateInfo::usage CreateImageViewTest(*this, &image_view_create_info, "VUID-VkImageViewCreateInfo-pNext-02662"); - VkImageStencilUsageCreateInfoEXT image_stencil_create_info = vku::InitStructHelper(); + VkImageStencilUsageCreateInfo image_stencil_create_info = vku::InitStructHelper(); image_stencil_create_info.stencilUsage = VK_IMAGE_USAGE_SAMPLED_BIT; image_create_info.pNext = &image_stencil_create_info; @@ -1623,13 +1619,13 @@ TEST_F(NegativeImage, DeviceImageSubresourceInfoKHR) { AddRequiredFeature(vkt::Feature::maintenance5); RETURN_IF_SKIP(Init()); - VkImageSubresource2KHR subresource = vku::InitStructHelper(); + VkImageSubresource2 subresource = vku::InitStructHelper(); VkImageCreateInfo image_ci = DefaultImageInfo(); VkDeviceImageSubresourceInfoKHR image_sub_info = vku::InitStructHelper(); image_sub_info.pCreateInfo = &image_ci; image_sub_info.pSubresource = &subresource; - VkSubresourceLayout2KHR out_layout = vku::InitStructHelper(); + VkSubresourceLayout2 out_layout = vku::InitStructHelper(); { subresource.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT | VK_IMAGE_ASPECT_METADATA_BIT; @@ -1996,7 +1992,7 @@ TEST_F(NegativeImage, ImageViewInvalidSubresourceRangeMaintenance1) { RETURN_IF_SKIP(Init()); auto image_ci = vkt::Image::CreateInfo(); - image_ci.flags = VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT_KHR; + image_ci.flags = VK_IMAGE_CREATE_2D_ARRAY_COMPATIBLE_BIT; image_ci.imageType = VK_IMAGE_TYPE_3D; image_ci.format = VK_FORMAT_R8G8B8A8_UNORM; image_ci.extent = {8, 8, 8}; @@ -2740,7 +2736,7 @@ TEST_F(NegativeImage, Stencil) { RETURN_IF_SKIP(Init()); - VkImageStencilUsageCreateInfoEXT image_stencil_create_info = vku::InitStructHelper(); + VkImageStencilUsageCreateInfo image_stencil_create_info = vku::InitStructHelper(); image_stencil_create_info.stencilUsage = VK_IMAGE_USAGE_STORAGE_BIT; VkImageCreateInfo image_create_info = vku::InitStructHelper(&image_stencil_create_info); @@ -2825,7 +2821,7 @@ TEST_F(NegativeImage, StencilLimits) { GTEST_SKIP() << "maxFramebufferHeight is already UINT32_MAX"; } - VkImageStencilUsageCreateInfoEXT image_stencil_create_info = vku::InitStructHelper(); + VkImageStencilUsageCreateInfo image_stencil_create_info = vku::InitStructHelper(); VkImageCreateInfo image_create_info = vku::InitStructHelper(&image_stencil_create_info); image_create_info.flags = 0; @@ -4025,11 +4021,11 @@ TEST_F(NegativeImage, ImageCompressionControl) { vkt::Image image; if (create_compressed_image(VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_TILING_LINEAR, image)) { m_errorMonitor->SetDesiredError("VUID-vkGetImageSubresourceLayout2-mipLevel-01716"); - VkImageSubresource2EXT subresource = vku::InitStructHelper(); + VkImageSubresource2 subresource = vku::InitStructHelper(); subresource.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 1, 0}; VkImageCompressionPropertiesEXT compressionProperties = vku::InitStructHelper(); - VkSubresourceLayout2EXT layout = vku::InitStructHelper(&compressionProperties); + VkSubresourceLayout2 layout = vku::InitStructHelper(&compressionProperties); vk::GetImageSubresourceLayout2EXT(m_device->handle(), image.handle(), &subresource, &layout); m_errorMonitor->VerifyFound(); @@ -4041,11 +4037,11 @@ TEST_F(NegativeImage, ImageCompressionControl) { vkt::Image image; if (create_compressed_image(VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_TILING_LINEAR, image)) { m_errorMonitor->SetDesiredError("VUID-vkGetImageSubresourceLayout2-arrayLayer-01717"); - VkImageSubresource2EXT subresource = vku::InitStructHelper(); + VkImageSubresource2 subresource = vku::InitStructHelper(); subresource.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1}; VkImageCompressionPropertiesEXT compressionProperties = vku::InitStructHelper(); - VkSubresourceLayout2EXT layout = vku::InitStructHelper(&compressionProperties); + VkSubresourceLayout2 layout = vku::InitStructHelper(&compressionProperties); vk::GetImageSubresourceLayout2EXT(m_device->handle(), image.handle(), &subresource, &layout); m_errorMonitor->VerifyFound(); @@ -4057,11 +4053,11 @@ TEST_F(NegativeImage, ImageCompressionControl) { vkt::Image image; if (create_compressed_image(VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_TILING_LINEAR, image)) { m_errorMonitor->SetDesiredError("VUID-vkGetImageSubresourceLayout2-format-08886"); - VkImageSubresource2EXT subresource = vku::InitStructHelper(); + VkImageSubresource2 subresource = vku::InitStructHelper(); subresource.imageSubresource = {VK_IMAGE_ASPECT_PLANE_0_BIT, 0, 0}; VkImageCompressionPropertiesEXT compressionProperties = vku::InitStructHelper(); - VkSubresourceLayout2EXT layout = vku::InitStructHelper(&compressionProperties); + VkSubresourceLayout2 layout = vku::InitStructHelper(&compressionProperties); vk::GetImageSubresourceLayout2EXT(m_device->handle(), image.handle(), &subresource, &layout); m_errorMonitor->VerifyFound(); @@ -4074,11 +4070,11 @@ TEST_F(NegativeImage, ImageCompressionControl) { vkt::Image image; if (create_compressed_image(depth_format, VK_IMAGE_TILING_LINEAR, image)) { m_errorMonitor->SetDesiredError("VUID-vkGetImageSubresourceLayout2-format-04462"); - VkImageSubresource2EXT subresource = vku::InitStructHelper(); + VkImageSubresource2 subresource = vku::InitStructHelper(); subresource.imageSubresource = {VK_IMAGE_ASPECT_STENCIL_BIT, 0, 0}; VkImageCompressionPropertiesEXT compressionProperties = vku::InitStructHelper(); - VkSubresourceLayout2EXT layout = vku::InitStructHelper(&compressionProperties); + VkSubresourceLayout2 layout = vku::InitStructHelper(&compressionProperties); vk::GetImageSubresourceLayout2EXT(m_device->handle(), image.handle(), &subresource, &layout); m_errorMonitor->VerifyFound(); @@ -4090,11 +4086,11 @@ TEST_F(NegativeImage, ImageCompressionControl) { vkt::Image image; if (create_compressed_image(stencil_format, VK_IMAGE_TILING_LINEAR, image)) { m_errorMonitor->SetDesiredError("VUID-vkGetImageSubresourceLayout2-format-04463"); - VkImageSubresource2EXT subresource = vku::InitStructHelper(); + VkImageSubresource2 subresource = vku::InitStructHelper(); subresource.imageSubresource = {VK_IMAGE_ASPECT_DEPTH_BIT, 0, 0}; VkImageCompressionPropertiesEXT compressionProperties = vku::InitStructHelper(); - VkSubresourceLayout2EXT layout = vku::InitStructHelper(&compressionProperties); + VkSubresourceLayout2 layout = vku::InitStructHelper(&compressionProperties); vk::GetImageSubresourceLayout2EXT(m_device->handle(), image.handle(), &subresource, &layout); m_errorMonitor->VerifyFound(); @@ -4107,11 +4103,11 @@ TEST_F(NegativeImage, ImageCompressionControl) { vkt::Image image; if (create_compressed_image(depth_stencil_format, VK_IMAGE_TILING_LINEAR, image)) { m_errorMonitor->SetDesiredError("VUID-vkGetImageSubresourceLayout2-aspectMask-00997"); - VkImageSubresource2EXT subresource = vku::InitStructHelper(); + VkImageSubresource2 subresource = vku::InitStructHelper(); subresource.imageSubresource = {VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT, 0, 0}; VkImageCompressionPropertiesEXT compressionProperties = vku::InitStructHelper(); - VkSubresourceLayout2EXT layout = vku::InitStructHelper(&compressionProperties); + VkSubresourceLayout2 layout = vku::InitStructHelper(&compressionProperties); vk::GetImageSubresourceLayout2EXT(m_device->handle(), image.handle(), &subresource, &layout); m_errorMonitor->VerifyFound(); @@ -4124,11 +4120,11 @@ TEST_F(NegativeImage, ImageCompressionControl) { if (create_compressed_image(VK_FORMAT_R8G8B8A8_SNORM, VK_IMAGE_TILING_LINEAR, image)) { m_errorMonitor->SetDesiredError("VUID-vkGetImageSubresourceLayout2-format-08886"); m_errorMonitor->SetDesiredError("VUID-vkGetImageSubresourceLayout2-format-04464"); - VkImageSubresource2EXT subresource = vku::InitStructHelper(); + VkImageSubresource2 subresource = vku::InitStructHelper(); subresource.imageSubresource = {VK_IMAGE_ASPECT_DEPTH_BIT, 0, 0}; VkImageCompressionPropertiesEXT compressionProperties = vku::InitStructHelper(); - VkSubresourceLayout2EXT layout = vku::InitStructHelper(&compressionProperties); + VkSubresourceLayout2 layout = vku::InitStructHelper(&compressionProperties); vk::GetImageSubresourceLayout2EXT(m_device->handle(), image.handle(), &subresource, &layout); m_errorMonitor->VerifyFound(); @@ -4168,11 +4164,11 @@ TEST_F(NegativeImage, ImageCompressionControlMultiPlane) { vkt::Image image; if (create_compressed_image(two_plane_format, VK_IMAGE_TILING_LINEAR, image)) { m_errorMonitor->SetDesiredError("VUID-vkGetImageSubresourceLayout2-tiling-08717"); - VkImageSubresource2EXT subresource = vku::InitStructHelper(); + VkImageSubresource2 subresource = vku::InitStructHelper(); subresource.imageSubresource = {VK_IMAGE_ASPECT_PLANE_2_BIT, 0, 0}; VkImageCompressionPropertiesEXT compressionProperties = vku::InitStructHelper(); - VkSubresourceLayout2EXT layout = vku::InitStructHelper(&compressionProperties); + VkSubresourceLayout2 layout = vku::InitStructHelper(&compressionProperties); vk::GetImageSubresourceLayout2EXT(m_device->handle(), image.handle(), &subresource, &layout); m_errorMonitor->VerifyFound(); @@ -4185,11 +4181,11 @@ TEST_F(NegativeImage, ImageCompressionControlMultiPlane) { vkt::Image image; if (create_compressed_image(three_plane_format, VK_IMAGE_TILING_LINEAR, image)) { m_errorMonitor->SetDesiredError("VUID-vkGetImageSubresourceLayout2-tiling-08717"); - VkImageSubresource2EXT subresource = vku::InitStructHelper(); + VkImageSubresource2 subresource = vku::InitStructHelper(); subresource.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0}; VkImageCompressionPropertiesEXT compressionProperties = vku::InitStructHelper(); - VkSubresourceLayout2EXT layout = vku::InitStructHelper(&compressionProperties); + VkSubresourceLayout2 layout = vku::InitStructHelper(&compressionProperties); vk::GetImageSubresourceLayout2EXT(m_device->handle(), image.handle(), &subresource, &layout); m_errorMonitor->VerifyFound(); @@ -4213,9 +4209,9 @@ TEST_F(NegativeImage, GetImageSubresourceLayout2Maintenance5) { // Exceed MipmapLevel m_errorMonitor->SetDesiredError("VUID-vkGetImageSubresourceLayout2-mipLevel-01716"); - VkImageSubresource2KHR subresource = vku::InitStructHelper(); + VkImageSubresource2 subresource = vku::InitStructHelper(); subresource.imageSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 1, 0}; - VkSubresourceLayout2KHR layout = vku::InitStructHelper(); + VkSubresourceLayout2 layout = vku::InitStructHelper(); vk::GetImageSubresourceLayout2KHR(m_device->handle(), image.handle(), &subresource, &layout); m_errorMonitor->VerifyFound(); @@ -4264,14 +4260,14 @@ TEST_F(NegativeImage, AttachmentFeedbackLoopLayoutFeature) { m_errorMonitor->VerifyFound(); m_command_buffer.Begin(); - VkImageMemoryBarrier2KHR img_barrier = vku::InitStructHelper(); + VkImageMemoryBarrier2 img_barrier = vku::InitStructHelper(); img_barrier.image = image.handle(); img_barrier.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}; img_barrier.srcStageMask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; img_barrier.dstStageMask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; img_barrier.newLayout = VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT; - VkDependencyInfoKHR dep_info = vku::InitStructHelper(); + VkDependencyInfo dep_info = vku::InitStructHelper(); dep_info.imageMemoryBarrierCount = 1; dep_info.pImageMemoryBarriers = &img_barrier; m_errorMonitor->SetDesiredError("VUID-VkImageMemoryBarrier2-attachmentFeedbackLoopLayout-07313"); diff --git a/tests/unit/image_layout.cpp b/tests/unit/image_layout.cpp index d78cb14ec06..d283b28168e 100644 --- a/tests/unit/image_layout.cpp +++ b/tests/unit/image_layout.cpp @@ -318,7 +318,7 @@ TEST_F(NegativeImageLayout, PushDescriptor) { dsl_binding.stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT; dsl_binding.pImmutableSamplers = NULL; - const vkt::DescriptorSetLayout ds_layout(*m_device, {dsl_binding}, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR); + const vkt::DescriptorSetLayout ds_layout(*m_device, {dsl_binding}, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT); auto pipeline_layout = vkt::PipelineLayout(*m_device, {&ds_layout}); char const *fsSource = R"glsl( @@ -461,21 +461,21 @@ TEST_F(NegativeImageLayout, Basic) { // Equivalent tests using KHR_copy_commands2 if (copy_commands2) { - const VkImageCopy2KHR copy_region2 = {VK_STRUCTURE_TYPE_IMAGE_COPY_2_KHR, - NULL, - copy_region.srcSubresource, - copy_region.srcOffset, - copy_region.dstSubresource, - copy_region.dstOffset, - copy_region.extent}; - VkCopyImageInfo2KHR copy_image_info2 = {VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2_KHR, - NULL, - src_image.handle(), - VK_IMAGE_LAYOUT_GENERAL, - dst_image.handle(), - VK_IMAGE_LAYOUT_GENERAL, - 1, - ©_region2}; + const VkImageCopy2 copy_region2 = {VK_STRUCTURE_TYPE_IMAGE_COPY_2, + NULL, + copy_region.srcSubresource, + copy_region.srcOffset, + copy_region.dstSubresource, + copy_region.dstOffset, + copy_region.extent}; + VkCopyImageInfo2 copy_image_info2 = {VK_STRUCTURE_TYPE_COPY_IMAGE_INFO_2, + NULL, + src_image.handle(), + VK_IMAGE_LAYOUT_GENERAL, + dst_image.handle(), + VK_IMAGE_LAYOUT_GENERAL, + 1, + ©_region2}; vk::CmdCopyImage2KHR(m_command_buffer.handle(), ©_image_info2); diff --git a/tests/unit/image_layout_positive.cpp b/tests/unit/image_layout_positive.cpp index fc1de8bfce5..77b84db5938 100644 --- a/tests/unit/image_layout_positive.cpp +++ b/tests/unit/image_layout_positive.cpp @@ -168,21 +168,21 @@ TEST_F(PositiveImageLayout, ImagelessTracking) { const uint32_t current_buffer = m_swapchain.AcquireNextImage(image_acquired, kWaitTimeout); vkt::ImageView imageView = image.CreateView(); - VkFramebufferAttachmentImageInfoKHR framebufferAttachmentImageInfo = {VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENT_IMAGE_INFO_KHR, - nullptr, - 0, - VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, - attachmentWidth, - attachmentHeight, - 1, - 1, - &attachmentFormat}; - VkFramebufferAttachmentsCreateInfoKHR framebufferAttachmentsCreateInfo = vku::InitStructHelper(); + VkFramebufferAttachmentImageInfo framebufferAttachmentImageInfo = {VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENT_IMAGE_INFO_KHR, + nullptr, + 0, + VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT, + attachmentWidth, + attachmentHeight, + 1, + 1, + &attachmentFormat}; + VkFramebufferAttachmentsCreateInfo framebufferAttachmentsCreateInfo = vku::InitStructHelper(); framebufferAttachmentsCreateInfo.attachmentImageInfoCount = 1; framebufferAttachmentsCreateInfo.pAttachmentImageInfos = &framebufferAttachmentImageInfo; VkFramebufferCreateInfo framebufferCreateInfo = {VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO, &framebufferAttachmentsCreateInfo, - VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR, + VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT, rp.Handle(), 1, reinterpret_cast(1), @@ -191,8 +191,8 @@ TEST_F(PositiveImageLayout, ImagelessTracking) { 1}; vkt::Framebuffer framebuffer(*m_device, framebufferCreateInfo); - VkRenderPassAttachmentBeginInfoKHR renderPassAttachmentBeginInfo = {VK_STRUCTURE_TYPE_RENDER_PASS_ATTACHMENT_BEGIN_INFO_KHR, - nullptr, 1, &imageView.handle()}; + VkRenderPassAttachmentBeginInfo renderPassAttachmentBeginInfo = {VK_STRUCTURE_TYPE_RENDER_PASS_ATTACHMENT_BEGIN_INFO_KHR, + nullptr, 1, &imageView.handle()}; VkRenderPassBeginInfo renderPassBeginInfo = vku::InitStruct(&renderPassAttachmentBeginInfo, rp.Handle(), framebuffer.handle(), VkRect2D{{0, 0}, {attachmentWidth, attachmentHeight}}, 0u, nullptr); diff --git a/tests/unit/imageless_framebuffer.cpp b/tests/unit/imageless_framebuffer.cpp index b8eb275e288..37d88d6688d 100644 --- a/tests/unit/imageless_framebuffer.cpp +++ b/tests/unit/imageless_framebuffer.cpp @@ -41,7 +41,7 @@ TEST_F(NegativeImagelessFramebuffer, RenderPassBeginImageViewMismatch) { rp.AddColorAttachment(0); rp.CreateRenderPass(); - VkFramebufferAttachmentImageInfoKHR framebufferAttachmentImageInfo = vku::InitStructHelper(); + VkFramebufferAttachmentImageInfo framebufferAttachmentImageInfo = vku::InitStructHelper(); framebufferAttachmentImageInfo.flags = VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; framebufferAttachmentImageInfo.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT; framebufferAttachmentImageInfo.width = attachmentWidth; @@ -49,11 +49,11 @@ TEST_F(NegativeImagelessFramebuffer, RenderPassBeginImageViewMismatch) { framebufferAttachmentImageInfo.layerCount = 1; framebufferAttachmentImageInfo.viewFormatCount = 2; framebufferAttachmentImageInfo.pViewFormats = framebufferAttachmentFormats; - VkFramebufferAttachmentsCreateInfoKHR framebufferAttachmentsCreateInfo = vku::InitStructHelper(); + VkFramebufferAttachmentsCreateInfo framebufferAttachmentsCreateInfo = vku::InitStructHelper(); framebufferAttachmentsCreateInfo.attachmentImageInfoCount = 1; framebufferAttachmentsCreateInfo.pAttachmentImageInfos = &framebufferAttachmentImageInfo; VkFramebufferCreateInfo framebufferCreateInfo = vku::InitStructHelper(&framebufferAttachmentsCreateInfo); - framebufferCreateInfo.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR; + framebufferCreateInfo.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT; framebufferCreateInfo.width = attachmentWidth; framebufferCreateInfo.height = attachmentHeight; framebufferCreateInfo.layers = 1; @@ -61,7 +61,7 @@ TEST_F(NegativeImagelessFramebuffer, RenderPassBeginImageViewMismatch) { framebufferCreateInfo.pAttachments = nullptr; framebufferCreateInfo.renderPass = rp.Handle(); - VkImageFormatListCreateInfoKHR imageFormatListCreateInfo = vku::InitStructHelper(); + VkImageFormatListCreateInfo imageFormatListCreateInfo = vku::InitStructHelper(); imageFormatListCreateInfo.viewFormatCount = 2; imageFormatListCreateInfo.pViewFormats = attachmentFormats; VkImageCreateInfo imageCreateInfo = vku::InitStructHelper(&imageFormatListCreateInfo); @@ -96,7 +96,7 @@ TEST_F(NegativeImagelessFramebuffer, RenderPassBeginImageViewMismatch) { vkt::ImageView imageView(*m_device, imageViewCreateInfo); VkImageView image_views[2] = {imageView.handle(), imageView.handle()}; - VkRenderPassAttachmentBeginInfoKHR renderPassAttachmentBeginInfo = vku::InitStructHelper(); + VkRenderPassAttachmentBeginInfo renderPassAttachmentBeginInfo = vku::InitStructHelper(); renderPassAttachmentBeginInfo.attachmentCount = 1; renderPassAttachmentBeginInfo.pAttachments = image_views; VkRenderPassBeginInfo renderPassBeginInfo = vku::InitStructHelper(&renderPassAttachmentBeginInfo); @@ -110,7 +110,7 @@ TEST_F(NegativeImagelessFramebuffer, RenderPassBeginImageViewMismatch) { // Positive test first { framebufferCreateInfo.pAttachments = nullptr; - framebufferCreateInfo.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR; + framebufferCreateInfo.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT; vkt::Framebuffer framebuffer(*m_device, framebufferCreateInfo); renderPassBeginInfo.framebuffer = framebuffer.handle(); m_command_buffer.Begin(&cmd_begin_info); @@ -129,7 +129,7 @@ TEST_F(NegativeImagelessFramebuffer, RenderPassBeginImageViewMismatch) { } { framebufferCreateInfo.pAttachments = nullptr; - framebufferCreateInfo.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR; + framebufferCreateInfo.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT; vkt::Framebuffer framebuffer(*m_device, framebufferCreateInfo); renderPassAttachmentBeginInfo.attachmentCount = 2; renderPassBeginInfo.framebuffer = framebuffer.handle(); @@ -327,18 +327,18 @@ TEST_F(NegativeImagelessFramebuffer, FeatureEnable) { rp.AddColorAttachment(0); rp.CreateRenderPass(); - VkFramebufferAttachmentImageInfoKHR framebufferAttachmentImageInfo = vku::InitStructHelper(); + VkFramebufferAttachmentImageInfo framebufferAttachmentImageInfo = vku::InitStructHelper(); framebufferAttachmentImageInfo.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; framebufferAttachmentImageInfo.width = attachmentWidth; framebufferAttachmentImageInfo.height = attachmentHeight; framebufferAttachmentImageInfo.layerCount = 1; framebufferAttachmentImageInfo.viewFormatCount = 1; framebufferAttachmentImageInfo.pViewFormats = &attachmentFormat; - VkFramebufferAttachmentsCreateInfoKHR framebufferAttachmentsCreateInfo = vku::InitStructHelper(); + VkFramebufferAttachmentsCreateInfo framebufferAttachmentsCreateInfo = vku::InitStructHelper(); framebufferAttachmentsCreateInfo.attachmentImageInfoCount = 1; framebufferAttachmentsCreateInfo.pAttachmentImageInfos = &framebufferAttachmentImageInfo; VkFramebufferCreateInfo framebufferCreateInfo = vku::InitStructHelper(&framebufferAttachmentsCreateInfo); - framebufferCreateInfo.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR; + framebufferCreateInfo.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT; framebufferCreateInfo.width = attachmentWidth; framebufferCreateInfo.height = attachmentHeight; framebufferCreateInfo.layers = 1; @@ -373,18 +373,18 @@ TEST_F(NegativeImagelessFramebuffer, BasicUsage) { rp.AddColorAttachment(0); rp.CreateRenderPass(); - VkFramebufferAttachmentImageInfoKHR framebufferAttachmentImageInfo = vku::InitStructHelper(); + VkFramebufferAttachmentImageInfo framebufferAttachmentImageInfo = vku::InitStructHelper(); framebufferAttachmentImageInfo.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; framebufferAttachmentImageInfo.width = attachmentWidth; framebufferAttachmentImageInfo.height = attachmentHeight; framebufferAttachmentImageInfo.layerCount = 1; framebufferAttachmentImageInfo.viewFormatCount = 1; framebufferAttachmentImageInfo.pViewFormats = &attachmentFormat; - VkFramebufferAttachmentsCreateInfoKHR framebufferAttachmentsCreateInfo = vku::InitStructHelper(); + VkFramebufferAttachmentsCreateInfo framebufferAttachmentsCreateInfo = vku::InitStructHelper(); framebufferAttachmentsCreateInfo.attachmentImageInfoCount = 1; framebufferAttachmentsCreateInfo.pAttachmentImageInfos = &framebufferAttachmentImageInfo; VkFramebufferCreateInfo framebufferCreateInfo = vku::InitStructHelper(&framebufferAttachmentsCreateInfo); - framebufferCreateInfo.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR; + framebufferCreateInfo.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT; framebufferCreateInfo.width = attachmentWidth; framebufferCreateInfo.height = attachmentHeight; framebufferCreateInfo.layers = 1; @@ -401,8 +401,8 @@ TEST_F(NegativeImagelessFramebuffer, BasicUsage) { // Mismatched attachment counts framebufferAttachmentsCreateInfo.attachmentImageInfoCount = 2; - VkFramebufferAttachmentImageInfoKHR framebufferAttachmentImageInfos[2] = {framebufferAttachmentImageInfo, - framebufferAttachmentImageInfo}; + VkFramebufferAttachmentImageInfo framebufferAttachmentImageInfos[2] = {framebufferAttachmentImageInfo, + framebufferAttachmentImageInfo}; framebufferAttachmentsCreateInfo.pAttachmentImageInfos = framebufferAttachmentImageInfos; m_errorMonitor->SetDesiredError("VUID-VkFramebufferCreateInfo-flags-03191"); vk::CreateFramebuffer(device(), &framebufferCreateInfo, nullptr, &framebuffer); @@ -474,7 +474,7 @@ TEST_F(NegativeImagelessFramebuffer, AttachmentImageUsageMismatch) { rp.AddInputAttachment(3); rp.CreateRenderPass(); - VkFramebufferAttachmentImageInfoKHR framebufferAttachmentImageInfos[4] = {}; + VkFramebufferAttachmentImageInfo framebufferAttachmentImageInfos[4] = {}; // Color attachment framebufferAttachmentImageInfos[0] = vku::InitStructHelper(); framebufferAttachmentImageInfos[0].width = attachmentWidth; @@ -507,11 +507,11 @@ TEST_F(NegativeImagelessFramebuffer, AttachmentImageUsageMismatch) { framebufferAttachmentImageInfos[3].layerCount = 1; framebufferAttachmentImageInfos[3].viewFormatCount = 1; framebufferAttachmentImageInfos[3].pViewFormats = &colorAndInputAttachmentFormat; - VkFramebufferAttachmentsCreateInfoKHR framebufferAttachmentsCreateInfo = vku::InitStructHelper(); + VkFramebufferAttachmentsCreateInfo framebufferAttachmentsCreateInfo = vku::InitStructHelper(); framebufferAttachmentsCreateInfo.attachmentImageInfoCount = 4; framebufferAttachmentsCreateInfo.pAttachmentImageInfos = framebufferAttachmentImageInfos; VkFramebufferCreateInfo framebufferCreateInfo = vku::InitStructHelper(&framebufferAttachmentsCreateInfo); - framebufferCreateInfo.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR; + framebufferCreateInfo.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT; framebufferCreateInfo.width = attachmentWidth; framebufferCreateInfo.height = attachmentHeight; framebufferCreateInfo.layers = 1; @@ -583,7 +583,7 @@ TEST_F(NegativeImagelessFramebuffer, AttachmentMultiviewImageLayerCountMismatch) rp.AddInputAttachment(3); rp.CreateRenderPass(&renderPassMultiviewCreateInfo); - VkFramebufferAttachmentImageInfoKHR framebufferAttachmentImageInfos[4] = {}; + VkFramebufferAttachmentImageInfo framebufferAttachmentImageInfos[4] = {}; // Color attachment framebufferAttachmentImageInfos[0] = vku::InitStructHelper(); framebufferAttachmentImageInfos[0].width = attachmentWidth; @@ -616,11 +616,11 @@ TEST_F(NegativeImagelessFramebuffer, AttachmentMultiviewImageLayerCountMismatch) framebufferAttachmentImageInfos[3].layerCount = 2; framebufferAttachmentImageInfos[3].viewFormatCount = 1; framebufferAttachmentImageInfos[3].pViewFormats = &colorAndInputAttachmentFormat; - VkFramebufferAttachmentsCreateInfoKHR framebufferAttachmentsCreateInfo = vku::InitStructHelper(); + VkFramebufferAttachmentsCreateInfo framebufferAttachmentsCreateInfo = vku::InitStructHelper(); framebufferAttachmentsCreateInfo.attachmentImageInfoCount = 4; framebufferAttachmentsCreateInfo.pAttachmentImageInfos = framebufferAttachmentImageInfos; VkFramebufferCreateInfo framebufferCreateInfo = vku::InitStructHelper(&framebufferAttachmentsCreateInfo); - framebufferCreateInfo.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR; + framebufferCreateInfo.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT; framebufferCreateInfo.width = attachmentWidth; framebufferCreateInfo.height = attachmentHeight; framebufferCreateInfo.layers = 1; @@ -683,7 +683,7 @@ TEST_F(NegativeImagelessFramebuffer, DepthStencilResolveAttachment) { rp.SetViewMask(0x3u); rp.CreateRenderPass(); - VkFramebufferAttachmentImageInfoKHR framebufferAttachmentImageInfos[2] = {}; + VkFramebufferAttachmentImageInfo framebufferAttachmentImageInfos[2] = {}; // Depth/stencil attachment framebufferAttachmentImageInfos[0] = vku::InitStructHelper(); framebufferAttachmentImageInfos[0].width = attachmentWidth; @@ -700,11 +700,11 @@ TEST_F(NegativeImagelessFramebuffer, DepthStencilResolveAttachment) { framebufferAttachmentImageInfos[1].layerCount = 2; framebufferAttachmentImageInfos[1].viewFormatCount = 1; framebufferAttachmentImageInfos[1].pViewFormats = &attachmentFormat; - VkFramebufferAttachmentsCreateInfoKHR framebufferAttachmentsCreateInfo = vku::InitStructHelper(); + VkFramebufferAttachmentsCreateInfo framebufferAttachmentsCreateInfo = vku::InitStructHelper(); framebufferAttachmentsCreateInfo.attachmentImageInfoCount = 2; framebufferAttachmentsCreateInfo.pAttachmentImageInfos = framebufferAttachmentImageInfos; VkFramebufferCreateInfo framebufferCreateInfo = vku::InitStructHelper(&framebufferAttachmentsCreateInfo); - framebufferCreateInfo.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR; + framebufferCreateInfo.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT; framebufferCreateInfo.width = attachmentWidth; framebufferCreateInfo.height = attachmentHeight; framebufferCreateInfo.layers = 1; @@ -930,7 +930,7 @@ TEST_F(NegativeImagelessFramebuffer, RenderPassBeginImageView3D) { vkt::Image image3D(*m_device, imageCreateInfo, vkt::set_layout); vkt::ImageView imageView3D = image3D.CreateView(VK_IMAGE_VIEW_TYPE_3D); - VkFramebufferAttachmentImageInfoKHR framebufferAttachmentImageInfo = vku::InitStructHelper(); + VkFramebufferAttachmentImageInfo framebufferAttachmentImageInfo = vku::InitStructHelper(); framebufferAttachmentImageInfo.flags = 0; framebufferAttachmentImageInfo.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; framebufferAttachmentImageInfo.width = attachmentWidth; @@ -938,7 +938,7 @@ TEST_F(NegativeImagelessFramebuffer, RenderPassBeginImageView3D) { framebufferAttachmentImageInfo.layerCount = 1; framebufferAttachmentImageInfo.viewFormatCount = 1; framebufferAttachmentImageInfo.pViewFormats = framebufferAttachmentFormats; - VkFramebufferAttachmentsCreateInfoKHR framebufferAttachmentsCreateInfo = vku::InitStructHelper(); + VkFramebufferAttachmentsCreateInfo framebufferAttachmentsCreateInfo = vku::InitStructHelper(); framebufferAttachmentsCreateInfo.attachmentImageInfoCount = 1; framebufferAttachmentsCreateInfo.pAttachmentImageInfos = &framebufferAttachmentImageInfo; @@ -960,12 +960,12 @@ TEST_F(NegativeImagelessFramebuffer, RenderPassBeginImageView3D) { } framebufferCreateInfo.pNext = &framebufferAttachmentsCreateInfo; - framebufferCreateInfo.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR; + framebufferCreateInfo.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT; framebufferCreateInfo.pAttachments = nullptr; vkt::Framebuffer framebuffer(*m_device, framebufferCreateInfo); ASSERT_TRUE(framebuffer.initialized()); - VkRenderPassAttachmentBeginInfoKHR renderPassAttachmentBeginInfo = vku::InitStructHelper(); + VkRenderPassAttachmentBeginInfo renderPassAttachmentBeginInfo = vku::InitStructHelper(); renderPassAttachmentBeginInfo.attachmentCount = 1; renderPassAttachmentBeginInfo.pAttachments = &imageView3D.handle(); VkRenderPassBeginInfo renderPassBeginInfo = vku::InitStructHelper(&renderPassAttachmentBeginInfo); @@ -1098,7 +1098,7 @@ TEST_F(NegativeImagelessFramebuffer, MissingInheritanceRenderingInfo) { rp.AddColorAttachment(0); rp.CreateRenderPass(); - VkFramebufferAttachmentImageInfoKHR fb_attachment_image_info = vku::InitStructHelper(); + VkFramebufferAttachmentImageInfo fb_attachment_image_info = vku::InitStructHelper(); fb_attachment_image_info.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; fb_attachment_image_info.width = attachment_width; fb_attachment_image_info.height = attachment_height; @@ -1106,12 +1106,12 @@ TEST_F(NegativeImagelessFramebuffer, MissingInheritanceRenderingInfo) { fb_attachment_image_info.viewFormatCount = 1; fb_attachment_image_info.pViewFormats = &format; - VkFramebufferAttachmentsCreateInfoKHR fb_attachment_ci = vku::InitStructHelper(); + VkFramebufferAttachmentsCreateInfo fb_attachment_ci = vku::InitStructHelper(); fb_attachment_ci.attachmentImageInfoCount = 1; fb_attachment_ci.pAttachmentImageInfos = &fb_attachment_image_info; VkFramebufferCreateInfo fb_ci = vku::InitStructHelper(&fb_attachment_ci); - fb_ci.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR; + fb_ci.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT; fb_ci.width = attachment_width; fb_ci.height = attachment_height; fb_ci.layers = 1; diff --git a/tests/unit/imageless_framebuffer_positive.cpp b/tests/unit/imageless_framebuffer_positive.cpp index 5bc27fee051..9337c780a32 100644 --- a/tests/unit/imageless_framebuffer_positive.cpp +++ b/tests/unit/imageless_framebuffer_positive.cpp @@ -33,18 +33,18 @@ TEST_F(PositiveImagelessFramebuffer, BasicUsage) { rp.AddColorAttachment(0); rp.CreateRenderPass(); - VkFramebufferAttachmentImageInfoKHR fb_attachment_image_info = vku::InitStructHelper(); + VkFramebufferAttachmentImageInfo fb_attachment_image_info = vku::InitStructHelper(); fb_attachment_image_info.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; fb_attachment_image_info.width = attachment_width; fb_attachment_image_info.height = attachment_height; fb_attachment_image_info.layerCount = 1; fb_attachment_image_info.viewFormatCount = 1; fb_attachment_image_info.pViewFormats = &format; - VkFramebufferAttachmentsCreateInfoKHR fb_attachment_ci = vku::InitStructHelper(); + VkFramebufferAttachmentsCreateInfo fb_attachment_ci = vku::InitStructHelper(); fb_attachment_ci.attachmentImageInfoCount = 1; fb_attachment_ci.pAttachmentImageInfos = &fb_attachment_image_info; VkFramebufferCreateInfo fb_ci = vku::InitStructHelper(&fb_attachment_ci); - fb_ci.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR; + fb_ci.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT; fb_ci.width = attachment_width; fb_ci.height = attachment_height; fb_ci.layers = 1; @@ -155,7 +155,7 @@ TEST_F(PositiveImagelessFramebuffer, SecondaryCmdBuffer) { rp.AddDepthStencilAttachment(0); rp.CreateRenderPass(); - VkFramebufferAttachmentImageInfoKHR fb_attachment_image_info = vku::InitStructHelper(); + VkFramebufferAttachmentImageInfo fb_attachment_image_info = vku::InitStructHelper(); fb_attachment_image_info.usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; fb_attachment_image_info.width = attachment_width; fb_attachment_image_info.height = attachment_height; @@ -163,12 +163,12 @@ TEST_F(PositiveImagelessFramebuffer, SecondaryCmdBuffer) { fb_attachment_image_info.viewFormatCount = 1; fb_attachment_image_info.pViewFormats = &format; - VkFramebufferAttachmentsCreateInfoKHR fb_attachment_ci = vku::InitStructHelper(); + VkFramebufferAttachmentsCreateInfo fb_attachment_ci = vku::InitStructHelper(); fb_attachment_ci.attachmentImageInfoCount = 1; fb_attachment_ci.pAttachmentImageInfos = &fb_attachment_image_info; VkFramebufferCreateInfo fb_ci = vku::InitStructHelper(&fb_attachment_ci); - fb_ci.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR; + fb_ci.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT; fb_ci.width = attachment_width; fb_ci.height = attachment_height; fb_ci.layers = 1; diff --git a/tests/unit/layer_utils_positive.cpp b/tests/unit/layer_utils_positive.cpp index 9de2fdf4b20..8c279f5b943 100644 --- a/tests/unit/layer_utils_positive.cpp +++ b/tests/unit/layer_utils_positive.cpp @@ -122,8 +122,8 @@ TEST_F(PositiveLayerUtils, IsMultiplePlaneAspect) { TEST_F(PositiveLayerUtils, IsImageLayoutDepthOnly) { ASSERT_TRUE(IsImageLayoutDepthOnly(VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL)); ASSERT_TRUE(IsImageLayoutDepthOnly(VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL)); - ASSERT_TRUE(IsImageLayoutDepthOnly(VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR)); - ASSERT_TRUE(IsImageLayoutDepthOnly(VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR)); + ASSERT_TRUE(IsImageLayoutDepthOnly(VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL)); + ASSERT_TRUE(IsImageLayoutDepthOnly(VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL)); constexpr std::array all_layouts_but_depth_only{ VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_GENERAL, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, @@ -146,12 +146,12 @@ TEST_F(PositiveLayerUtils, IsImageLayoutDepthOnly) { #ifdef VK_ENABLE_BETA_EXTENSIONS VK_IMAGE_LAYOUT_VIDEO_ENCODE_DPB_KHR, #endif - VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT, VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL_KHR, - VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL_KHR, VK_IMAGE_LAYOUT_SHADING_RATE_OPTIMAL_NV, - // VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR, - // VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR, - VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR, VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL_KHR, - VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR, VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR, VK_IMAGE_LAYOUT_MAX_ENUM}; + VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT, VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, + VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_SHADING_RATE_OPTIMAL_NV, + // VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL, + // VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL, + VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL, + VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_MAX_ENUM}; for (auto layout : all_layouts_but_depth_only) { ASSERT_FALSE(IsImageLayoutDepthOnly(layout)); @@ -161,8 +161,8 @@ TEST_F(PositiveLayerUtils, IsImageLayoutDepthOnly) { TEST_F(PositiveLayerUtils, IsImageLayoutStencilOnly) { ASSERT_TRUE(IsImageLayoutStencilOnly(VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL)); ASSERT_TRUE(IsImageLayoutStencilOnly(VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL)); - ASSERT_TRUE(IsImageLayoutStencilOnly(VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR)); - ASSERT_TRUE(IsImageLayoutStencilOnly(VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL_KHR)); + ASSERT_TRUE(IsImageLayoutStencilOnly(VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL)); + ASSERT_TRUE(IsImageLayoutStencilOnly(VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL)); constexpr std::array all_layouts_but_stencil_only{ VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_GENERAL, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, @@ -186,12 +186,12 @@ TEST_F(PositiveLayerUtils, IsImageLayoutStencilOnly) { #ifdef VK_ENABLE_BETA_EXTENSIONS VK_IMAGE_LAYOUT_VIDEO_ENCODE_DPB_KHR, #endif - VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT, VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL_KHR, - VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL_KHR, VK_IMAGE_LAYOUT_SHADING_RATE_OPTIMAL_NV, - VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR, VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR, - // VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR, - // VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL_KHR, - VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR, VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR, VK_IMAGE_LAYOUT_MAX_ENUM}; + VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT, VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_STENCIL_ATTACHMENT_OPTIMAL, + VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_SHADING_RATE_OPTIMAL_NV, + VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL, + // VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL, + // VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL, + VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_MAX_ENUM}; for (auto layout : all_layouts_but_stencil_only) { ASSERT_FALSE(IsImageLayoutStencilOnly(layout)); diff --git a/tests/unit/memory.cpp b/tests/unit/memory.cpp index 4d617ac7017..f46e3ccb96e 100644 --- a/tests/unit/memory.cpp +++ b/tests/unit/memory.cpp @@ -209,10 +209,10 @@ TEST_F(NegativeMemory, MapMemory2) { vkt::DeviceMemory memory(*m_device, memory_info); - VkMemoryMapInfoKHR map_info = vku::InitStructHelper(); + VkMemoryMapInfo map_info = vku::InitStructHelper(); map_info.memory = memory; - VkMemoryUnmapInfoKHR unmap_info = vku::InitStructHelper(); + VkMemoryUnmapInfo unmap_info = vku::InitStructHelper(); unmap_info.memory = memory; uint8_t *pData; @@ -313,7 +313,7 @@ TEST_F(NegativeMemory, MapMemory2WithoutHostVisibleBit) { vkt::DeviceMemory memory(*m_device, mem_alloc); - VkMemoryMapInfoKHR map_info = vku::InitStructHelper(); + VkMemoryMapInfo map_info = vku::InitStructHelper(); map_info.memory = memory.handle(); map_info.offset = 0; map_info.size = 32; @@ -349,7 +349,7 @@ TEST_F(NegativeMemory, MapMemoryPlaced) { vkt::DeviceMemory memory(*m_device, memory_info); - VkMemoryMapInfoKHR map_info = vku::InitStructHelper(); + VkMemoryMapInfo map_info = vku::InitStructHelper(); map_info.memory = memory; map_info.flags = VK_MEMORY_MAP_PLACED_BIT_EXT; map_info.offset = 0; @@ -416,7 +416,7 @@ TEST_F(NegativeMemory, MemoryMapRangePlacedEnabled) { VkMemoryMapPlacedInfoEXT placed_info = vku::InitStructHelper(); placed_info.pPlacedAddress = addr; - VkMemoryMapInfoKHR map_info = vku::InitStructHelper(&placed_info); + VkMemoryMapInfo map_info = vku::InitStructHelper(&placed_info); map_info.memory = memory; map_info.flags = VK_MEMORY_MAP_PLACED_BIT_EXT; map_info.size = VK_WHOLE_SIZE; @@ -467,7 +467,7 @@ TEST_F(NegativeMemory, MemoryMapRangePlacedDisabled) { VkMemoryMapPlacedInfoEXT placed_info = vku::InitStructHelper(); placed_info.pPlacedAddress = addr; - VkMemoryMapInfoKHR map_info = vku::InitStructHelper(&placed_info); + VkMemoryMapInfo map_info = vku::InitStructHelper(&placed_info); map_info.memory = memory; map_info.flags = VK_MEMORY_MAP_PLACED_BIT_EXT; map_info.size = VK_WHOLE_SIZE; @@ -1367,7 +1367,7 @@ TEST_F(NegativeMemory, DedicatedAllocationBinding) { auto buffer_info = vkt::Buffer::CreateInfo(resource_size, VK_BUFFER_USAGE_TRANSFER_DST_BIT); vkt::Buffer buffer(*m_device, buffer_info, vkt::no_mem); auto buffer_alloc_info = vkt::DeviceMemory::GetResourceAllocInfo(*m_device, buffer.MemoryRequirements(), mem_flags); - VkMemoryDedicatedAllocateInfoKHR buffer_dedicated_info = vku::InitStructHelper(); + VkMemoryDedicatedAllocateInfo buffer_dedicated_info = vku::InitStructHelper(); buffer_dedicated_info.buffer = buffer.handle(); buffer_alloc_info.pNext = &buffer_dedicated_info; vkt::DeviceMemory dedicated_buffer_memory; @@ -1398,7 +1398,7 @@ TEST_F(NegativeMemory, DedicatedAllocationBinding) { vkt::Image image(*m_device, image_info, vkt::no_mem); vkt::Image wrong_image(*m_device, image_info, vkt::no_mem); - VkMemoryDedicatedAllocateInfoKHR image_dedicated_info = vku::InitStructHelper(); + VkMemoryDedicatedAllocateInfo image_dedicated_info = vku::InitStructHelper(); image_dedicated_info.image = image.handle(); auto image_alloc_info = vkt::DeviceMemory::GetResourceAllocInfo(*m_device, image.MemoryRequirements(), mem_flags); image_alloc_info.pNext = &image_dedicated_info; @@ -1438,7 +1438,7 @@ TEST_F(NegativeMemory, DedicatedAllocationImageAliasing) { vkt::Image identical_image(*m_device, image_info, vkt::no_mem); vkt::Image post_delete_image(*m_device, image_info, vkt::no_mem); - VkMemoryDedicatedAllocateInfoKHR image_dedicated_info = vku::InitStructHelper(); + VkMemoryDedicatedAllocateInfo image_dedicated_info = vku::InitStructHelper(); image_dedicated_info.image = image.handle(); auto image_alloc_info = vkt::DeviceMemory::GetResourceAllocInfo(*m_device, image.MemoryRequirements(), mem_flags); image_alloc_info.pNext = &image_dedicated_info; @@ -1499,8 +1499,8 @@ TEST_F(NegativeMemory, BufferDeviceAddressEXT) { VkBufferCreateInfo buffer_create_info = vku::InitStructHelper(); buffer_create_info.size = sizeof(uint32_t); - buffer_create_info.usage = VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_EXT; - buffer_create_info.flags = VK_BUFFER_CREATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT_EXT; + buffer_create_info.usage = VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT; + buffer_create_info.flags = VK_BUFFER_CREATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT; CreateBufferTest(*this, &buffer_create_info, "VUID-VkBufferCreateInfo-flags-03338"); buffer_create_info.flags = 0; @@ -1512,7 +1512,7 @@ TEST_F(NegativeMemory, BufferDeviceAddressEXT) { buffer_create_info.pNext = nullptr; vkt::Buffer buffer(*m_device, buffer_create_info, vkt::no_mem); - VkBufferDeviceAddressInfoEXT info = vku::InitStructHelper(); + VkBufferDeviceAddressInfo info = vku::InitStructHelper(); info.buffer = buffer; m_errorMonitor->SetDesiredError("VUID-VkBufferDeviceAddressInfo-buffer-02600"); @@ -1546,7 +1546,7 @@ TEST_F(NegativeMemory, BufferDeviceAddressEXTDisabled) { buffer_create_info.usage = VK_BUFFER_USAGE_INDEX_BUFFER_BIT; vkt::Buffer buffer(*m_device, buffer_create_info, vkt::no_mem); - VkBufferDeviceAddressInfoEXT info = vku::InitStructHelper(); + VkBufferDeviceAddressInfo info = vku::InitStructHelper(); info.buffer = buffer; m_errorMonitor->SetDesiredError("VUID-vkGetBufferDeviceAddress-bufferDeviceAddress-03324"); @@ -1566,12 +1566,12 @@ TEST_F(NegativeMemory, BufferDeviceAddressKHR) { VkBufferCreateInfo buffer_create_info = vku::InitStructHelper(); buffer_create_info.size = sizeof(uint32_t); - buffer_create_info.usage = VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR; - buffer_create_info.flags = VK_BUFFER_CREATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT_KHR; + buffer_create_info.usage = VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT; + buffer_create_info.flags = VK_BUFFER_CREATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT; CreateBufferTest(*this, &buffer_create_info, "VUID-VkBufferCreateInfo-flags-03338"); buffer_create_info.flags = 0; - VkBufferOpaqueCaptureAddressCreateInfoKHR addr_ci = vku::InitStructHelper(); + VkBufferOpaqueCaptureAddressCreateInfo addr_ci = vku::InitStructHelper(); addr_ci.opaqueCaptureAddress = 1; buffer_create_info.pNext = &addr_ci; CreateBufferTest(*this, &buffer_create_info, "VUID-VkBufferCreateInfo-opaqueCaptureAddress-03337"); @@ -1579,7 +1579,7 @@ TEST_F(NegativeMemory, BufferDeviceAddressKHR) { buffer_create_info.pNext = nullptr; vkt::Buffer buffer(*m_device, buffer_create_info, vkt::no_mem); - VkBufferDeviceAddressInfoKHR info = vku::InitStructHelper(); + VkBufferDeviceAddressInfo info = vku::InitStructHelper(); info.buffer = buffer; m_errorMonitor->SetDesiredError("VUID-VkBufferDeviceAddressInfo-buffer-02600"); @@ -1598,7 +1598,7 @@ TEST_F(NegativeMemory, BufferDeviceAddressKHR) { vk::BindBufferMemory(device(), buffer, buffer_mem, 0); m_errorMonitor->VerifyFound(); - VkDeviceMemoryOpaqueCaptureAddressInfoKHR mem_opaque_addr_info = vku::InitStructHelper(); + VkDeviceMemoryOpaqueCaptureAddressInfo mem_opaque_addr_info = vku::InitStructHelper(); mem_opaque_addr_info.memory = buffer_mem; m_errorMonitor->SetDesiredError("VUID-VkDeviceMemoryOpaqueCaptureAddressInfo-memory-03336"); vk::GetDeviceMemoryOpaqueCaptureAddressKHR(device(), &mem_opaque_addr_info); @@ -1611,7 +1611,7 @@ TEST_F(NegativeMemory, BufferDeviceAddressKHR) { vk::FreeMemory(device(), buffer_mem, NULL); VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; buffer_alloc_info.pNext = &alloc_flags; vk::AllocateMemory(device(), &buffer_alloc_info, NULL, &buffer_mem); @@ -1637,7 +1637,7 @@ TEST_F(NegativeMemory, BufferDeviceAddressKHRDisabled) { buffer_create_info.usage = VK_BUFFER_USAGE_INDEX_BUFFER_BIT; vkt::Buffer buffer(*m_device, buffer_create_info, vkt::no_mem); - VkBufferDeviceAddressInfoKHR info = vku::InitStructHelper(); + VkBufferDeviceAddressInfo info = vku::InitStructHelper(); info.buffer = buffer; m_errorMonitor->SetDesiredError("VUID-vkGetBufferDeviceAddress-bufferDeviceAddress-03324"); @@ -1657,7 +1657,7 @@ TEST_F(NegativeMemory, BufferDeviceAddressKHRDisabled) { m_device->Physical().SetMemoryType(buffer_mem_reqs.memoryTypeBits, &buffer_alloc_info, 0); VkDeviceMemory buffer_mem; vk::AllocateMemory(device(), &buffer_alloc_info, NULL, &buffer_mem); - VkDeviceMemoryOpaqueCaptureAddressInfoKHR mem_opaque_addr_info = vku::InitStructHelper(); + VkDeviceMemoryOpaqueCaptureAddressInfo mem_opaque_addr_info = vku::InitStructHelper(); mem_opaque_addr_info.memory = buffer_mem; m_errorMonitor->SetDesiredError("VUID-vkGetDeviceMemoryOpaqueCaptureAddress-None-03334"); m_errorMonitor->SetDesiredError("VUID-VkDeviceMemoryOpaqueCaptureAddressInfo-memory-03336"); @@ -1667,7 +1667,7 @@ TEST_F(NegativeMemory, BufferDeviceAddressKHRDisabled) { vk::FreeMemory(device(), buffer_mem, NULL); VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR | VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT | VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_CAPTURE_REPLAY_BIT; buffer_alloc_info.pNext = &alloc_flags; m_errorMonitor->SetDesiredError("VUID-VkMemoryAllocateInfo-flags-03330"); @@ -2103,7 +2103,7 @@ TEST_F(NegativeMemory, DeviceImageMemoryRequirementsDisjoint) { VkDeviceImageMemoryRequirementsKHR device_image_memory_requirements = vku::InitStructHelper(); device_image_memory_requirements.pCreateInfo = &image_create_info; - device_image_memory_requirements.planeAspect = VK_IMAGE_ASPECT_NONE_KHR; + device_image_memory_requirements.planeAspect = VK_IMAGE_ASPECT_NONE; VkMemoryRequirements2 memory_requirements = vku::InitStructHelper(); diff --git a/tests/unit/memory_positive.cpp b/tests/unit/memory_positive.cpp index 17049345270..cdcfbf12842 100644 --- a/tests/unit/memory_positive.cpp +++ b/tests/unit/memory_positive.cpp @@ -41,7 +41,7 @@ TEST_F(PositiveMemory, MapMemory2) { vkt::DeviceMemory memory(*m_device, memory_info); - VkMemoryMapInfoKHR map_info = vku::InitStructHelper(); + VkMemoryMapInfo map_info = vku::InitStructHelper(); map_info.memory = memory; map_info.offset = 0; map_info.size = memory_info.allocationSize; @@ -104,7 +104,7 @@ TEST_F(PositiveMemory, MapMemoryPlaced) { uintptr_t align_1 = map_placed_props.minPlacedMemoryMapAlignment - 1; void *addr = reinterpret_cast((reinterpret_cast(reservation) + align_1) & ~align_1); - VkMemoryMapInfoKHR map_info = vku::InitStructHelper(); + VkMemoryMapInfo map_info = vku::InitStructHelper(); map_info.memory = memory; map_info.flags = VK_MEMORY_MAP_PLACED_BIT_EXT; map_info.offset = 0; @@ -127,7 +127,7 @@ TEST_F(PositiveMemory, MapMemoryPlaced) { /* Write some data and make sure we don't fault */ memset(pData, 0x5c, allocation_size); - VkMemoryUnmapInfoKHR unmap_info = vku::InitStructHelper(); + VkMemoryUnmapInfo unmap_info = vku::InitStructHelper(); unmap_info.memory = memory; unmap_info.flags = VK_MEMORY_UNMAP_RESERVE_BIT_EXT; @@ -167,9 +167,9 @@ TEST_F(PositiveMemory, GetMemoryRequirements2) { *m_device, vkt::Buffer::CreateInfo(1024, VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT), vkt::no_mem); // Use extension to get buffer memory requirements - VkBufferMemoryRequirementsInfo2KHR buffer_info = {VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR, nullptr, - buffer.handle()}; - VkMemoryRequirements2KHR buffer_reqs = {VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR}; + VkBufferMemoryRequirementsInfo2 buffer_info = {VK_STRUCTURE_TYPE_BUFFER_MEMORY_REQUIREMENTS_INFO_2_KHR, nullptr, + buffer.handle()}; + VkMemoryRequirements2 buffer_reqs = {VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR}; vk::GetBufferMemoryRequirements2KHR(device(), &buffer_info, &buffer_reqs); // Allocate and bind buffer memory @@ -188,9 +188,8 @@ TEST_F(PositiveMemory, GetMemoryRequirements2) { vkt::Image image(*m_device, image_ci, vkt::no_mem); // Use extension to get image memory requirements - VkImageMemoryRequirementsInfo2KHR image_info = {VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR, nullptr, - image.handle()}; - VkMemoryRequirements2KHR image_reqs = {VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR}; + VkImageMemoryRequirementsInfo2 image_info = {VK_STRUCTURE_TYPE_IMAGE_MEMORY_REQUIREMENTS_INFO_2_KHR, nullptr, image.handle()}; + VkMemoryRequirements2 image_reqs = {VK_STRUCTURE_TYPE_MEMORY_REQUIREMENTS_2_KHR}; vk::GetImageMemoryRequirements2KHR(device(), &image_info, &image_reqs); // Allocate and bind image memory @@ -234,8 +233,8 @@ TEST_F(PositiveMemory, BindMemory2) { buffer_memory.init(*m_device, vkt::DeviceMemory::GetResourceAllocInfo(*m_device, buffer.MemoryRequirements(), 0)); // Bind buffer memory with extension - VkBindBufferMemoryInfoKHR buffer_bind_info = {VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHR, nullptr, buffer.handle(), - buffer_memory.handle(), 0}; + VkBindBufferMemoryInfo buffer_bind_info = {VK_STRUCTURE_TYPE_BIND_BUFFER_MEMORY_INFO_KHR, nullptr, buffer.handle(), + buffer_memory.handle(), 0}; vk::BindBufferMemory2KHR(device(), 1, &buffer_bind_info); // Create a test image @@ -253,8 +252,8 @@ TEST_F(PositiveMemory, BindMemory2) { image_memory.init(*m_device, vkt::DeviceMemory::GetResourceAllocInfo(*m_device, image.MemoryRequirements(), 0)); // Bind image memory with extension - VkBindImageMemoryInfoKHR image_bind_info = {VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO_KHR, nullptr, image.handle(), - image_memory.handle(), 0}; + VkBindImageMemoryInfo image_bind_info = {VK_STRUCTURE_TYPE_BIND_IMAGE_MEMORY_INFO_KHR, nullptr, image.handle(), + image_memory.handle(), 0}; vk::BindImageMemory2KHR(device(), 1, &image_bind_info); // Now execute arbitrary commands that use the test buffer and image diff --git a/tests/unit/mesh.cpp b/tests/unit/mesh.cpp index 6832c6cd940..934915c5008 100644 --- a/tests/unit/mesh.cpp +++ b/tests/unit/mesh.cpp @@ -197,10 +197,8 @@ TEST_F(NegativeMesh, BasicUsage) { // invalid dynamic state with mesh shader std::vector dyn_states[] = { - {VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT}, - {VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT}, - {VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT}, - {VK_DYNAMIC_STATE_PATCH_CONTROL_POINTS_EXT}, + {VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY}, {VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE}, + {VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE}, {VK_DYNAMIC_STATE_PATCH_CONTROL_POINTS_EXT}, {VK_DYNAMIC_STATE_VERTEX_INPUT_EXT}, }; const char *err_vuids[] = { diff --git a/tests/unit/multiview.cpp b/tests/unit/multiview.cpp index e66a95b379f..442c5bbf6f4 100644 --- a/tests/unit/multiview.cpp +++ b/tests/unit/multiview.cpp @@ -1141,7 +1141,7 @@ TEST_F(NegativeMultiview, DynamicRenderingMaxMultiviewInstanceIndex) { color_attachment.loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; color_attachment.storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - VkRenderingInfoKHR renderingInfo = vku::InitStructHelper(); + VkRenderingInfo renderingInfo = vku::InitStructHelper(); renderingInfo.renderArea = {{0, 0}, {100u, 100u}}; renderingInfo.layerCount = 1u; renderingInfo.colorAttachmentCount = 1u; diff --git a/tests/unit/object_lifetime.cpp b/tests/unit/object_lifetime.cpp index 07c0dcdfc29..e997f588bac 100644 --- a/tests/unit/object_lifetime.cpp +++ b/tests/unit/object_lifetime.cpp @@ -182,14 +182,14 @@ TEST_F(NegativeObjectLifetime, Sync2CmdBarrierBufferDestroyed) { m_errorMonitor->SetDesiredError("VUID-vkEndCommandBuffer-commandBuffer-00059"); m_command_buffer.Begin(); - VkBufferMemoryBarrier2KHR buf_barrier = vku::InitStructHelper(); + VkBufferMemoryBarrier2 buf_barrier = vku::InitStructHelper(); buf_barrier.buffer = buffer; buf_barrier.offset = 0; buf_barrier.size = VK_WHOLE_SIZE; buf_barrier.srcStageMask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; buf_barrier.dstStageMask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; - VkDependencyInfoKHR dep_info = vku::InitStructHelper(); + VkDependencyInfo dep_info = vku::InitStructHelper(); dep_info.bufferMemoryBarrierCount = 1; dep_info.pBufferMemoryBarriers = &buf_barrier; @@ -239,13 +239,13 @@ TEST_F(NegativeObjectLifetime, Sync2CmdBarrierImageDestroyed) { m_errorMonitor->SetDesiredError("VUID-vkEndCommandBuffer-commandBuffer-00059"); m_command_buffer.Begin(); - VkImageMemoryBarrier2KHR img_barrier = vku::InitStructHelper(); + VkImageMemoryBarrier2 img_barrier = vku::InitStructHelper(); img_barrier.image = image; img_barrier.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}; img_barrier.srcStageMask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; img_barrier.dstStageMask = VK_PIPELINE_STAGE_ALL_COMMANDS_BIT; - VkDependencyInfoKHR dep_info = vku::InitStructHelper(); + VkDependencyInfo dep_info = vku::InitStructHelper(); dep_info.imageMemoryBarrierCount = 1; dep_info.pImageMemoryBarriers = &img_barrier; @@ -752,8 +752,7 @@ TEST_F(NegativeObjectLifetime, PushDescriptorUniformDestroySignaled) { const vkt::DescriptorSetLayout ds_layout(*m_device, {dsl_binding}); // Create push descriptor set layout - const vkt::DescriptorSetLayout push_ds_layout(*m_device, {dsl_binding}, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR); + const vkt::DescriptorSetLayout push_ds_layout(*m_device, {dsl_binding}, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT); // Use helper to create graphics pipeline CreatePipelineHelper helper(*this); diff --git a/tests/unit/other_positive.cpp b/tests/unit/other_positive.cpp index f1cf13935a6..4128d2a00d6 100644 --- a/tests/unit/other_positive.cpp +++ b/tests/unit/other_positive.cpp @@ -268,7 +268,7 @@ TEST_F(VkPositiveLayerTest, Vulkan12FeaturesBufferDeviceAddress) { RETURN_IF_SKIP(InitState(nullptr, &features2)); VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; vkt::Buffer buffer(*m_device, 1024, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &alloc_flags); (void)buffer.Address(); @@ -606,7 +606,7 @@ TEST_F(VkPositiveLayerTest, InstanceExtensionsCallingDeviceStruct0) { TEST_F(VkPositiveLayerTest, InstanceExtensionsCallingDeviceStruct1) { TEST_DESCRIPTION( - "Use VkBufferUsageFlags2CreateInfoKHR with VkPhysicalDeviceExternalBufferInfo if VK_KHR_maintenance5 is available"); + "Use VkBufferUsageFlags2CreateInfo with VkPhysicalDeviceExternalBufferInfo if VK_KHR_maintenance5 is available"); SetTargetApiVersion(VK_API_VERSION_1_1); RETURN_IF_SKIP(Init()); if (!DeviceExtensionSupported(Gpu(), nullptr, VK_KHR_MAINTENANCE_5_EXTENSION_NAME)) { @@ -614,14 +614,14 @@ TEST_F(VkPositiveLayerTest, InstanceExtensionsCallingDeviceStruct1) { } #ifdef _WIN32 - const auto handle_type = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR; + const auto handle_type = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT; #else - const auto handle_type = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR; + const auto handle_type = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT; #endif // Requires device extension (VK_KHR_maintenance5) - VkBufferUsageFlags2CreateInfoKHR bufferUsageFlags2 = vku::InitStructHelper(); - bufferUsageFlags2.usage = VK_BUFFER_USAGE_2_TRANSFER_SRC_BIT_KHR; + VkBufferUsageFlags2CreateInfo bufferUsageFlags2 = vku::InitStructHelper(); + bufferUsageFlags2.usage = VK_BUFFER_USAGE_2_TRANSFER_SRC_BIT; VkPhysicalDeviceExternalBufferInfo externalBufferInfo = vku::InitStructHelper(&bufferUsageFlags2); externalBufferInfo.handleType = handle_type; diff --git a/tests/unit/others.cpp b/tests/unit/others.cpp index 2f8960e9024..32e5e4420a7 100644 --- a/tests/unit/others.cpp +++ b/tests/unit/others.cpp @@ -971,7 +971,7 @@ TEST_F(VkLayerTest, GetCalibratedTimestampsDuplicateKHR) { uint32_t count = 0; vk::GetPhysicalDeviceCalibrateableTimeDomainsKHR(Gpu(), &count, nullptr); - std::vector time_domains(count); + std::vector time_domains(count); vk::GetPhysicalDeviceCalibrateableTimeDomainsKHR(Gpu(), &count, time_domains.data()); VkCalibratedTimestampInfoEXT timestamp_infos[2]; @@ -999,12 +999,12 @@ TEST_F(VkLayerTest, GetCalibratedTimestampsQuery) { vk::GetPhysicalDeviceCalibrateableTimeDomainsEXT(Gpu(), &count, time_domains.data()); for (uint32_t i = 0; i < count; i++) { - if (time_domains[i] == VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT) { - GTEST_SKIP() << "Support for VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT"; + if (time_domains[i] == VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_KHR) { + GTEST_SKIP() << "Support for VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_KHR"; } } VkCalibratedTimestampInfoEXT timestamp_info = vku::InitStructHelper(); - timestamp_info.timeDomain = VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_EXT; + timestamp_info.timeDomain = VK_TIME_DOMAIN_QUERY_PERFORMANCE_COUNTER_KHR; uint64_t timestamp; uint64_t max_deviation; @@ -1228,9 +1228,9 @@ TEST_F(VkLayerTest, InvalidGetExternalBufferPropertiesUsage) { RETURN_IF_SKIP(Init()); #ifdef _WIN32 - const auto handle_type = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR; + const auto handle_type = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT; #else - const auto handle_type = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR; + const auto handle_type = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT; #endif VkPhysicalDeviceExternalBufferInfo externalBufferInfo = vku::InitStructHelper(); @@ -1273,8 +1273,8 @@ TEST_F(VkLayerTest, MissingExtensionStruct) { vkt::Buffer buffer(*m_device, 32, VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT); // added in VK_KHR_maintenance5 - VkBufferUsageFlags2CreateInfoKHR buffer_usage_flags = vku::InitStructHelper(); - buffer_usage_flags.usage = VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR; + VkBufferUsageFlags2CreateInfo buffer_usage_flags = vku::InitStructHelper(); + buffer_usage_flags.usage = VK_BUFFER_USAGE_2_UNIFORM_TEXEL_BUFFER_BIT; VkBufferViewCreateInfo buffer_view_ci = vku::InitStructHelper(&buffer_usage_flags); buffer_view_ci.format = VK_FORMAT_R8G8B8A8_UNORM; diff --git a/tests/unit/parent.cpp b/tests/unit/parent.cpp index b04f235b3f5..73ad5fc4dd3 100644 --- a/tests/unit/parent.cpp +++ b/tests/unit/parent.cpp @@ -257,7 +257,7 @@ TEST_F(NegativeParent, RenderPassCommandBuffer) { // one for each the framebuffer and renderpass being different from the CommandBuffer m_errorMonitor->SetDesiredError("VUID-VkRenderPassBeginInfo-commonparent"); m_errorMonitor->SetDesiredError("VUID-VkRenderPassBeginInfo-commonparent"); - auto subpass_begin_info = vku::InitStruct(nullptr, VK_SUBPASS_CONTENTS_INLINE); + auto subpass_begin_info = vku::InitStruct(nullptr, VK_SUBPASS_CONTENTS_INLINE); vk::CmdBeginRenderPass2(command_buffer.handle(), &m_renderPassBeginInfo, &subpass_begin_info); m_errorMonitor->VerifyFound(); command_buffer.End(); @@ -830,7 +830,7 @@ TEST_F(NegativeParent, MapMemory2) { m_device->Physical().SetMemoryType(vvl::kU32Max, &memory_info, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT); vkt::DeviceMemory memory(*m_second_device, memory_info); - VkMemoryMapInfoKHR map_info = vku::InitStructHelper(); + VkMemoryMapInfo map_info = vku::InitStructHelper(); map_info.memory = memory; map_info.offset = 0; map_info.size = memory_info.allocationSize; diff --git a/tests/unit/pipeline.cpp b/tests/unit/pipeline.cpp index 9a9d0aef92f..385b8c7acb6 100644 --- a/tests/unit/pipeline.cpp +++ b/tests/unit/pipeline.cpp @@ -776,13 +776,13 @@ TEST_F(NegativePipeline, PipelineCreationCacheControl) { InitRenderTarget(); const auto set_graphics_flags = [&](CreatePipelineHelper &helper) { - helper.gp_ci_.flags = VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT; + helper.gp_ci_.flags = VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT; }; CreatePipelineHelper::OneshotTest(*this, set_graphics_flags, kErrorBit, "VUID-VkGraphicsPipelineCreateInfo-pipelineCreationCacheControl-02878"); const auto set_compute_flags = [&](CreateComputePipelineHelper &helper) { - helper.cp_ci_.flags = VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT_EXT; + helper.cp_ci_.flags = VK_PIPELINE_CREATE_EARLY_RETURN_ON_FAILURE_BIT; }; CreateComputePipelineHelper::OneshotTest(*this, set_compute_flags, kErrorBit, "VUID-VkComputePipelineCreateInfo-pipelineCreationCacheControl-02875"); @@ -790,7 +790,7 @@ TEST_F(NegativePipeline, PipelineCreationCacheControl) { VkPipelineCache pipeline_cache; VkPipelineCacheCreateInfo cache_create_info = vku::InitStructHelper(); cache_create_info.initialDataSize = 0; - cache_create_info.flags = VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT_EXT; + cache_create_info.flags = VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT; m_errorMonitor->SetDesiredError("VUID-VkPipelineCacheCreateInfo-pipelineCreationCacheControl-02892"); vk::CreatePipelineCache(device(), &cache_create_info, nullptr, &pipeline_cache); m_errorMonitor->VerifyFound(); @@ -1532,8 +1532,8 @@ TEST_F(NegativePipeline, CreationFeedbackCount) { GTEST_SKIP() << "Driver data writeback check not supported by MockICD"; } - VkPipelineCreationFeedbackCreateInfoEXT feedback_info = vku::InitStructHelper(); - VkPipelineCreationFeedbackEXT feedbacks[3] = {}; + VkPipelineCreationFeedbackCreateInfo feedback_info = vku::InitStructHelper(); + VkPipelineCreationFeedback feedbacks[3] = {}; // Set flags to known value that the driver has to overwrite feedbacks[0].flags = VK_PIPELINE_CREATION_FEEDBACK_FLAG_BITS_MAX_ENUM; @@ -1561,8 +1561,8 @@ TEST_F(NegativePipeline, CreationFeedbackCountCompute) { RETURN_IF_SKIP(Init()); InitRenderTarget(); - VkPipelineCreationFeedbackCreateInfoEXT feedback_info = vku::InitStructHelper(); - VkPipelineCreationFeedbackEXT feedbacks[3] = {}; + VkPipelineCreationFeedbackCreateInfo feedback_info = vku::InitStructHelper(); + VkPipelineCreationFeedback feedbacks[3] = {}; feedback_info.pPipelineCreationFeedback = &feedbacks[0]; feedback_info.pipelineStageCreationFeedbackCount = 1; feedback_info.pPipelineStageCreationFeedbacks = &feedbacks[1]; @@ -1589,7 +1589,7 @@ TEST_F(NegativePipeline, LineRasterization) { CreatePipelineHelper::OneshotTest( *this, [&](CreatePipelineHelper &helper) { - helper.line_state_ci_.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR; + helper.line_state_ci_.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_BRESENHAM; helper.ms_ci_.alphaToCoverageEnable = VK_TRUE; }, kErrorBit, vuids); @@ -1601,7 +1601,7 @@ TEST_F(NegativePipeline, LineRasterization) { CreatePipelineHelper::OneshotTest( *this, [&](CreatePipelineHelper &helper) { - helper.line_state_ci_.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_BRESENHAM_KHR; + helper.line_state_ci_.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_BRESENHAM; helper.line_state_ci_.stippledLineEnable = VK_TRUE; }, kErrorBit, vuids); @@ -1613,7 +1613,7 @@ TEST_F(NegativePipeline, LineRasterization) { CreatePipelineHelper::OneshotTest( *this, [&](CreatePipelineHelper &helper) { - helper.line_state_ci_.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_RECTANGULAR_KHR; + helper.line_state_ci_.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_RECTANGULAR; helper.line_state_ci_.stippledLineEnable = VK_TRUE; }, kErrorBit, vuids); @@ -1625,7 +1625,7 @@ TEST_F(NegativePipeline, LineRasterization) { CreatePipelineHelper::OneshotTest( *this, [&](CreatePipelineHelper &helper) { - helper.line_state_ci_.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH_KHR; + helper.line_state_ci_.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_RECTANGULAR_SMOOTH; helper.line_state_ci_.stippledLineEnable = VK_TRUE; }, kErrorBit, vuids); @@ -1636,7 +1636,7 @@ TEST_F(NegativePipeline, LineRasterization) { CreatePipelineHelper::OneshotTest( *this, [&](CreatePipelineHelper &helper) { - helper.line_state_ci_.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR; + helper.line_state_ci_.lineRasterizationMode = VK_LINE_RASTERIZATION_MODE_DEFAULT; helper.line_state_ci_.stippledLineEnable = VK_TRUE; }, kErrorBit, vuids); @@ -2900,7 +2900,7 @@ TEST_F(NegativePipeline, ShaderTileImageDisabled) { VkFormat depth_format = VK_FORMAT_D32_SFLOAT_S8_UINT; VkFormat color_format = VK_FORMAT_B8G8R8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; pipeline_rendering_info.depthAttachmentFormat = depth_format; @@ -2969,7 +2969,7 @@ TEST_F(NegativePipeline, ShaderTileImage) { VkFormat depth_format = VK_FORMAT_D32_SFLOAT_S8_UINT; VkFormat color_format = VK_FORMAT_B8G8R8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; pipeline_rendering_info.depthAttachmentFormat = depth_format; @@ -3077,7 +3077,7 @@ TEST_F(NegativePipeline, PipelineRenderingInfoInvalidFormats) { RETURN_IF_SKIP(Init()); VkPipelineRenderingCreateInfo pipeline_rendering_ci = vku::InitStructHelper(); - pipeline_rendering_ci.depthAttachmentFormat = VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK_EXT; + pipeline_rendering_ci.depthAttachmentFormat = VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK; CreatePipelineHelper pipe(*this, &pipeline_rendering_ci); pipe.gp_ci_.renderPass = VK_NULL_HANDLE; @@ -3088,7 +3088,7 @@ TEST_F(NegativePipeline, PipelineRenderingInfoInvalidFormats) { m_errorMonitor->VerifyFound(); pipeline_rendering_ci.depthAttachmentFormat = VK_FORMAT_UNDEFINED; - pipeline_rendering_ci.stencilAttachmentFormat = VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK_EXT; + pipeline_rendering_ci.stencilAttachmentFormat = VK_FORMAT_ASTC_12x12_SFLOAT_BLOCK; m_errorMonitor->SetDesiredError("VUID-VkGraphicsPipelineCreateInfo-renderPass-06584"); m_errorMonitor->SetDesiredError("VUID-VkGraphicsPipelineCreateInfo-renderPass-06588"); pipe.CreateGraphicsPipeline(); @@ -3182,7 +3182,7 @@ TEST_F(NegativePipeline, MismatchedRasterizationSamples) { vkt::ImageView image_view = image.CreateView(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = image_view; color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; @@ -3196,7 +3196,7 @@ TEST_F(NegativePipeline, MismatchedRasterizationSamples) { rendering_info.colorAttachmentCount = 1u; rendering_info.pColorAttachments = &color_attachment; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &image_ci.format; @@ -3268,7 +3268,7 @@ TEST_F(NegativePipeline, MissingPipelineFormat) { vkt::Image ds_image(*m_device, 32, 32, 1, ds_format, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT); vkt::ImageView ds_image_view = ds_image.CreateView(VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT); - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1u; pipeline_rendering_info.pColorAttachmentFormats = &undefined; pipeline_rendering_info.depthAttachmentFormat = ds_format; @@ -3391,7 +3391,7 @@ TEST_F(NegativePipeline, MissingPipelineViewportState) { } { CreatePipelineHelper pipe(*this); - pipe.AddDynamicState(VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT_EXT); + pipe.AddDynamicState(VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT); pipe.AddDynamicState(VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE); pipe.gp_ci_.pViewportState = nullptr; @@ -3523,18 +3523,18 @@ TEST_F(NegativePipeline, PipelineCreationFlags2CacheControl) { RETURN_IF_SKIP(Init()); InitRenderTarget(); - VkPipelineCreateFlags2CreateInfoKHR flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo flags2 = vku::InitStructHelper(); const auto set_graphics_flags = [&](CreatePipelineHelper &helper) { helper.gp_ci_.pNext = &flags2; - flags2.flags = VK_PIPELINE_CREATE_2_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_KHR; + flags2.flags = VK_PIPELINE_CREATE_2_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT; }; CreatePipelineHelper::OneshotTest(*this, set_graphics_flags, kErrorBit, "VUID-VkGraphicsPipelineCreateInfo-pipelineCreationCacheControl-02878"); const auto set_compute_flags = [&](CreateComputePipelineHelper &helper) { helper.cp_ci_.pNext = &flags2; - flags2.flags = VK_PIPELINE_CREATE_2_EARLY_RETURN_ON_FAILURE_BIT_KHR; + flags2.flags = VK_PIPELINE_CREATE_2_EARLY_RETURN_ON_FAILURE_BIT; }; CreateComputePipelineHelper::OneshotTest(*this, set_compute_flags, kErrorBit, "VUID-VkComputePipelineCreateInfo-pipelineCreationCacheControl-02875"); @@ -3597,13 +3597,13 @@ TEST_F(NegativePipeline, ViewportStateScissorNegative) { } TEST_F(NegativePipeline, PipelineCreateFlags2) { - TEST_DESCRIPTION("Test using VkPipelineCreateFlags2CreateInfoKHR"); + TEST_DESCRIPTION("Test using VkPipelineCreateFlags2CreateInfo"); SetTargetApiVersion(VK_API_VERSION_1_1); AddRequiredExtensions(VK_KHR_MAINTENANCE_5_EXTENSION_NAME); RETURN_IF_SKIP(Init()); InitRenderTarget(); - VkPipelineCreateFlags2CreateInfoKHR flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo flags2 = vku::InitStructHelper(); flags2.flags = VK_PIPELINE_CREATE_LIBRARY_BIT_KHR; CreatePipelineHelper pipe(*this, &flags2); @@ -3687,7 +3687,7 @@ TEST_F(NegativePipeline, NoRasterizationStateDynamicRendering) { RETURN_IF_SKIP(Init()); VkFormat color_formats = VK_FORMAT_UNDEFINED; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_formats; diff --git a/tests/unit/pipeline_advanced_blend.cpp b/tests/unit/pipeline_advanced_blend.cpp index f900444dd31..cc87e8c9c85 100644 --- a/tests/unit/pipeline_advanced_blend.cpp +++ b/tests/unit/pipeline_advanced_blend.cpp @@ -120,7 +120,7 @@ TEST_F(NegativePipelineAdvancedBlend, MaxBlendAttachmentDynamicRendering) { } VkFormat color_formats[3] = {VK_FORMAT_R8G8B8A8_UNORM, VK_FORMAT_R8G8B8A8_UNORM, VK_FORMAT_R8G8B8A8_UNORM}; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 3; pipeline_rendering_info.pColorAttachmentFormats = color_formats; diff --git a/tests/unit/pipeline_binary.cpp b/tests/unit/pipeline_binary.cpp index 52b8f9060d6..7f3747afd82 100644 --- a/tests/unit/pipeline_binary.cpp +++ b/tests/unit/pipeline_binary.cpp @@ -92,7 +92,7 @@ TEST_F(NegativePipelineBinary, ReleaseCapturedDataAllocator) { compute_create_info.stage = cs.GetStageCreateInfo(); compute_create_info.layout = pipeline_layout.handle(); - VkPipelineCreateFlags2CreateInfoKHR flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo flags2 = vku::InitStructHelper(); flags2.flags = VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR; compute_create_info.pNext = &flags2; @@ -140,7 +140,7 @@ TEST_F(NegativePipelineBinary, ReleaseCapturedData) { m_errorMonitor->VerifyFound(); } - VkPipelineCreateFlags2CreateInfoKHR flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo flags2 = vku::InitStructHelper(); flags2.flags = VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR; CreateComputePipelineHelper pipe2(*this, &flags2); @@ -167,7 +167,7 @@ TEST_F(NegativePipelineBinary, Destroy) { AddRequiredFeature(vkt::Feature::pipelineBinaries); RETURN_IF_SKIP(Init()); - VkPipelineCreateFlags2CreateInfoKHR flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo flags2 = vku::InitStructHelper(); flags2.flags = VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR; CreateComputePipelineHelper pipe(*this, &flags2); @@ -227,7 +227,7 @@ TEST_F(NegativePipelineBinary, ComputePipeline) { ASSERT_EQ(VK_SUCCESS, err); { - VkPipelineCreateFlags2CreateInfoKHR flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo flags2 = vku::InitStructHelper(); flags2.flags = VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR; m_errorMonitor->SetDesiredFailureMsg(kErrorBit, "VUID-vkCreateComputePipelines-pNext-09617"); CreateComputePipelineHelper pipe(*this, &flags2); @@ -266,7 +266,7 @@ TEST_F(NegativePipelineBinary, ComputePipeline) { } { - VkPipelineCreateFlags2CreateInfoKHR flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo flags2 = vku::InitStructHelper(); flags2.flags = VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR; CreateComputePipelineHelper pipe(*this, &flags2); @@ -298,7 +298,7 @@ TEST_F(NegativePipelineBinary, ComputePipeline) { feedback.flags = VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT | VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT; - flags2.flags |= VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT; + flags2.flags |= VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT; flags2.pNext = &binary_info; binary_info.pNext = &feedback_create_info; @@ -392,7 +392,7 @@ TEST_F(NegativePipelineBinary, GraphicsPipeline) { 0}; { - VkPipelineCreateFlags2CreateInfoKHR flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo flags2 = vku::InitStructHelper(); flags2.flags = VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR; graphics_pipeline_create_info.pNext = &flags2; @@ -438,7 +438,7 @@ TEST_F(NegativePipelineBinary, GraphicsPipeline) { } { - VkPipelineCreateFlags2CreateInfoKHR flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo flags2 = vku::InitStructHelper(); flags2.flags = VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR; graphics_pipeline_create_info.pNext = &flags2; @@ -473,7 +473,7 @@ TEST_F(NegativePipelineBinary, GraphicsPipeline) { feedback.flags = VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT | VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT; - flags2.flags |= VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT; + flags2.flags |= VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT; flags2.pNext = &binary_info; binary_info.pNext = &feedback_create_info; @@ -530,7 +530,7 @@ TEST_F(NegativePipelineBinary, Creation2) { AddRequiredFeature(vkt::Feature::pipelineBinaries); RETURN_IF_SKIP(Init()); - VkPipelineCreateFlags2CreateInfoKHR flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo flags2 = vku::InitStructHelper(); flags2.flags = VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR; CreateComputePipelineHelper pipe(*this, &flags2); @@ -581,7 +581,7 @@ TEST_F(NegativePipelineBinary, Creation3) { compute_create_info.stage = cs.GetStageCreateInfo(); compute_create_info.layout = pipeline_layout.handle(); - VkPipelineCreateFlags2CreateInfoKHR flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo flags2 = vku::InitStructHelper(); flags2.flags = VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR; compute_create_info.pNext = &flags2; @@ -609,7 +609,7 @@ TEST_F(NegativePipelineBinary, Creation4) { AddRequiredFeature(vkt::Feature::pipelineBinaries); RETURN_IF_SKIP(Init()); - VkPipelineCreateFlags2CreateInfoKHR flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo flags2 = vku::InitStructHelper(); flags2.flags = VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR; CreateComputePipelineHelper pipe(*this, &flags2); @@ -659,7 +659,7 @@ TEST_F(NegativePipelineBinary, Creation5) { GTEST_SKIP() << "pipelineBinaryInternalCache is VK_FALSE"; } - VkPipelineCreateFlags2CreateInfoKHR flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo flags2 = vku::InitStructHelper(); flags2.flags = VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR; CreateComputePipelineHelper pipe(*this, &flags2); @@ -729,7 +729,7 @@ TEST_F(NegativePipelineBinary, CreateCacheControl) { compute_create_info.stage = cs.GetStageCreateInfo(); compute_create_info.layout = pipeline_layout.handle(); - VkPipelineCreateFlags2CreateInfoKHR flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo flags2 = vku::InitStructHelper(); flags2.flags = VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR; compute_create_info.pNext = &flags2; diff --git a/tests/unit/pipeline_binary_positive.cpp b/tests/unit/pipeline_binary_positive.cpp index 3a64d8bafb3..a5c8c6f2a66 100644 --- a/tests/unit/pipeline_binary_positive.cpp +++ b/tests/unit/pipeline_binary_positive.cpp @@ -25,7 +25,7 @@ TEST_F(PositivePipelineBinary, CreateBinaryFromPipeline) { AddRequiredFeature(vkt::Feature::pipelineBinaries); RETURN_IF_SKIP(Init()); - VkPipelineCreateFlags2CreateInfoKHR flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo flags2 = vku::InitStructHelper(); flags2.flags = VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR; CreateComputePipelineHelper pipe(*this, &flags2); @@ -54,7 +54,7 @@ TEST_F(PositivePipelineBinary, CreateBinaryFromData) { VkResult err; - VkPipelineCreateFlags2CreateInfoKHR flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo flags2 = vku::InitStructHelper(); flags2.flags = VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR; std::vector binary_data; diff --git a/tests/unit/pipeline_layout.cpp b/tests/unit/pipeline_layout.cpp index 51105b76d4e..4a71f9f7cf4 100644 --- a/tests/unit/pipeline_layout.cpp +++ b/tests/unit/pipeline_layout.cpp @@ -969,7 +969,7 @@ TEST_F(NegativePipelineLayout, MultiplePushDescriptorSets) { for (uint32_t i = 0; i < descriptor_set_layout_count; ++i) { dsl_binding.binding = i; ds_layouts.emplace_back(*m_device, std::vector(1, dsl_binding), - VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT); } const auto &ds_vk_layouts = MakeVkHandles(ds_layouts); @@ -1029,7 +1029,7 @@ TEST_F(NegativePipelineLayout, InlineUniformBlockArray) { OneOffDescriptorSet descriptor_set(m_device, { {0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, - {1, VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT, 8, VK_SHADER_STAGE_ALL, nullptr}, + {1, VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, 8, VK_SHADER_STAGE_ALL, nullptr}, }, 0, nullptr, 0, nullptr, &pool_inline_info); const vkt::PipelineLayout pipeline_layout(*m_device, {&descriptor_set.layout_}); @@ -1065,7 +1065,7 @@ TEST_F(NegativePipelineLayout, InlineUniformBlockArrayOf1) { OneOffDescriptorSet descriptor_set(m_device, { {0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, - {1, VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT, 8, VK_SHADER_STAGE_ALL, nullptr}, + {1, VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, 8, VK_SHADER_STAGE_ALL, nullptr}, }, 0, nullptr, 0, nullptr, &pool_inline_info); const vkt::PipelineLayout pipeline_layout(*m_device, {&descriptor_set.layout_}); diff --git a/tests/unit/pipeline_positive.cpp b/tests/unit/pipeline_positive.cpp index 14ef455dc13..d232a9cf735 100644 --- a/tests/unit/pipeline_positive.cpp +++ b/tests/unit/pipeline_positive.cpp @@ -920,7 +920,7 @@ TEST_F(PositivePipeline, ShaderTileImageColor) { VkFormat depth_format = VK_FORMAT_D32_SFLOAT_S8_UINT; VkFormat color_format = VK_FORMAT_B8G8R8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; pipeline_rendering_info.depthAttachmentFormat = depth_format; @@ -954,7 +954,7 @@ TEST_F(PositivePipeline, ShaderTileImageDepth) { VkFormat depth_format = VK_FORMAT_D32_SFLOAT_S8_UINT; VkFormat color_format = VK_FORMAT_B8G8R8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; pipeline_rendering_info.depthAttachmentFormat = depth_format; @@ -984,7 +984,7 @@ TEST_F(PositivePipeline, ShaderTileImageStencil) { VkFormat depth_format = VK_FORMAT_D32_SFLOAT_S8_UINT; VkFormat color_format = VK_FORMAT_B8G8R8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_format; pipeline_rendering_info.depthAttachmentFormat = depth_format; @@ -1392,8 +1392,8 @@ TEST_F(PositivePipeline, CreationFeedbackCount0) { RETURN_IF_SKIP(Init()); InitRenderTarget(); - VkPipelineCreationFeedbackCreateInfoEXT feedback_info = vku::InitStructHelper(); - VkPipelineCreationFeedbackEXT feedbacks[1] = {}; + VkPipelineCreationFeedbackCreateInfo feedback_info = vku::InitStructHelper(); + VkPipelineCreationFeedback feedbacks[1] = {}; // Set flags to known value that the driver has to overwrite feedbacks[0].flags = VK_PIPELINE_CREATION_FEEDBACK_FLAG_BITS_MAX_ENUM; @@ -1614,7 +1614,7 @@ TEST_F(PositivePipeline, ViewportStateNotSet) { CreatePipelineHelper pipe(*this); pipe.AddDynamicState(VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT); - pipe.AddDynamicState(VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT_EXT); + pipe.AddDynamicState(VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT); pipe.AddDynamicState(VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE); pipe.gp_ci_.pViewportState = nullptr; pipe.CreateGraphicsPipeline(); @@ -1641,7 +1641,7 @@ TEST_F(PositivePipeline, ViewportStateNotSetRasterizerDiscardEnabled) { CreatePipelineHelper pipe(*this); pipe.AddDynamicState(VK_DYNAMIC_STATE_SCISSOR_WITH_COUNT); - pipe.AddDynamicState(VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT_EXT); + pipe.AddDynamicState(VK_DYNAMIC_STATE_VIEWPORT_WITH_COUNT); pipe.gp_ci_.pRasterizationState = &rasterization_state; pipe.gp_ci_.pViewportState = nullptr; pipe.shader_stages_ = {pipe.vs_->GetStageCreateInfo()}; @@ -1724,8 +1724,8 @@ TEST_F(PositivePipeline, IgnoredPipelineCreateFlags) { RETURN_IF_SKIP(Init()); InitRenderTarget(); - VkPipelineCreateFlags2CreateInfoKHR pipelineCreateFlags2 = vku::InitStructHelper(); - pipelineCreateFlags2.flags = VK_PIPELINE_CREATE_2_DISABLE_OPTIMIZATION_BIT_KHR; + VkPipelineCreateFlags2CreateInfo pipelineCreateFlags2 = vku::InitStructHelper(); + pipelineCreateFlags2.flags = VK_PIPELINE_CREATE_2_DISABLE_OPTIMIZATION_BIT; CreatePipelineHelper pipe(*this, &pipelineCreateFlags2); pipe.gp_ci_.flags = 0x80000000; @@ -1800,7 +1800,7 @@ TEST_F(PositivePipeline, NoRasterizationStateDynamicRendering) { RETURN_IF_SKIP(Init()); VkFormat color_formats = VK_FORMAT_UNDEFINED; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_formats; diff --git a/tests/unit/pipeline_topology_positive.cpp b/tests/unit/pipeline_topology_positive.cpp index 94101f24354..f8882086db5 100644 --- a/tests/unit/pipeline_topology_positive.cpp +++ b/tests/unit/pipeline_topology_positive.cpp @@ -467,7 +467,7 @@ TEST_F(PositivePipelineTopology, LineTopologyClasses) { // Verify each vkCmdSet command CreatePipelineHelper pipe(*this); - pipe.AddDynamicState(VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT); + pipe.AddDynamicState(VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY); pipe.vi_ci_.vertexBindingDescriptionCount = 1; VkVertexInputBindingDescription inputBinding = {0, sizeof(float), VK_VERTEX_INPUT_RATE_VERTEX}; pipe.vi_ci_.pVertexBindingDescriptions = &inputBinding; diff --git a/tests/unit/protected_memory.cpp b/tests/unit/protected_memory.cpp index ee9fae063db..8e1ea8f19d2 100644 --- a/tests/unit/protected_memory.cpp +++ b/tests/unit/protected_memory.cpp @@ -452,13 +452,13 @@ TEST_F(NegativeProtectedMemory, PipelineProtectedAccess) { CreatePipelineHelper pipe(*this); pipe.shader_stages_ = {pipe.vs_->GetStageCreateInfo()}; - pipe.gp_ci_.flags = VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT_EXT | VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT_EXT; + pipe.gp_ci_.flags = VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT | VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT; m_errorMonitor->SetDesiredError("VUID-VkGraphicsPipelineCreateInfo-flags-07369"); pipe.CreateGraphicsPipeline(); m_errorMonitor->VerifyFound(); - pipe.gp_ci_.flags = VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT_EXT; + pipe.gp_ci_.flags = VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT; pipe.CreateGraphicsPipeline(); m_command_buffer.Begin(); @@ -468,7 +468,7 @@ TEST_F(NegativeProtectedMemory, PipelineProtectedAccess) { CreatePipelineHelper protected_pipe(*this); protected_pipe.shader_stages_ = {protected_pipe.vs_->GetStageCreateInfo()}; - protected_pipe.gp_ci_.flags = VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT_EXT; + protected_pipe.gp_ci_.flags = VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT; protected_pipe.CreateGraphicsPipeline(); vkt::CommandPool command_pool(*m_device, m_device->graphics_queue_node_index_); @@ -513,7 +513,7 @@ TEST_F(NegativeProtectedMemory, PipelineProtectedAccess) { featureless_pipe.device_ = &test_device; featureless_pipe.rs_state_ci_.rasterizerDiscardEnable = VK_TRUE; featureless_pipe.shader_stages_ = {vs2.GetStageCreateInfo()}; - featureless_pipe.gp_ci_.flags = VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT_EXT; + featureless_pipe.gp_ci_.flags = VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT; featureless_pipe.gp_ci_.layout = test_pipeline_layout.handle(); featureless_pipe.gp_ci_.renderPass = render_pass.handle(); featureless_pipe.CreateGraphicsPipeline(); @@ -556,21 +556,21 @@ TEST_F(NegativeProtectedMemory, PipelineProtectedAccessGPL) { m_errorMonitor->SetDesiredError("VUID-VkPipelineLibraryCreateInfoKHR-pipeline-07404"); VkGraphicsPipelineCreateInfo lib_ci = vku::InitStructHelper(&link_info); - lib_ci.flags = VK_PIPELINE_CREATE_LIBRARY_BIT_KHR | VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT_EXT; + lib_ci.flags = VK_PIPELINE_CREATE_LIBRARY_BIT_KHR | VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT; lib_ci.renderPass = RenderPass(); lib_ci.layout = pre_raster_lib.gp_ci_.layout; vkt::Pipeline lib(*m_device, lib_ci); m_errorMonitor->VerifyFound(); m_errorMonitor->SetDesiredError("VUID-VkPipelineLibraryCreateInfoKHR-pipeline-07406"); - lib_ci.flags = VK_PIPELINE_CREATE_LIBRARY_BIT_KHR | VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT_EXT; + lib_ci.flags = VK_PIPELINE_CREATE_LIBRARY_BIT_KHR | VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT; vkt::Pipeline lib2(*m_device, lib_ci); m_errorMonitor->VerifyFound(); CreatePipelineHelper protected_pre_raster_lib(*this); protected_pre_raster_lib.InitPreRasterLibInfo(&stage_ci); protected_pre_raster_lib.pipeline_layout_ci_.flags |= VK_PIPELINE_LAYOUT_CREATE_INDEPENDENT_SETS_BIT_EXT; - protected_pre_raster_lib.gp_ci_.flags = VK_PIPELINE_CREATE_LIBRARY_BIT_KHR | VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT_EXT; + protected_pre_raster_lib.gp_ci_.flags = VK_PIPELINE_CREATE_LIBRARY_BIT_KHR | VK_PIPELINE_CREATE_PROTECTED_ACCESS_ONLY_BIT; ASSERT_EQ(VK_SUCCESS, protected_pre_raster_lib.CreateGraphicsPipeline()); libraries[0] = protected_pre_raster_lib.Handle(); VkGraphicsPipelineCreateInfo protected_lib_ci = vku::InitStructHelper(&link_info); @@ -585,7 +585,7 @@ TEST_F(NegativeProtectedMemory, PipelineProtectedAccessGPL) { CreatePipelineHelper unprotected_pre_raster_lib(*this); unprotected_pre_raster_lib.InitPreRasterLibInfo(&stage_ci); unprotected_pre_raster_lib.pipeline_layout_ci_.flags |= VK_PIPELINE_LAYOUT_CREATE_INDEPENDENT_SETS_BIT_EXT; - unprotected_pre_raster_lib.gp_ci_.flags = VK_PIPELINE_CREATE_LIBRARY_BIT_KHR | VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT_EXT; + unprotected_pre_raster_lib.gp_ci_.flags = VK_PIPELINE_CREATE_LIBRARY_BIT_KHR | VK_PIPELINE_CREATE_NO_PROTECTED_ACCESS_BIT; ASSERT_EQ(VK_SUCCESS, unprotected_pre_raster_lib.CreateGraphicsPipeline()); libraries[0] = unprotected_pre_raster_lib.Handle(); VkGraphicsPipelineCreateInfo unprotected_lib_ci = vku::InitStructHelper(&link_info); diff --git a/tests/unit/push_descriptor.cpp b/tests/unit/push_descriptor.cpp index 9efbf4ad5ab..6ecb8dffb23 100644 --- a/tests/unit/push_descriptor.cpp +++ b/tests/unit/push_descriptor.cpp @@ -70,7 +70,7 @@ TEST_F(NegativePushDescriptor, DSBufferInfo) { update_template_entry.offset = offsetof(SimpleTemplateData, buff_info); update_template_entry.stride = sizeof(SimpleTemplateData); - VkDescriptorUpdateTemplateCreateInfoKHR update_template_ci = vku::InitStructHelper(); + VkDescriptorUpdateTemplateCreateInfo update_template_ci = vku::InitStructHelper(); update_template_ci.descriptorUpdateEntryCount = 1; update_template_ci.pDescriptorUpdateEntries = &update_template_entry; update_template_ci.templateType = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET; @@ -83,14 +83,14 @@ TEST_F(NegativePushDescriptor, DSBufferInfo) { std::unique_ptr pipeline_layout = nullptr; VkDescriptorUpdateTemplate push_template = VK_NULL_HANDLE; - push_dsl.reset(new vkt::DescriptorSetLayout(*m_device, ds_bindings, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR)); + push_dsl.reset(new vkt::DescriptorSetLayout(*m_device, ds_bindings, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT)); pipeline_layout.reset(new vkt::PipelineLayout(*m_device, {push_dsl.get()})); ASSERT_TRUE(push_dsl->initialized()); - VkDescriptorUpdateTemplateCreateInfoKHR push_template_ci = vku::InitStructHelper(); + VkDescriptorUpdateTemplateCreateInfo push_template_ci = vku::InitStructHelper(); push_template_ci.descriptorUpdateEntryCount = 1; push_template_ci.pDescriptorUpdateEntries = &update_template_entry; - push_template_ci.templateType = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR; + push_template_ci.templateType = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS; push_template_ci.descriptorSetLayout = VK_NULL_HANDLE; push_template_ci.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; push_template_ci.pipelineLayout = pipeline_layout->handle(); @@ -152,7 +152,7 @@ TEST_F(NegativePushDescriptor, DestroyDescriptorSetLayout) { VkDescriptorSetLayoutBinding ds_binding = {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}; VkDescriptorSetLayout ds_layout = VK_NULL_HANDLE; VkDescriptorSetLayoutCreateInfo dsl_ci = vku::InitStructHelper(); - dsl_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR; + dsl_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT; dsl_ci.bindingCount = 1; dsl_ci.pBindings = &ds_binding; vk::CreateDescriptorSetLayout(device(), &dsl_ci, nullptr, &ds_layout); @@ -195,7 +195,7 @@ TEST_F(NegativePushDescriptor, TemplateDestroyDescriptorSetLayout) { VkDescriptorSetLayoutBinding ds_binding = {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}; VkDescriptorSetLayout ds_layout = VK_NULL_HANDLE; VkDescriptorSetLayoutCreateInfo dsl_ci = vku::InitStructHelper(); - dsl_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR; + dsl_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT; dsl_ci.bindingCount = 1; dsl_ci.pBindings = &ds_binding; vk::CreateDescriptorSetLayout(device(), &dsl_ci, nullptr, &ds_layout); @@ -219,10 +219,10 @@ TEST_F(NegativePushDescriptor, TemplateDestroyDescriptorSetLayout) { update_template_entry.offset = offsetof(SimpleTemplateData, buff_info); update_template_entry.stride = sizeof(SimpleTemplateData); - VkDescriptorUpdateTemplateCreateInfoKHR update_template_ci = vku::InitStructHelper(); + VkDescriptorUpdateTemplateCreateInfo update_template_ci = vku::InitStructHelper(); update_template_ci.descriptorUpdateEntryCount = 1; update_template_ci.pDescriptorUpdateEntries = &update_template_entry; - update_template_ci.templateType = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR; + update_template_ci.templateType = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS; update_template_ci.descriptorSetLayout = ds_layout; update_template_ci.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; update_template_ci.pipelineLayout = pipeline_layout; @@ -251,7 +251,7 @@ TEST_F(NegativePushDescriptor, SetLayoutWithoutExtension) { VkDescriptorSetLayoutBinding binding = {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_FRAGMENT_BIT, nullptr}; VkDescriptorSetLayoutCreateInfo ds_layout_ci = vku::InitStructHelper(); - ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR; + ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT; ds_layout_ci.bindingCount = 1; ds_layout_ci.pBindings = &binding; @@ -270,7 +270,7 @@ TEST_F(NegativePushDescriptor, AllocateSet) { VkDescriptorSetLayoutBinding binding = {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_FRAGMENT_BIT, nullptr}; VkDescriptorSetLayoutCreateInfo ds_layout_ci = vku::InitStructHelper(); - ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR; + ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT; ds_layout_ci.bindingCount = 1; ds_layout_ci.pBindings = &binding; vkt::DescriptorSetLayout ds_layout(*m_device, ds_layout_ci); @@ -313,8 +313,7 @@ TEST_F(NegativePushDescriptor, CreateDescriptorUpdateTemplate) { const vkt::DescriptorSetLayout ds_layout_ub(*m_device, {dsl_binding}); const vkt::DescriptorSetLayout ds_layout_ub1(*m_device, {dsl_binding}); - const vkt::DescriptorSetLayout ds_layout_ub_push(*m_device, {dsl_binding}, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR); + const vkt::DescriptorSetLayout ds_layout_ub_push(*m_device, {dsl_binding}, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT); const vkt::PipelineLayout pipeline_layout(*m_device, {{&ds_layout_ub, &ds_layout_ub1, &ds_layout_ub_push}}); constexpr uint64_t badhandle = 0xcadecade; @@ -348,7 +347,7 @@ TEST_F(NegativePushDescriptor, CreateDescriptorUpdateTemplate) { } } - create_info.templateType = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR; + create_info.templateType = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS; // Bad pipelineLayout handle do_test("VUID-VkDescriptorUpdateTemplateCreateInfo-templateType-00352"); @@ -406,8 +405,7 @@ TEST_F(NegativePushDescriptor, CreateDescriptorUpdateTemplate14) { const vkt::DescriptorSetLayout ds_layout_ub(*m_device, {dsl_binding}); const vkt::DescriptorSetLayout ds_layout_ub1(*m_device, {dsl_binding}); - const vkt::DescriptorSetLayout ds_layout_ub_push(*m_device, {dsl_binding}, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR); + const vkt::DescriptorSetLayout ds_layout_ub_push(*m_device, {dsl_binding}, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT); const vkt::PipelineLayout pipeline_layout(*m_device, {{&ds_layout_ub, &ds_layout_ub1, &ds_layout_ub_push}}); constexpr uint64_t badhandle = 0xcadecade; @@ -441,7 +439,7 @@ TEST_F(NegativePushDescriptor, CreateDescriptorUpdateTemplate14) { } } - create_info.templateType = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR; + create_info.templateType = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS; // Bad pipelineLayout handle do_test("VUID-VkDescriptorUpdateTemplateCreateInfo-templateType-00352"); @@ -487,7 +485,7 @@ TEST_F(NegativePushDescriptor, SetLayout) { VkDescriptorSetLayoutBinding binding = {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, 1, VK_SHADER_STAGE_FRAGMENT_BIT, nullptr}; VkDescriptorSetLayoutCreateInfo ds_layout_ci = vku::InitStructHelper(); - ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR; + ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT; ds_layout_ci.bindingCount = 1; ds_layout_ci.pBindings = &binding; @@ -515,7 +513,7 @@ TEST_F(NegativePushDescriptor, SetLayoutMaxPushDescriptors) { VkDescriptorSetLayoutBinding binding = {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, 1, VK_SHADER_STAGE_FRAGMENT_BIT, nullptr}; VkDescriptorSetLayoutCreateInfo ds_layout_ci = vku::InitStructHelper(); - ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR; + ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT; ds_layout_ci.bindingCount = 1; ds_layout_ci.pBindings = &binding; @@ -539,7 +537,7 @@ TEST_F(NegativePushDescriptor, GetSupportSetLayout) { VkDescriptorSetLayoutBinding binding = {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, 1, VK_SHADER_STAGE_FRAGMENT_BIT, nullptr}; VkDescriptorSetLayoutCreateInfo ds_layout_ci = vku::InitStructHelper(); - ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR; + ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT; ds_layout_ci.bindingCount = 1; ds_layout_ci.pBindings = &binding; @@ -588,7 +586,7 @@ TEST_F(NegativePushDescriptor, SetLayoutMutableDescriptor) { list.descriptorTypeCount = 0; binding.descriptorType = VK_DESCRIPTOR_TYPE_SAMPLER; ds_layout_ci.flags = - VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR | VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_EXT; + VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT | VK_DESCRIPTOR_SET_LAYOUT_CREATE_HOST_ONLY_POOL_BIT_EXT; m_errorMonitor->SetDesiredError("VUID-VkDescriptorSetLayoutCreateInfo-flags-04590"); vk::CreateDescriptorSetLayout(device(), &ds_layout_ci, nullptr, &ds_layout); m_errorMonitor->VerifyFound(); @@ -601,14 +599,14 @@ TEST_F(NegativePushDescriptor, SetLayoutMutableDescriptor) { list.descriptorTypeCount = 2; binding.descriptorType = VK_DESCRIPTOR_TYPE_MUTABLE_EXT; - ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR; + ds_layout_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT; m_errorMonitor->SetDesiredError("VUID-VkDescriptorSetLayoutCreateInfo-flags-04591"); vk::CreateDescriptorSetLayout(device(), &ds_layout_ci, nullptr, &ds_layout); m_errorMonitor->VerifyFound(); } TEST_F(NegativePushDescriptor, DescriptorUpdateTemplateEntryWithInlineUniformBlock) { - TEST_DESCRIPTION("Test VkDescriptorUpdateTemplateEntry with descriptor type VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT"); + TEST_DESCRIPTION("Test VkDescriptorUpdateTemplateEntry with descriptor type VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK"); AddRequiredExtensions(VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_EXTENSION_NAME); AddRequiredExtensions(VK_EXT_INLINE_UNIFORM_BLOCK_EXTENSION_NAME); @@ -629,11 +627,11 @@ TEST_F(NegativePushDescriptor, DescriptorUpdateTemplateEntryWithInlineUniformBlo update_template_entry.dstBinding = 0; update_template_entry.dstArrayElement = 2; update_template_entry.descriptorCount = 1; - update_template_entry.descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT; + update_template_entry.descriptorType = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK; update_template_entry.offset = offsetof(SimpleTemplateData, buff_info); update_template_entry.stride = sizeof(SimpleTemplateData); - VkDescriptorUpdateTemplateCreateInfoKHR update_template_ci = vku::InitStructHelper(); + VkDescriptorUpdateTemplateCreateInfo update_template_ci = vku::InitStructHelper(); update_template_ci.descriptorUpdateEntryCount = 1; update_template_ci.pDescriptorUpdateEntries = &update_template_entry; update_template_ci.templateType = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET; @@ -656,7 +654,7 @@ TEST_F(NegativePushDescriptor, SetCmdPush) { VkDescriptorSetLayoutBinding binding = {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_FRAGMENT_BIT, nullptr}; const vkt::DescriptorSetLayout ds_layout(*m_device, {binding}); ASSERT_TRUE(ds_layout.initialized()); - const vkt::DescriptorSetLayout push_ds_layout(*m_device, {binding}, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR); + const vkt::DescriptorSetLayout push_ds_layout(*m_device, {binding}, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT); ASSERT_TRUE(push_ds_layout.initialized()); // Now use the descriptor set layouts to create a pipeline layout @@ -862,7 +860,7 @@ TEST_F(NegativePushDescriptor, SetCmdBufferOffsetUnaligned) { } VkDescriptorSetLayoutBinding binding = {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_FRAGMENT_BIT, nullptr}; - const vkt::DescriptorSetLayout push_ds_layout(*m_device, {binding}, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR); + const vkt::DescriptorSetLayout push_ds_layout(*m_device, {binding}, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT); ASSERT_TRUE(push_ds_layout.initialized()); const vkt::PipelineLayout pipeline_layout(*m_device, {&push_ds_layout}); @@ -933,7 +931,7 @@ TEST_F(NegativePushDescriptor, UnsupportedDescriptorTemplateBindPoint) { {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}}; OneOffDescriptorSet descriptor_set(m_device, ds_bindings); - vkt::DescriptorSetLayout push_dsl(*m_device, ds_bindings, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR); + vkt::DescriptorSetLayout push_dsl(*m_device, ds_bindings, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT); vkt::PipelineLayout pipeline_layout(*m_device, {&push_dsl}); @@ -949,10 +947,10 @@ TEST_F(NegativePushDescriptor, UnsupportedDescriptorTemplateBindPoint) { update_template_entry.offset = offsetof(SimpleTemplateData, buff_info); update_template_entry.stride = sizeof(SimpleTemplateData); - VkDescriptorUpdateTemplateCreateInfoKHR update_template_ci = vku::InitStructHelper(); + VkDescriptorUpdateTemplateCreateInfo update_template_ci = vku::InitStructHelper(); update_template_ci.descriptorUpdateEntryCount = 1; update_template_ci.pDescriptorUpdateEntries = &update_template_entry; - update_template_ci.templateType = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR; + update_template_ci.templateType = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS; update_template_ci.descriptorSetLayout = descriptor_set.layout_.handle(); update_template_ci.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; update_template_ci.pipelineLayout = pipeline_layout.handle(); @@ -986,7 +984,7 @@ TEST_F(NegativePushDescriptor, InvalidDescriptorUpdateTemplateType) { {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}}; OneOffDescriptorSet descriptor_set(m_device, ds_bindings); - vkt::DescriptorSetLayout push_dsl(*m_device, ds_bindings, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR); + vkt::DescriptorSetLayout push_dsl(*m_device, ds_bindings, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT); vkt::PipelineLayout pipeline_layout(*m_device, {&push_dsl}); @@ -1002,7 +1000,7 @@ TEST_F(NegativePushDescriptor, InvalidDescriptorUpdateTemplateType) { update_template_entry.offset = offsetof(SimpleTemplateData, buff_info); update_template_entry.stride = sizeof(SimpleTemplateData); - VkDescriptorUpdateTemplateCreateInfoKHR update_template_ci = vku::InitStructHelper(); + VkDescriptorUpdateTemplateCreateInfo update_template_ci = vku::InitStructHelper(); update_template_ci.descriptorUpdateEntryCount = 1; update_template_ci.pDescriptorUpdateEntries = &update_template_entry; update_template_ci.templateType = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_DESCRIPTOR_SET; @@ -1039,9 +1037,9 @@ TEST_F(NegativePushDescriptor, DescriptorTemplateIncompatibleLayout) { {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}}; OneOffDescriptorSet descriptor_set(m_device, ds_bindings); - vkt::DescriptorSetLayout push_dsl(*m_device, ds_bindings, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR); + vkt::DescriptorSetLayout push_dsl(*m_device, ds_bindings, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT); vkt::DescriptorSetLayout push_dsl2(*m_device, {{1, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}}, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT); vkt::DescriptorSetLayout push_dsl3(*m_device, ds_bindings); vkt::PipelineLayout pipeline_layout(*m_device, {&push_dsl}); @@ -1060,10 +1058,10 @@ TEST_F(NegativePushDescriptor, DescriptorTemplateIncompatibleLayout) { update_template_entry.offset = offsetof(SimpleTemplateData, buff_info); update_template_entry.stride = sizeof(SimpleTemplateData); - VkDescriptorUpdateTemplateCreateInfoKHR update_template_ci = vku::InitStructHelper(); + VkDescriptorUpdateTemplateCreateInfo update_template_ci = vku::InitStructHelper(); update_template_ci.descriptorUpdateEntryCount = 1; update_template_ci.pDescriptorUpdateEntries = &update_template_entry; - update_template_ci.templateType = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR; + update_template_ci.templateType = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS; update_template_ci.descriptorSetLayout = descriptor_set.layout_.handle(); update_template_ci.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; update_template_ci.pipelineLayout = pipeline_layout.handle(); diff --git a/tests/unit/push_descriptor_positive.cpp b/tests/unit/push_descriptor_positive.cpp index 00980b68f0a..9024bbd7e18 100644 --- a/tests/unit/push_descriptor_positive.cpp +++ b/tests/unit/push_descriptor_positive.cpp @@ -33,8 +33,7 @@ TEST_F(PositivePushDescriptor, NullDstSet) { const vkt::DescriptorSetLayout ds_layout(*m_device, {dsl_binding}); // Create push descriptor set layout - const vkt::DescriptorSetLayout push_ds_layout(*m_device, {dsl_binding}, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR); + const vkt::DescriptorSetLayout push_ds_layout(*m_device, {dsl_binding}, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT); // Use helper to create graphics pipeline CreatePipelineHelper helper(*this); @@ -132,8 +131,7 @@ TEST_F(PositivePushDescriptor, UnboundSet) { nullptr); // Create push descriptor set layout - const vkt::DescriptorSetLayout push_ds_layout(*m_device, {dsl_binding}, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR); + const vkt::DescriptorSetLayout push_ds_layout(*m_device, {dsl_binding}, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT); // Create PSO char const fsSource[] = R"glsl( @@ -202,7 +200,7 @@ TEST_F(PositivePushDescriptor, SetUpdatingSetNumber) { const VkDescriptorSetLayoutBinding push_ds_binding_0 = {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_FRAGMENT_BIT, nullptr}; const vkt::DescriptorSetLayout push_ds_layout(*m_device, {push_ds_binding_0}, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT); ASSERT_TRUE(push_ds_layout.initialized()); m_command_buffer.Begin(); @@ -315,7 +313,7 @@ TEST_F(PositivePushDescriptor, CreateDescriptorSetBindingWithIgnoredSamplers) { {6, VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT, 1, VK_SHADER_STAGE_FRAGMENT_BIT, hopefully_undereferencable_pointer}, }; const auto dslci = vku::InitStruct( - nullptr, static_cast(VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR), + nullptr, static_cast(VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT), size32(non_sampler_bindings), non_sampler_bindings); vkt::DescriptorSetLayout dsl(*m_device, dslci); } @@ -337,7 +335,7 @@ TEST_F(PositivePushDescriptor, ImmutableSampler) { {0, VK_DESCRIPTOR_TYPE_SAMPLER, 1, VK_SHADER_STAGE_ALL, &sampler_handle}}; OneOffDescriptorSet descriptor_set(m_device, ds_bindings); - vkt::DescriptorSetLayout push_dsl(*m_device, ds_bindings, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR); + vkt::DescriptorSetLayout push_dsl(*m_device, ds_bindings, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT); vkt::PipelineLayout pipeline_layout(*m_device, {&push_dsl}); @@ -374,7 +372,7 @@ TEST_F(PositivePushDescriptor, TemplateBasic) { {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}}; OneOffDescriptorSet descriptor_set(m_device, ds_bindings); - vkt::DescriptorSetLayout push_dsl(*m_device, ds_bindings, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR); + vkt::DescriptorSetLayout push_dsl(*m_device, ds_bindings, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT); vkt::PipelineLayout pipeline_layout(*m_device, {&push_dsl}); @@ -390,10 +388,10 @@ TEST_F(PositivePushDescriptor, TemplateBasic) { update_template_entry.offset = offsetof(SimpleTemplateData, buff_info); update_template_entry.stride = sizeof(SimpleTemplateData); - VkDescriptorUpdateTemplateCreateInfoKHR update_template_ci = vku::InitStructHelper(); + VkDescriptorUpdateTemplateCreateInfo update_template_ci = vku::InitStructHelper(); update_template_ci.descriptorUpdateEntryCount = 1; update_template_ci.pDescriptorUpdateEntries = &update_template_entry; - update_template_ci.templateType = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR; + update_template_ci.templateType = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS; update_template_ci.descriptorSetLayout = descriptor_set.layout_.handle(); update_template_ci.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; update_template_ci.pipelineLayout = pipeline_layout.handle(); @@ -422,7 +420,7 @@ TEST_F(PositivePushDescriptor, WriteDescriptorSetNotAllocated) { VkDescriptorSetLayoutBinding ds_binding = {0, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}; VkDescriptorSetLayoutCreateInfo dsl_ci = vku::InitStructHelper(); - dsl_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR; + dsl_ci.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT; dsl_ci.bindingCount = 1; dsl_ci.pBindings = &ds_binding; vkt::DescriptorSetLayout ds_layout(*m_device, dsl_ci); @@ -475,7 +473,7 @@ TEST_F(PositivePushDescriptor, PushDescriptorWithTemplateMultipleSets) { OneOffDescriptorSet descriptor_set(m_device, ds_bindings); vkt::DescriptorSetLayout push_dsl1(*m_device, {{0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}}); - vkt::DescriptorSetLayout push_dsl2(*m_device, ds_bindings, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR); + vkt::DescriptorSetLayout push_dsl2(*m_device, ds_bindings, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT); vkt::PipelineLayout pipeline_layout(*m_device, {&push_dsl1, &push_dsl2}); @@ -491,10 +489,10 @@ TEST_F(PositivePushDescriptor, PushDescriptorWithTemplateMultipleSets) { update_template_entry.offset = offsetof(SimpleTemplateData, buff_info); update_template_entry.stride = sizeof(SimpleTemplateData); - VkDescriptorUpdateTemplateCreateInfoKHR update_template_ci = vku::InitStructHelper(); + VkDescriptorUpdateTemplateCreateInfo update_template_ci = vku::InitStructHelper(); update_template_ci.descriptorUpdateEntryCount = 1; update_template_ci.pDescriptorUpdateEntries = &update_template_entry; - update_template_ci.templateType = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS_KHR; + update_template_ci.templateType = VK_DESCRIPTOR_UPDATE_TEMPLATE_TYPE_PUSH_DESCRIPTORS; update_template_ci.descriptorSetLayout = descriptor_set.layout_.handle(); update_template_ci.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; update_template_ci.pipelineLayout = pipeline_layout.handle(); diff --git a/tests/unit/query.cpp b/tests/unit/query.cpp index 2089aa8c4c4..e0f7c4440ba 100644 --- a/tests/unit/query.cpp +++ b/tests/unit/query.cpp @@ -103,7 +103,7 @@ TEST_F(NegativeQuery, PerformanceCounterCommandbufferScope) { std::vector counters; std::vector counterIndices; - // Find a single counter with VK_QUERY_SCOPE_COMMAND_BUFFER_KHR scope. + // Find a single counter with VK_PERFORMANCE_COUNTER_SCOPE_COMMAND_BUFFER_KHR scope. for (uint32_t idx = 0; idx < queueFamilyProperties.size(); idx++) { uint32_t nCounters; @@ -118,7 +118,7 @@ TEST_F(NegativeQuery, PerformanceCounterCommandbufferScope) { queueFamilyIndex = idx; for (uint32_t counterIdx = 0; counterIdx < counters.size(); counterIdx++) { - if (counters[counterIdx].scope == VK_QUERY_SCOPE_COMMAND_BUFFER_KHR) { + if (counters[counterIdx].scope == VK_PERFORMANCE_COUNTER_SCOPE_COMMAND_BUFFER_KHR) { counterIndices.push_back(counterIdx); break; } @@ -216,7 +216,7 @@ TEST_F(NegativeQuery, PerformanceCounterRenderPassScope) { std::vector counters; std::vector counterIndices; - // Find a single counter with VK_QUERY_SCOPE_RENDER_PASS_KHR scope. + // Find a single counter with VK_PERFORMANCE_COUNTER_SCOPE_RENDER_PASS_KHR scope. for (uint32_t idx = 0; idx < queueFamilyProperties.size(); idx++) { uint32_t nCounters; @@ -231,7 +231,7 @@ TEST_F(NegativeQuery, PerformanceCounterRenderPassScope) { queueFamilyIndex = idx; for (uint32_t counterIdx = 0; counterIdx < counters.size(); counterIdx++) { - if (counters[counterIdx].scope == VK_QUERY_SCOPE_RENDER_PASS_KHR) { + if (counters[counterIdx].scope == VK_PERFORMANCE_COUNTER_SCOPE_RENDER_PASS_KHR) { counterIndices.push_back(counterIdx); break; } @@ -307,7 +307,7 @@ TEST_F(NegativeQuery, PerformanceReleaseProfileLockBeforeSubmit) { std::vector counters; std::vector counterIndices; - // Find a single counter with VK_QUERY_SCOPE_COMMAND_KHR scope. + // Find a single counter with VK_PERFORMANCE_COUNTER_SCOPE_COMMAND_KHR scope. for (uint32_t idx = 0; idx < queueFamilyProperties.size(); idx++) { uint32_t nCounters; @@ -322,7 +322,7 @@ TEST_F(NegativeQuery, PerformanceReleaseProfileLockBeforeSubmit) { queueFamilyIndex = idx; for (uint32_t counterIdx = 0; counterIdx < counters.size(); counterIdx++) { - if (counters[counterIdx].scope == VK_QUERY_SCOPE_COMMAND_KHR) { + if (counters[counterIdx].scope == VK_PERFORMANCE_COUNTER_SCOPE_COMMAND_KHR) { counterIndices.push_back(counterIdx); break; } @@ -443,7 +443,7 @@ TEST_F(NegativeQuery, PerformanceIncompletePasses) { std::vector counterIndices; uint32_t nPasses = 0; - // Find all counters with VK_QUERY_SCOPE_COMMAND_KHR scope. + // Find all counters with VK_PERFORMANCE_COUNTER_SCOPE_COMMAND_KHR scope. for (uint32_t idx = 0; idx < queueFamilyProperties.size(); idx++) { uint32_t nCounters; @@ -458,7 +458,7 @@ TEST_F(NegativeQuery, PerformanceIncompletePasses) { queueFamilyIndex = idx; for (uint32_t counterIdx = 0; counterIdx < counters.size(); counterIdx++) { - if (counters[counterIdx].scope == VK_QUERY_SCOPE_COMMAND_KHR) counterIndices.push_back(counterIdx); + if (counters[counterIdx].scope == VK_PERFORMANCE_COUNTER_SCOPE_COMMAND_KHR) counterIndices.push_back(counterIdx); } if (counterIndices.empty()) continue; // might not be a scope command @@ -666,7 +666,7 @@ TEST_F(NegativeQuery, PerformanceResetAndBegin) { std::vector counters; std::vector counterIndices; - // Find a single counter with VK_QUERY_SCOPE_COMMAND_KHR scope. + // Find a single counter with VK_PERFORMANCE_COUNTER_SCOPE_COMMAND_KHR scope. for (uint32_t idx = 0; idx < queueFamilyProperties.size(); idx++) { uint32_t nCounters; @@ -681,7 +681,7 @@ TEST_F(NegativeQuery, PerformanceResetAndBegin) { queueFamilyIndex = idx; for (uint32_t counterIdx = 0; counterIdx < counters.size(); counterIdx++) { - if (counters[counterIdx].scope == VK_QUERY_SCOPE_COMMAND_KHR) { + if (counters[counterIdx].scope == VK_PERFORMANCE_COUNTER_SCOPE_COMMAND_KHR) { counterIndices.push_back(counterIdx); break; } @@ -923,10 +923,10 @@ TEST_F(NegativeQuery, InsideRenderPassDynamicRendering) { vkt::QueryPool query_pool(*m_device, VK_QUERY_TYPE_OCCLUSION, 1); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {64, 64}}; begin_rendering_info.colorAttachmentCount = 1; @@ -954,10 +954,10 @@ TEST_F(NegativeQuery, OutsideRenderPassDynamicRendering) { vkt::QueryPool query_pool(*m_device, VK_QUERY_TYPE_OCCLUSION, 1); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(); begin_rendering_info.layerCount = 1; begin_rendering_info.renderArea = {{0, 0}, {64, 64}}; begin_rendering_info.colorAttachmentCount = 1; @@ -1907,7 +1907,7 @@ TEST_F(NegativeQuery, WriteTimestampWithoutQueryPool) { m_errorMonitor->VerifyFound(); m_errorMonitor->SetDesiredError("VUID-vkCmdWriteTimestamp2-queryPool-parameter"); - vk::CmdWriteTimestamp2KHR(m_command_buffer.handle(), VK_PIPELINE_STAGE_2_NONE_KHR, bad_query_pool, 0); + vk::CmdWriteTimestamp2KHR(m_command_buffer.handle(), VK_PIPELINE_STAGE_2_NONE, bad_query_pool, 0); m_errorMonitor->VerifyFound(); m_command_buffer.End(); } diff --git a/tests/unit/query_positive.cpp b/tests/unit/query_positive.cpp index f7b168f5631..eb68e56e3a7 100644 --- a/tests/unit/query_positive.cpp +++ b/tests/unit/query_positive.cpp @@ -367,8 +367,8 @@ TEST_F(PositiveQuery, WriteTimestampNoneAndAll) { vkt::QueryPool query_pool(*m_device, VK_QUERY_TYPE_TIMESTAMP, 2); m_command_buffer.Begin(); - vk::CmdWriteTimestamp2KHR(m_command_buffer.handle(), VK_PIPELINE_STAGE_2_NONE_KHR, query_pool.handle(), 0); - vk::CmdWriteTimestamp2KHR(m_command_buffer.handle(), VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT_KHR, query_pool.handle(), 1); + vk::CmdWriteTimestamp2KHR(m_command_buffer.handle(), VK_PIPELINE_STAGE_2_NONE, query_pool.handle(), 0); + vk::CmdWriteTimestamp2KHR(m_command_buffer.handle(), VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT, query_pool.handle(), 1); m_command_buffer.End(); } diff --git a/tests/unit/ray_tracing.cpp b/tests/unit/ray_tracing.cpp index 589319329c0..b4b5498cb54 100644 --- a/tests/unit/ray_tracing.cpp +++ b/tests/unit/ray_tracing.cpp @@ -269,14 +269,14 @@ TEST_F(NegativeRayTracing, DescriptorBindingUpdateAfterBindWithAccelerationStruc binding.stageFlags = VK_SHADER_STAGE_ALL; binding.pImmutableSamplers = nullptr; - VkDescriptorBindingFlags flags = VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT_EXT; + VkDescriptorBindingFlags flags = VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT flags_create_info = vku::InitStructHelper(); + VkDescriptorSetLayoutBindingFlagsCreateInfo flags_create_info = vku::InitStructHelper(); flags_create_info.bindingCount = 1; flags_create_info.pBindingFlags = &flags; VkDescriptorSetLayoutCreateInfo create_info = vku::InitStructHelper(&flags_create_info); - create_info.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT; + create_info.flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT; create_info.bindingCount = 1; create_info.pBindings = &binding; @@ -610,7 +610,7 @@ TEST_F(NegativeRayTracing, CopyAccelerationStructureOverlappingMemory) { RETURN_IF_SKIP(InitState()); VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; VkMemoryAllocateInfo alloc_info = vku::InitStructHelper(&alloc_flags); alloc_info.allocationSize = 8192; vkt::DeviceMemory buffer_memory(*m_device, alloc_info); @@ -663,12 +663,12 @@ TEST_F(NegativeRayTracing, CmdCopyUnboundAccelerationStructure) { // Init a non host visible buffer VkBufferCreateInfo buffer_ci = vku::InitStructHelper(); buffer_ci.size = 4096; - buffer_ci.usage = VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR | + buffer_ci.usage = VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT; vkt::Buffer buffer(*m_device, buffer_ci, vkt::no_mem); VkMemoryRequirements memory_requirements = buffer.MemoryRequirements(); VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; VkMemoryAllocateInfo memory_alloc = vku::InitStructHelper(&alloc_flags); memory_alloc.allocationSize = memory_requirements.size; const bool memory_found = @@ -780,7 +780,7 @@ TEST_F(NegativeRayTracing, CmdCopyMemoryToAccelerationStructure) { RETURN_IF_SKIP(InitState()); VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; vkt::Buffer src_buffer(*m_device, 4096, VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &alloc_flags); @@ -989,7 +989,7 @@ TEST_F(NegativeRayTracing, CreateAccelerationStructureKHR) { VkAccelerationStructureKHR as; VkAccelerationStructureCreateInfoKHR as_create_info = vku::InitStructHelper(); VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; vkt::Buffer buffer(*m_device, 4096, VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &alloc_flags); @@ -1092,7 +1092,7 @@ TEST_F(NegativeRayTracing, CreateAccelerationStructureKHRReplayFeature) { RETURN_IF_SKIP(InitState()); VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; vkt::Buffer buffer(*m_device, 4096, VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &alloc_flags); @@ -1202,7 +1202,7 @@ TEST_F(NegativeRayTracing, CmdTraceRaysKHR) { vk::GetBufferMemoryRequirements(device(), buffer.handle(), &mem_reqs); VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; VkMemoryAllocateInfo alloc_info = vku::InitStructHelper(&alloc_flags); alloc_info.allocationSize = 4096; vkt::DeviceMemory mem(*m_device, alloc_info); @@ -1745,7 +1745,7 @@ TEST_F(NegativeRayTracing, CmdBuildAccelerationStructuresKHR) { // Invalid index type if (index_type_uint8) { auto blas = vkt::as::blueprint::BuildGeometryInfoSimpleOnDeviceBottomLevel(*m_device); - blas.GetGeometries()[0].SetTrianglesIndexType(VK_INDEX_TYPE_UINT8_KHR); + blas.GetGeometries()[0].SetTrianglesIndexType(VK_INDEX_TYPE_UINT8); blas.SetUpdateDstAccelStructSizeBeforeBuild(false); m_errorMonitor->SetDesiredError("VUID-VkAccelerationStructureGeometryTrianglesDataKHR-indexType-03798"); m_errorMonitor->SetDesiredError("VUID-VkAccelerationStructureGeometryTrianglesDataKHR-indexType-03798"); @@ -1770,7 +1770,7 @@ TEST_F(NegativeRayTracing, CmdBuildAccelerationStructuresKHR) { // Buffer is missing VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR usage flag { VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; vkt::Buffer bad_usage_buffer(*m_device, 1024, VK_BUFFER_USAGE_RAY_TRACING_BIT_NV | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, kHostVisibleMemProps, &alloc_flags); @@ -1786,7 +1786,7 @@ TEST_F(NegativeRayTracing, CmdBuildAccelerationStructuresKHR) { const VkDeviceSize scratch_size = blas.GetSizeInfo().buildScratchSize + acc_struct_properties.minAccelerationStructureScratchOffsetAlignment; VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; auto bad_scratch = std::make_shared(*m_device, scratch_size, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &alloc_flags); blas.SetScratchBuffer(std::move(bad_scratch)); @@ -1797,7 +1797,7 @@ TEST_F(NegativeRayTracing, CmdBuildAccelerationStructuresKHR) { // Scratch data buffer is 0 { VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; // no VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT => scratch address will be set to 0 auto bad_scratch = std::make_shared(*m_device, 4096, VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &alloc_flags); @@ -1826,7 +1826,7 @@ TEST_F(NegativeRayTracing, AccelerationStructuresOverlappingMemory) { // All buffers used to back source/destination acceleration structures will be bound to this memory chunk VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; VkMemoryAllocateInfo alloc_info = vku::InitStructHelper(&alloc_flags); alloc_info.allocationSize = 8192; vkt::DeviceMemory buffer_memory(*m_device, alloc_info); @@ -1929,7 +1929,7 @@ TEST_F(NegativeRayTracing, AccelerationStructuresOverlappingMemory2) { // All scratch buffers will be bound to this memory chunk VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; VkMemoryAllocateInfo alloc_info = vku::InitStructHelper(&alloc_flags); alloc_info.allocationSize = 1u << 17; vkt::DeviceMemory buffer_memory(*m_device, alloc_info); @@ -1997,7 +1997,7 @@ TEST_F(NegativeRayTracing, AccelerationStructuresOverlappingMemory3) { // All buffers used to back destination acceleration struct and scratch will be bound to this memory chunk VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; VkMemoryAllocateInfo alloc_info = vku::InitStructHelper(&alloc_flags); alloc_info.allocationSize = 1u << 17; vkt::DeviceMemory buffer_memory(*m_device, alloc_info); @@ -2071,7 +2071,7 @@ TEST_F(NegativeRayTracing, AccelerationStructuresOverlappingMemory4) { // All buffers used to back source/destination acceleration struct and scratch will be bound to this memory chunk VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; VkMemoryAllocateInfo alloc_info = vku::InitStructHelper(&alloc_flags); alloc_info.allocationSize = 1u << 17; vkt::DeviceMemory buffer_memory(*m_device, alloc_info); @@ -2317,7 +2317,7 @@ TEST_F(NegativeRayTracing, BuffersAndBufferDeviceAddressesMapping) { // Allocate common buffer memory VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; VkMemoryAllocateInfo alloc_info = vku::InitStructHelper(&alloc_flags); alloc_info.allocationSize = 4096; vkt::DeviceMemory buffer_memory(*m_device, alloc_info); @@ -3115,9 +3115,9 @@ TEST_F(NegativeRayTracing, BuildAccelerationStructuresInvalidUpdatesToGeometry) // Invalid update to triangles transform data VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; vkt::Buffer transform_buffer(*m_device, 4096, - VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | + VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &alloc_flags); @@ -3196,9 +3196,9 @@ TEST_F(NegativeRayTracing, TransformBufferInvalid) { RETURN_IF_SKIP(InitState()); VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; vkt::Buffer transform_buffer(*m_device, 4096, - VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | + VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT | VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_BUILD_INPUT_READ_ONLY_BIT_KHR, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &alloc_flags); @@ -3390,7 +3390,7 @@ TEST_F(NegativeRayTracing, ScratchBufferBadAddressSpaceOpBuild) { // Allocate buffer memory separately so that it can be large enough. Scratch buffer size will be smaller. VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; VkMemoryAllocateInfo alloc_info = vku::InitStructHelper(&alloc_flags); alloc_info.allocationSize = 4096; vkt::DeviceMemory buffer_memory(*m_device, alloc_info); @@ -3430,7 +3430,7 @@ TEST_F(NegativeRayTracing, ScratchBufferBadAddressSpaceOpUpdate) { // Allocate buffer memory separately so that it can be large enough. Scratch buffer size will be smaller. VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; auto scratch_buffer = std::make_shared(*m_device, 64, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, @@ -3476,7 +3476,7 @@ TEST_F(NegativeRayTracing, ScratchBufferBadMemory) { auto scratch_buffer = std::make_shared(*m_device, scratch_buffer_ci, vkt::no_mem); VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; VkMemoryAllocateInfo alloc_info = vku::InitStructHelper(&alloc_flags); alloc_info.allocationSize = scratch_buffer->MemoryRequirements().size; vkt::DeviceMemory buffer_memory(*m_device, alloc_info); diff --git a/tests/unit/ray_tracing_nv.cpp b/tests/unit/ray_tracing_nv.cpp index e7fb142e5e3..1b5927ca129 100644 --- a/tests/unit/ray_tracing_nv.cpp +++ b/tests/unit/ray_tracing_nv.cpp @@ -224,16 +224,16 @@ void NegativeRayTracingNV::OOBRayTracingShadersTestBodyNV(bool gpu_assisted) { VkDescriptorPoolCreateFlags pool_create_flags = 0; VkDescriptorSetLayoutCreateFlags layout_create_flags = 0; VkDescriptorBindingFlagsEXT ds_binding_flags[3] = {}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT layout_createinfo_binding_flags[1] = {}; + VkDescriptorSetLayoutBindingFlagsCreateInfo layout_createinfo_binding_flags[1] = {}; if (descriptor_indexing) { ds_binding_flags[0] = 0; ds_binding_flags[1] = 0; - ds_binding_flags[2] = VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT | VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT_EXT; + ds_binding_flags[2] = VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT | VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT; layout_createinfo_binding_flags[0] = vku::InitStructHelper(); layout_createinfo_binding_flags[0].bindingCount = 3; layout_createinfo_binding_flags[0].pBindingFlags = ds_binding_flags; - layout_create_flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT; + layout_create_flags = VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT; pool_create_flags = VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT; layout_pnext = layout_createinfo_binding_flags; } @@ -247,13 +247,12 @@ void NegativeRayTracingNV::OOBRayTracingShadersTestBodyNV(bool gpu_assisted) { }, layout_create_flags, layout_pnext, pool_create_flags); - VkDescriptorSetVariableDescriptorCountAllocateInfoEXT variable_count = vku::InitStructHelper(); + VkDescriptorSetVariableDescriptorCountAllocateInfo variable_count = vku::InitStructHelper(); uint32_t desc_counts; if (descriptor_indexing) { layout_create_flags = 0; pool_create_flags = 0; - ds_binding_flags[2] = - VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT | VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT_EXT; + ds_binding_flags[2] = VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT | VK_DESCRIPTOR_BINDING_VARIABLE_DESCRIPTOR_COUNT_BIT; desc_counts = 6; // We'll reserve 8 spaces in the layout, but the descriptor will only use 6 variable_count.descriptorSetCount = 1; variable_count.pDescriptorCounts = &desc_counts; @@ -1659,7 +1658,7 @@ TEST_F(NegativeRayTracingNV, ValidateCmdBuildAccelerationStructure) { // invalid scratch buffer (invalid usage) VkBufferCreateInfo create_info = vku::InitStructHelper(); - create_info.usage = VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT_KHR; + create_info.usage = VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT; const vkt::Buffer bot_level_as_invalid_scratch = bot_level_as.CreateScratchBuffer(*m_device, &create_info); m_errorMonitor->SetDesiredError("VUID-VkAccelerationStructureInfoNV-scratch-02781"); vk::CmdBuildAccelerationStructureNV(m_command_buffer.handle(), &bot_level_as_create_info.info, VK_NULL_HANDLE, 0, VK_FALSE, diff --git a/tests/unit/ray_tracing_pipeline.cpp b/tests/unit/ray_tracing_pipeline.cpp index 45a5ef0a296..76133bb27c7 100644 --- a/tests/unit/ray_tracing_pipeline.cpp +++ b/tests/unit/ray_tracing_pipeline.cpp @@ -1197,7 +1197,7 @@ TEST_F(NegativeRayTracingPipeline, PipelineBinaryRayTracingPipeline) { raytracing_pipeline_ci.layout = pipeline_layout.handle(); { - VkPipelineCreateFlags2CreateInfoKHR flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo flags2 = vku::InitStructHelper(); flags2.flags = VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR; raytracing_pipeline_ci.pNext = &flags2; @@ -1246,7 +1246,7 @@ TEST_F(NegativeRayTracingPipeline, PipelineBinaryRayTracingPipeline) { } { - VkPipelineCreateFlags2CreateInfoKHR flags2 = vku::InitStructHelper(); + VkPipelineCreateFlags2CreateInfo flags2 = vku::InitStructHelper(); flags2.flags = VK_PIPELINE_CREATE_2_CAPTURE_DATA_BIT_KHR; raytracing_pipeline_ci.pNext = &flags2; @@ -1282,7 +1282,7 @@ TEST_F(NegativeRayTracingPipeline, PipelineBinaryRayTracingPipeline) { feedback.flags = VK_PIPELINE_CREATION_FEEDBACK_APPLICATION_PIPELINE_CACHE_HIT_BIT | VK_PIPELINE_CREATION_FEEDBACK_BASE_PIPELINE_ACCELERATION_BIT; - flags2.flags |= VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT; + flags2.flags |= VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT; flags2.pNext = &binary_info; binary_info.pNext = &feedback_create_info; diff --git a/tests/unit/ray_tracing_pipeline_nv.cpp b/tests/unit/ray_tracing_pipeline_nv.cpp index 6014c277a27..0bd12199bef 100644 --- a/tests/unit/ray_tracing_pipeline_nv.cpp +++ b/tests/unit/ray_tracing_pipeline_nv.cpp @@ -77,7 +77,7 @@ TEST_F(NegativeRayTracingPipelineNV, BasicUsage) { pipeline_ci.groupCount = 1; pipeline_ci.pGroups = &group_create_info; pipeline_ci.layout = empty_pipeline_layout.handle(); - pipeline_ci.flags = VK_PIPELINE_CREATE_DEFER_COMPILE_BIT_NV | VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT; + pipeline_ci.flags = VK_PIPELINE_CREATE_DEFER_COMPILE_BIT_NV | VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT; m_errorMonitor->SetDesiredError("VUID-VkRayTracingPipelineCreateInfoNV-flags-02957"); vk::CreateRayTracingPipelinesNV(m_device->handle(), VK_NULL_HANDLE, 1, &pipeline_ci, nullptr, &pipeline); m_errorMonitor->VerifyFound(); @@ -660,8 +660,8 @@ TEST_F(NegativeRayTracingPipelineNV, StageCreationFeedbackCount) { RETURN_IF_SKIP(InitState()); - VkPipelineCreationFeedbackCreateInfoEXT feedback_info = vku::InitStructHelper(); - VkPipelineCreationFeedbackEXT feedbacks[4] = {}; + VkPipelineCreationFeedbackCreateInfo feedback_info = vku::InitStructHelper(); + VkPipelineCreationFeedback feedbacks[4] = {}; feedback_info.pPipelineCreationFeedback = &feedbacks[0]; feedback_info.pipelineStageCreationFeedbackCount = 2; diff --git a/tests/unit/ray_tracing_pipeline_positive.cpp b/tests/unit/ray_tracing_pipeline_positive.cpp index 1e71efb8f3f..8d069ac9cfa 100644 --- a/tests/unit/ray_tracing_pipeline_positive.cpp +++ b/tests/unit/ray_tracing_pipeline_positive.cpp @@ -109,7 +109,7 @@ TEST_F(PositiveRayTracingPipeline, ShaderGroupsKHR) { } TEST_F(PositiveRayTracingPipeline, CacheControl) { - TEST_DESCRIPTION("Create ray tracing pipeline with VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT_EXT."); + TEST_DESCRIPTION("Create ray tracing pipeline with VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT."); SetTargetApiVersion(VK_API_VERSION_1_3); AddRequiredFeature(vkt::Feature::rayTracingPipeline); diff --git a/tests/unit/ray_tracing_positive.cpp b/tests/unit/ray_tracing_positive.cpp index 622f3c66425..e3572c474ee 100644 --- a/tests/unit/ray_tracing_positive.cpp +++ b/tests/unit/ray_tracing_positive.cpp @@ -188,7 +188,7 @@ TEST_F(PositiveRayTracing, StridedDeviceAddressRegion) { vk::GetBufferMemoryRequirements(device(), buffer.handle(), &mem_reqs); VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; VkMemoryAllocateInfo alloc_info = vku::InitStructHelper(&alloc_flags); alloc_info.allocationSize = 4096; vkt::DeviceMemory mem(*m_device, alloc_info); @@ -447,7 +447,7 @@ TEST_F(PositiveRayTracing, BuildAccelerationStructuresList2) { vk::GetPhysicalDeviceProperties2(m_device->Physical(), &phys_dev_props); VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; auto scratch_buffer = std::make_shared( *m_device, 4 * 1024 * 1024, VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, @@ -500,7 +500,7 @@ TEST_F(PositiveRayTracing, AccelerationStructuresOverlappingMemory) { constexpr size_t blas_count = 3; VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; VkMemoryAllocateInfo alloc_info = vku::InitStructHelper(&alloc_flags); alloc_info.allocationSize = (1u << 18) * blas_count; vkt::DeviceMemory buffer_memory(*m_device, alloc_info); @@ -548,7 +548,7 @@ TEST_F(PositiveRayTracing, AccelerationStructuresReuseScratchMemory) { // Allocate a memory chunk that will be used as backing memory for scratch buffer VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; VkMemoryAllocateInfo alloc_info = vku::InitStructHelper(&alloc_flags); alloc_info.allocationSize = 1u << 18; vkt::DeviceMemory common_scratch_memory(*m_device, alloc_info); @@ -827,7 +827,7 @@ TEST_F(PositiveRayTracing, ScratchBufferCorrectAddressSpaceOpBuild) { // Allocate buffer memory separately so that it can be large enough. Scratch buffer size will be smaller. VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; VkMemoryAllocateInfo alloc_info = vku::InitStructHelper(&alloc_flags); alloc_info.allocationSize = scratch_size; vkt::DeviceMemory buffer_memory(*m_device, alloc_info); @@ -1028,7 +1028,7 @@ TEST_F(PositiveRayTracing, GetAccelerationStructureAddressBadBuffer) { RETURN_IF_SKIP(InitFrameworkForRayTracingTest()); RETURN_IF_SKIP(InitState()); - VkBufferUsageFlags2CreateInfoKHR buffer_usage = vku::InitStructHelper(); + VkBufferUsageFlags2CreateInfo buffer_usage = vku::InitStructHelper(); buffer_usage.usage = VK_BUFFER_USAGE_ACCELERATION_STRUCTURE_STORAGE_BIT_KHR | VK_BUFFER_USAGE_SHADER_DEVICE_ADDRESS_BIT; VkBufferCreateInfo buffer_ci = vku::InitStructHelper(&buffer_usage); buffer_ci.size = 4096; @@ -1038,7 +1038,7 @@ TEST_F(PositiveRayTracing, GetAccelerationStructureAddressBadBuffer) { vk::GetBufferMemoryRequirements(device(), buffer.handle(), &mem_reqs); VkMemoryAllocateFlagsInfo alloc_flags = vku::InitStructHelper(); - alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT_KHR; + alloc_flags.flags = VK_MEMORY_ALLOCATE_DEVICE_ADDRESS_BIT; VkMemoryAllocateInfo alloc_info = vku::InitStructHelper(&alloc_flags); alloc_info.allocationSize = 4096; vkt::DeviceMemory mem(*m_device, alloc_info); diff --git a/tests/unit/render_pass.cpp b/tests/unit/render_pass.cpp index e3fcbfe218a..79cea434912 100644 --- a/tests/unit/render_pass.cpp +++ b/tests/unit/render_pass.cpp @@ -168,31 +168,31 @@ TEST_F(NegativeRenderPass, AttachmentDescriptionFinalLayout) { } if (separate_depth_stencil_layouts_features.separateDepthStencilLayouts) { - attach_desc.initialLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR; + attach_desc.initialLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-format-03286", "VUID-VkAttachmentDescription2-format-03286"); - attach_desc.initialLayout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR; + attach_desc.initialLayout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-format-03286", "VUID-VkAttachmentDescription2-format-03286"); - attach_desc.initialLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR; + attach_desc.initialLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-format-03286", "VUID-VkAttachmentDescription2-format-03286"); - attach_desc.initialLayout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL_KHR; + attach_desc.initialLayout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-format-03286", "VUID-VkAttachmentDescription2-format-03286"); attach_desc.initialLayout = VK_IMAGE_LAYOUT_GENERAL; - attach_desc.finalLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR; + attach_desc.finalLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-format-03287", "VUID-VkAttachmentDescription2-format-03287"); - attach_desc.finalLayout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR; + attach_desc.finalLayout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-format-03287", "VUID-VkAttachmentDescription2-format-03287"); - attach_desc.finalLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR; + attach_desc.finalLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-format-03287", "VUID-VkAttachmentDescription2-format-03287"); - attach_desc.finalLayout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL_KHR; + attach_desc.finalLayout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-format-03287", "VUID-VkAttachmentDescription2-format-03287"); @@ -201,19 +201,19 @@ TEST_F(NegativeRenderPass, AttachmentDescriptionFinalLayout) { if (depth_format) { attach_desc.format = depth_format; - attach_desc.initialLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR; + attach_desc.initialLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-format-03290", "VUID-VkAttachmentDescription2-format-03290"); - attach_desc.initialLayout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL_KHR; + attach_desc.initialLayout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-format-03290", "VUID-VkAttachmentDescription2-format-03290"); attach_desc.initialLayout = VK_IMAGE_LAYOUT_GENERAL; - attach_desc.finalLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR; + attach_desc.finalLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-format-03291", "VUID-VkAttachmentDescription2-format-03291"); - attach_desc.finalLayout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL_KHR; + attach_desc.finalLayout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-format-03291", "VUID-VkAttachmentDescription2-format-03291"); @@ -223,19 +223,19 @@ TEST_F(NegativeRenderPass, AttachmentDescriptionFinalLayout) { if (stencil_format) { attach_desc.format = stencil_format; - attach_desc.initialLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR; + attach_desc.initialLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-format-03292", "VUID-VkAttachmentDescription2-format-06247"); - attach_desc.initialLayout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR; + attach_desc.initialLayout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-format-03292", "VUID-VkAttachmentDescription2-format-06247"); attach_desc.initialLayout = VK_IMAGE_LAYOUT_GENERAL; - attach_desc.finalLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR; + attach_desc.finalLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-format-03293", "VUID-VkAttachmentDescription2-format-06248"); - attach_desc.finalLayout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR; + attach_desc.finalLayout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-format-03293", "VUID-VkAttachmentDescription2-format-06248"); @@ -244,9 +244,9 @@ TEST_F(NegativeRenderPass, AttachmentDescriptionFinalLayout) { if (rp2Supported && depth_stencil_format) { attach_desc.format = depth_stencil_format; - attach_desc.initialLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR; + attach_desc.initialLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL; - VkAttachmentDescriptionStencilLayoutKHR attachment_description_stencil_layout = vku::InitStructHelper(); + VkAttachmentDescriptionStencilLayout attachment_description_stencil_layout = vku::InitStructHelper(); attachment_description_stencil_layout.stencilInitialLayout = VK_IMAGE_LAYOUT_GENERAL; attachment_description_stencil_layout.stencilFinalLayout = VK_IMAGE_LAYOUT_GENERAL; auto rpci2 = ConvertVkRenderPassCreateInfoToV2KHR(rpci); @@ -254,8 +254,8 @@ TEST_F(NegativeRenderPass, AttachmentDescriptionFinalLayout) { VkImageLayout forbidden_layouts[] = { VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, - VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR, - VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR, + VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL, + VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL, @@ -268,7 +268,7 @@ TEST_F(NegativeRenderPass, AttachmentDescriptionFinalLayout) { TestRenderPass2KHRCreate(*m_errorMonitor, *m_device, *rpci2.ptr(), {"VUID-VkAttachmentDescriptionStencilLayout-stencilInitialLayout-03308"}); } - attachment_description_stencil_layout.stencilInitialLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR; + attachment_description_stencil_layout.stencilInitialLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL; for (size_t i = 0; i < forbidden_layouts_array_size; ++i) { attachment_description_stencil_layout.stencilFinalLayout = forbidden_layouts[i]; TestRenderPass2KHRCreate(*m_errorMonitor, *m_device, *rpci2.ptr(), @@ -287,22 +287,22 @@ TEST_F(NegativeRenderPass, AttachmentDescriptionFinalLayout) { if (depth_format) { attach_desc.format = depth_format; - attach_desc.initialLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR; + attach_desc.initialLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-separateDepthStencilLayouts-03284", "VUID-VkAttachmentDescription2-separateDepthStencilLayouts-03284"); - attach_desc.initialLayout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR; + attach_desc.initialLayout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-separateDepthStencilLayouts-03284", "VUID-VkAttachmentDescription2-separateDepthStencilLayouts-03284"); attach_desc.initialLayout = VK_IMAGE_LAYOUT_GENERAL; - attach_desc.finalLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR; + attach_desc.finalLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-separateDepthStencilLayouts-03285", "VUID-VkAttachmentDescription2-separateDepthStencilLayouts-03285"); - attach_desc.finalLayout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR; + attach_desc.finalLayout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-separateDepthStencilLayouts-03285", "VUID-VkAttachmentDescription2-separateDepthStencilLayouts-03285"); @@ -312,22 +312,22 @@ TEST_F(NegativeRenderPass, AttachmentDescriptionFinalLayout) { if (stencil_format) { attach_desc.format = stencil_format; - attach_desc.initialLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR; + attach_desc.initialLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-separateDepthStencilLayouts-03284", "VUID-VkAttachmentDescription2-separateDepthStencilLayouts-03284"); - attach_desc.initialLayout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL_KHR; + attach_desc.initialLayout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-separateDepthStencilLayouts-03284", "VUID-VkAttachmentDescription2-separateDepthStencilLayouts-03284"); attach_desc.initialLayout = VK_IMAGE_LAYOUT_GENERAL; - attach_desc.finalLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR; + attach_desc.finalLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-separateDepthStencilLayouts-03285", "VUID-VkAttachmentDescription2-separateDepthStencilLayouts-03285"); - attach_desc.finalLayout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL_KHR; + attach_desc.finalLayout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-separateDepthStencilLayouts-03285", "VUID-VkAttachmentDescription2-separateDepthStencilLayouts-03285"); @@ -352,19 +352,19 @@ TEST_F(NegativeRenderPass, AttachmentDescriptionFinalLayout) { { attach_desc.finalLayout = VK_IMAGE_LAYOUT_GENERAL; - attach_desc.initialLayout = VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR; + attach_desc.initialLayout = VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-synchronization2-06908", "VUID-VkAttachmentDescription2-synchronization2-06908"); - attach_desc.initialLayout = VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR; + attach_desc.initialLayout = VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-synchronization2-06908", "VUID-VkAttachmentDescription2-synchronization2-06908"); attach_desc.initialLayout = VK_IMAGE_LAYOUT_GENERAL; - attach_desc.finalLayout = VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR; + attach_desc.finalLayout = VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-synchronization2-06909", "VUID-VkAttachmentDescription2-synchronization2-06909"); - attach_desc.finalLayout = VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR; + attach_desc.finalLayout = VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2Supported, "VUID-VkAttachmentDescription-synchronization2-06909", "VUID-VkAttachmentDescription2-synchronization2-06909"); @@ -731,21 +731,21 @@ TEST_F(NegativeRenderPass, AttachmentReferenceLayout) { rpci2.pSubpasses[0].pColorAttachments[0].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; rpci2.pSubpasses[0].pDepthStencilAttachment->aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT; - rpci2.pSubpasses[0].pDepthStencilAttachment->layout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR; + rpci2.pSubpasses[0].pDepthStencilAttachment->layout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL; TestRenderPass2KHRCreate( *m_errorMonitor, *m_device, *rpci2.ptr(), {"VUID-VkAttachmentReference2-separateDepthStencilLayouts-03313", "VUID-VkRenderPassCreateInfo2-attachment-06244"}); - rpci2.pSubpasses[0].pDepthStencilAttachment->layout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR; + rpci2.pSubpasses[0].pDepthStencilAttachment->layout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL; TestRenderPass2KHRCreate( *m_errorMonitor, *m_device, *rpci2.ptr(), {"VUID-VkAttachmentReference2-separateDepthStencilLayouts-03313", "VUID-VkRenderPassCreateInfo2-attachment-06244"}); rpci2.pSubpasses[0].pDepthStencilAttachment->aspectMask = VK_IMAGE_ASPECT_STENCIL_BIT; - rpci2.pSubpasses[0].pDepthStencilAttachment->layout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR; + rpci2.pSubpasses[0].pDepthStencilAttachment->layout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL; TestRenderPass2KHRCreate( *m_errorMonitor, *m_device, *rpci2.ptr(), {"VUID-VkAttachmentReference2-separateDepthStencilLayouts-03313", "VUID-VkRenderPassCreateInfo2-attachment-06245"}); - rpci2.pSubpasses[0].pDepthStencilAttachment->layout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL_KHR; + rpci2.pSubpasses[0].pDepthStencilAttachment->layout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL; TestRenderPass2KHRCreate( *m_errorMonitor, *m_device, *rpci2.ptr(), {"VUID-VkAttachmentReference2-separateDepthStencilLayouts-03313", "VUID-VkRenderPassCreateInfo2-attachment-06245"}); @@ -753,7 +753,7 @@ TEST_F(NegativeRenderPass, AttachmentReferenceLayout) { // test RenderPass 1 refs[0].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - refs[1].layout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR; + refs[1].layout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL; m_errorMonitor->SetDesiredError("VUID-VkRenderPassCreateInfo2-attachment-06244"); TestRenderPassCreate(m_errorMonitor, *m_device, rpci, false, "VUID-VkAttachmentReference-separateDepthStencilLayouts-03313", nullptr); @@ -828,11 +828,11 @@ TEST_F(NegativeRenderPass, AttachmentReferenceLayoutSeparateDepthStencilLayoutsF rpci2.pSubpasses[0].pColorAttachments[0].aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; rpci2.pSubpasses[0].pColorAttachments[0].layout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; rpci2.pSubpasses[0].pDepthStencilAttachment->aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT; - rpci2.pSubpasses[0].pDepthStencilAttachment->layout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR; + rpci2.pSubpasses[0].pDepthStencilAttachment->layout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL; // Set a valid VkAttachmentReferenceStencilLayout since the feature bit is set VkAttachmentReferenceStencilLayout attachment_reference_stencil_layout = vku::InitStructHelper(); - attachment_reference_stencil_layout.stencilLayout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL_KHR; + attachment_reference_stencil_layout.stencilLayout = VK_IMAGE_LAYOUT_STENCIL_READ_ONLY_OPTIMAL; rpci2.pSubpasses[0].pDepthStencilAttachment->pNext = &attachment_reference_stencil_layout; // reset to valid layout @@ -842,9 +842,9 @@ TEST_F(NegativeRenderPass, AttachmentReferenceLayoutSeparateDepthStencilLayoutsF { rpci2.pSubpasses[0].pDepthStencilAttachment->aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT; - rpci2.pSubpasses[0].pDepthStencilAttachment->layout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR; + rpci2.pSubpasses[0].pDepthStencilAttachment->layout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL; PositiveTestRenderPass2KHRCreate(*m_device, *rpci2.ptr()); - rpci2.pSubpasses[0].pDepthStencilAttachment->layout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR; + rpci2.pSubpasses[0].pDepthStencilAttachment->layout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL; PositiveTestRenderPass2KHRCreate(*m_device, *rpci2.ptr()); } { @@ -862,9 +862,9 @@ TEST_F(NegativeRenderPass, AttachmentReferenceLayoutSeparateDepthStencilLayoutsF { rpci2.pSubpasses[0].pDepthStencilAttachment->aspectMask = VK_IMAGE_ASPECT_STENCIL_BIT; - rpci2.pSubpasses[0].pDepthStencilAttachment->layout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR; + rpci2.pSubpasses[0].pDepthStencilAttachment->layout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL; PositiveTestRenderPass2KHRCreate(*m_device, *rpci2.ptr()); - rpci2.pSubpasses[0].pDepthStencilAttachment->layout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR; + rpci2.pSubpasses[0].pDepthStencilAttachment->layout = VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL; PositiveTestRenderPass2KHRCreate(*m_device, *rpci2.ptr()); } @@ -874,8 +874,8 @@ TEST_F(NegativeRenderPass, AttachmentReferenceLayoutSeparateDepthStencilLayoutsF std::array forbidden_layouts = { VK_IMAGE_LAYOUT_PREINITIALIZED, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, - VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR, - VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL_KHR, + VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL, + VK_IMAGE_LAYOUT_DEPTH_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL, VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL, VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_STENCIL_READ_ONLY_OPTIMAL, @@ -883,27 +883,27 @@ TEST_F(NegativeRenderPass, AttachmentReferenceLayoutSeparateDepthStencilLayoutsF // VK_IMAGE_LAYOUT_PRESENT_SRC_KHR // Would need VK_KHR_swapchain }; rpci2.pSubpasses[0].pDepthStencilAttachment->aspectMask = VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT; - rpci2.pSubpasses[0].pDepthStencilAttachment->layout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL_KHR; + rpci2.pSubpasses[0].pDepthStencilAttachment->layout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL; for (size_t i = 0; i < forbidden_layouts.size(); ++i) { attachment_reference_stencil_layout.stencilLayout = forbidden_layouts[i]; TestRenderPass2KHRCreate(*m_errorMonitor, *m_device, *rpci2.ptr(), {"VUID-VkAttachmentReferenceStencilLayout-stencilLayout-03318"}); } - attachment_reference_stencil_layout.stencilLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR; + attachment_reference_stencil_layout.stencilLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL; - VkAttachmentDescriptionStencilLayoutKHR attachment_description_stencil_layout = vku::InitStructHelper(); - attachment_description_stencil_layout.stencilInitialLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR; - attachment_description_stencil_layout.stencilFinalLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR; + VkAttachmentDescriptionStencilLayout attachment_description_stencil_layout = vku::InitStructHelper(); + attachment_description_stencil_layout.stencilInitialLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL; + attachment_description_stencil_layout.stencilFinalLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL; rpci2.pAttachments[1].pNext = &attachment_description_stencil_layout; - rpci2.pAttachments[1].initialLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR; + rpci2.pAttachments[1].initialLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL; rpci2.pAttachments[1].finalLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL; TestRenderPass2KHRCreate(*m_errorMonitor, *m_device, *rpci2.ptr(), {"VUID-VkAttachmentDescription2-format-06906"}); rpci2.pAttachments[1].initialLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL; - rpci2.pAttachments[1].finalLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR; + rpci2.pAttachments[1].finalLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL; TestRenderPass2KHRCreate(*m_errorMonitor, *m_device, *rpci2.ptr(), {"VUID-VkAttachmentDescription2-format-06907"}); rpci2.pAttachments[1].pNext = nullptr; @@ -948,7 +948,7 @@ TEST_F(NegativeRenderPass, AttachmentReferenceSync2Layout) { auto rpci = vku::InitStruct(nullptr, 0u, 2u, attach, 1u, subpasses, 0u, nullptr); // Use READ_ONLY_OPTIMAL_KHR layout - refs[0].layout = VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR; + refs[0].layout = VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL; { m_errorMonitor->SetDesiredError("VUID-VkAttachmentReference-synchronization2-06910"); m_errorMonitor->SetDesiredError("VUID-VkSubpassDescription-attachment-06922"); @@ -964,7 +964,7 @@ TEST_F(NegativeRenderPass, AttachmentReferenceSync2Layout) { } // Use ATTACHMENT_OPTIMAL_KHR layout - refs[0].layout = VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR; + refs[0].layout = VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, true, "VUID-VkAttachmentReference-synchronization2-06910", "VUID-VkAttachmentReference2-synchronization2-06910"); } @@ -1089,7 +1089,7 @@ TEST_F(NegativeRenderPass, BeginWithinRenderPass) { m_errorMonitor->VerifyFound(); if (rp2Supported) { - auto subpassBeginInfo = vku::InitStruct(nullptr, VK_SUBPASS_CONTENTS_INLINE); + auto subpassBeginInfo = vku::InitStruct(nullptr, VK_SUBPASS_CONTENTS_INLINE); m_errorMonitor->SetDesiredError("VUID-vkCmdBeginRenderPass2-renderpass"); vk::CmdBeginRenderPass2KHR(m_command_buffer.handle(), &m_renderPassBeginInfo, &subpassBeginInfo); @@ -1305,7 +1305,7 @@ TEST_F(NegativeRenderPass, BeginLayoutsStencilBufferImageUsageMismatches) { stencil_layout.stencilInitialLayout = stencil_initial_layout; stencil_layout.stencilFinalLayout = VK_IMAGE_LAYOUT_GENERAL; - VkAttachmentReferenceStencilLayoutKHR stencil_ref = vku::InitStructHelper(); + VkAttachmentReferenceStencilLayout stencil_ref = vku::InitStructHelper(); stencil_ref.stencilLayout = VK_IMAGE_LAYOUT_GENERAL; RenderPass2SingleSubpass rp(*this); @@ -2049,7 +2049,7 @@ TEST_F(NegativeRenderPass, DepthStencilResolveMode) { VkRenderPass renderPass; - VkAttachmentDescription2KHR attachmentDescriptions[2] = {}; + VkAttachmentDescription2 attachmentDescriptions[2] = {}; // Depth/stencil attachment attachmentDescriptions[0] = vku::InitStructHelper(); attachmentDescriptions[0].samples = VK_SAMPLE_COUNT_4_BIT; @@ -2063,18 +2063,18 @@ TEST_F(NegativeRenderPass, DepthStencilResolveMode) { attachmentDescriptions[1].finalLayout = VK_IMAGE_LAYOUT_GENERAL; attachmentDescriptions[1].stencilLoadOp = VK_ATTACHMENT_LOAD_OP_CLEAR; - VkAttachmentReference2KHR depthStencilAttachmentReference = vku::InitStructHelper(); + VkAttachmentReference2 depthStencilAttachmentReference = vku::InitStructHelper(); depthStencilAttachmentReference.layout = VK_IMAGE_LAYOUT_GENERAL; depthStencilAttachmentReference.attachment = 0; - VkAttachmentReference2KHR depthStencilResolveAttachmentReference = vku::InitStructHelper(); + VkAttachmentReference2 depthStencilResolveAttachmentReference = vku::InitStructHelper(); depthStencilResolveAttachmentReference.layout = VK_IMAGE_LAYOUT_GENERAL; depthStencilResolveAttachmentReference.attachment = 1; - VkSubpassDescriptionDepthStencilResolveKHR subpassDescriptionDSR = vku::InitStructHelper(); + VkSubpassDescriptionDepthStencilResolve subpassDescriptionDSR = vku::InitStructHelper(); subpassDescriptionDSR.pDepthStencilResolveAttachment = &depthStencilResolveAttachmentReference; - VkSubpassDescription2KHR subpassDescription = vku::InitStructHelper(&subpassDescriptionDSR); + VkSubpassDescription2 subpassDescription = vku::InitStructHelper(&subpassDescriptionDSR); subpassDescription.pDepthStencilAttachment = &depthStencilAttachmentReference; - VkRenderPassCreateInfo2KHR renderPassCreateInfo = vku::InitStructHelper(); + VkRenderPassCreateInfo2 renderPassCreateInfo = vku::InitStructHelper(); renderPassCreateInfo.attachmentCount = 2; renderPassCreateInfo.subpassCount = 1; renderPassCreateInfo.pSubpasses = &subpassDescription; @@ -2801,11 +2801,11 @@ TEST_F(NegativeRenderPass, MultisampledRenderToSingleSampled) { pipe_helper.ms_ci_.rasterizationSamples = VK_SAMPLE_COUNT_2_BIT; pipe_helper.CreateGraphicsPipeline(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; ms_render_to_ss.rasterizationSamples = VK_SAMPLE_COUNT_4_BIT; - VkRenderingInfoKHR begin_rendering_info = vku::InitStructHelper(&ms_render_to_ss); + VkRenderingInfo begin_rendering_info = vku::InitStructHelper(&ms_render_to_ss); begin_rendering_info.layerCount = 1; begin_rendering_info.colorAttachmentCount = 1; begin_rendering_info.pColorAttachments = &color_attachment; @@ -2985,7 +2985,7 @@ TEST_F(NegativeRenderPass, MultisampledRenderToSingleSampled) { if (imageless_fb_supported) { VkFormat framebufferAttachmentFormats[1] = {unsampleable_format}; - VkFramebufferAttachmentImageInfoKHR framebufferAttachmentImageInfo = vku::InitStructHelper(); + VkFramebufferAttachmentImageInfo framebufferAttachmentImageInfo = vku::InitStructHelper(); framebufferAttachmentImageInfo.flags = image_create_info.flags; framebufferAttachmentImageInfo.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; framebufferAttachmentImageInfo.width = 64; @@ -2993,7 +2993,7 @@ TEST_F(NegativeRenderPass, MultisampledRenderToSingleSampled) { framebufferAttachmentImageInfo.layerCount = 1; framebufferAttachmentImageInfo.viewFormatCount = 1; framebufferAttachmentImageInfo.pViewFormats = framebufferAttachmentFormats; - VkFramebufferAttachmentsCreateInfoKHR framebufferAttachmentsCreateInfo = vku::InitStructHelper(); + VkFramebufferAttachmentsCreateInfo framebufferAttachmentsCreateInfo = vku::InitStructHelper(); framebufferAttachmentsCreateInfo.attachmentImageInfoCount = 1; framebufferAttachmentsCreateInfo.pAttachmentImageInfos = &framebufferAttachmentImageInfo; rpci.attachmentCount = 1; @@ -3003,7 +3003,7 @@ TEST_F(NegativeRenderPass, MultisampledRenderToSingleSampled) { auto imageless_fbci = vku::InitStruct(nullptr, 0u, imageless_rp.handle(), 1u, nullptr, 64u, 64u, 1u); imageless_fbci.pNext = &framebufferAttachmentsCreateInfo; - imageless_fbci.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR; + imageless_fbci.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT; vkt::Framebuffer imageless_fb(*m_device, imageless_fbci); VkRenderPassAttachmentBeginInfo renderPassAttachmentBeginInfo = vku::InitStructHelper(); @@ -3490,7 +3490,7 @@ TEST_F(NegativeRenderPass, SubpassAttachmentImageLayoutSynchronization2) { VkAttachmentReference ref{}; ref.attachment = 0; - ref.layout = VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL_KHR; + ref.layout = VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL; subpass.inputAttachmentCount = 1; subpass.pInputAttachments = &ref; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2_supported, "VUID-VkSubpassDescription-attachment-06921", @@ -3498,7 +3498,7 @@ TEST_F(NegativeRenderPass, SubpassAttachmentImageLayoutSynchronization2) { reset_subpass(); - ref.layout = VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR; + ref.layout = VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL; subpass.colorAttachmentCount = 1; subpass.pColorAttachments = &ref; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2_supported, "VUID-VkSubpassDescription-attachment-06922", @@ -3511,7 +3511,7 @@ TEST_F(NegativeRenderPass, SubpassAttachmentImageLayoutSynchronization2) { subpass.colorAttachmentCount = 1; subpass.pColorAttachments = &color_ref; - ref.layout = VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL_KHR; + ref.layout = VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL; subpass.pResolveAttachments = &ref; TestRenderPassCreate(m_errorMonitor, *m_device, rpci, rp2_supported, "VUID-VkSubpassDescription-attachment-06923", "VUID-VkSubpassDescription2-attachment-06923"); @@ -3612,7 +3612,7 @@ TEST_F(NegativeRenderPass, SubpassAttachmentImageLayoutSeparateDepthStencil) { "VUID-VkSubpassDescription2-attachment-06920"); } - auto depth_stencil_attachment = vku::InitStruct( + auto depth_stencil_attachment = vku::InitStruct( nullptr, static_cast(0), VK_FORMAT_S8_UINT, VK_SAMPLE_COUNT_2_BIT, VK_ATTACHMENT_LOAD_OP_DONT_CARE, VK_ATTACHMENT_STORE_OP_STORE, VK_ATTACHMENT_LOAD_OP_DONT_CARE, VK_ATTACHMENT_STORE_OP_DONT_CARE, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_GENERAL); @@ -3623,14 +3623,14 @@ TEST_F(NegativeRenderPass, SubpassAttachmentImageLayoutSeparateDepthStencil) { vk::GetPhysicalDeviceImageFormatProperties(gpu_, depth_stencil_attachment.format, VK_IMAGE_TYPE_2D, VK_IMAGE_TILING_OPTIMAL, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT, 0u, &imageFormatProperties); if (rp2_supported && res == VK_SUCCESS) { - VkRenderPassCreateInfo2KHR rpci2 = vku::InitStructHelper(); + VkRenderPassCreateInfo2 rpci2 = vku::InitStructHelper(); rpci2.attachmentCount = 1; rpci2.pAttachments = &depth_stencil_attachment; - VkAttachmentReferenceStencilLayoutKHR stencil_ref = vku::InitStructHelper(); - stencil_ref.stencilLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL_KHR; - VkAttachmentReference2KHR depth_stencil_ref = vku::InitStructHelper(&stencil_ref); + VkAttachmentReferenceStencilLayout stencil_ref = vku::InitStructHelper(); + stencil_ref.stencilLayout = VK_IMAGE_LAYOUT_STENCIL_ATTACHMENT_OPTIMAL; + VkAttachmentReference2 depth_stencil_ref = vku::InitStructHelper(&stencil_ref); depth_stencil_ref.attachment = 0; - VkSubpassDescription2KHR subpass2 = vku::InitStructHelper(); + VkSubpassDescription2 subpass2 = vku::InitStructHelper(); subpass2.pDepthStencilAttachment = &depth_stencil_ref; rpci2.subpassCount = 1; rpci2.pSubpasses = &subpass2; @@ -4166,7 +4166,7 @@ TEST_F(NegativeRenderPass, RenderPassWithRenderPassStripedQueueSubmit2) { cb_submit_info.commandBuffer = cmd_buffer.handle(); m_errorMonitor->SetDesiredError("VUID-VkCommandBufferSubmitInfo-commandBuffer-09445"); - VkSubmitInfo2KHR submit_info = vku::InitStructHelper(); + VkSubmitInfo2 submit_info = vku::InitStructHelper(); submit_info.commandBufferInfoCount = 1; submit_info.pCommandBufferInfos = &cb_submit_info; vk::QueueSubmit2KHR(m_default_queue->handle(), 1, &submit_info, VK_NULL_HANDLE); @@ -4174,8 +4174,8 @@ TEST_F(NegativeRenderPass, RenderPassWithRenderPassStripedQueueSubmit2) { m_errorMonitor->VerifyFound(); VkSemaphoreCreateInfo semaphore_create_info = vku::InitStructHelper(); - VkSemaphoreTypeCreateInfoKHR semaphore_type_create_info = vku::InitStructHelper(); - semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE_KHR; + VkSemaphoreTypeCreateInfo semaphore_type_create_info = vku::InitStructHelper(); + semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE; VkSemaphoreCreateInfo semaphore_timeline_create_info = vku::InitStructHelper(&semaphore_type_create_info); vkt::Semaphore semaphore[stripe_count + 1]; VkSemaphoreSubmitInfo semaphore_submit_infos[stripe_count + 1]; @@ -4223,7 +4223,7 @@ TEST_F(NegativeRenderPass, MissingNestedCommandBuffersFeature2) { InitRenderTarget(); auto subpassBeginInfo = - vku::InitStruct(nullptr, VK_SUBPASS_CONTENTS_INLINE_AND_SECONDARY_COMMAND_BUFFERS_KHR); + vku::InitStruct(nullptr, VK_SUBPASS_CONTENTS_INLINE_AND_SECONDARY_COMMAND_BUFFERS_KHR); m_command_buffer.Begin(); m_errorMonitor->SetDesiredError("VUID-VkSubpassBeginInfo-contents-09382"); diff --git a/tests/unit/render_pass_positive.cpp b/tests/unit/render_pass_positive.cpp index 3ed045a8ec6..022662b222b 100644 --- a/tests/unit/render_pass_positive.cpp +++ b/tests/unit/render_pass_positive.cpp @@ -326,7 +326,7 @@ TEST_F(PositiveRenderPass, ImagelessFramebufferNonZeroBaseMip) { rp.AddColorAttachment(0); rp.CreateRenderPass(); - VkFramebufferAttachmentImageInfoKHR fb_attachment_image_info = vku::InitStructHelper(); + VkFramebufferAttachmentImageInfo fb_attachment_image_info = vku::InitStructHelper(); fb_attachment_image_info.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT; fb_attachment_image_info.width = width; fb_attachment_image_info.height = height; @@ -336,12 +336,12 @@ TEST_F(PositiveRenderPass, ImagelessFramebufferNonZeroBaseMip) { fb_attachment_image_info.height = 1; fb_attachment_image_info.width = width >> base_mip; - VkFramebufferAttachmentsCreateInfoKHR fb_attachments_ci = vku::InitStructHelper(); + VkFramebufferAttachmentsCreateInfo fb_attachments_ci = vku::InitStructHelper(); fb_attachments_ci.attachmentImageInfoCount = 1; fb_attachments_ci.pAttachmentImageInfos = &fb_attachment_image_info; VkFramebufferCreateInfo fb_ci = vku::InitStructHelper(&fb_attachments_ci); - fb_ci.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT_KHR; + fb_ci.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT; fb_ci.width = width >> base_mip; fb_ci.height = height; fb_ci.layers = 1; @@ -365,7 +365,7 @@ TEST_F(PositiveRenderPass, ImagelessFramebufferNonZeroBaseMip) { vkt::ImageView image_view_obj = image.CreateView(VK_IMAGE_VIEW_TYPE_1D_ARRAY, base_mip, 1, 0, 1); VkImageView image_view = image_view_obj.handle(); - VkRenderPassAttachmentBeginInfoKHR rp_attachment_begin_info = vku::InitStructHelper(); + VkRenderPassAttachmentBeginInfo rp_attachment_begin_info = vku::InitStructHelper(); rp_attachment_begin_info.attachmentCount = 1; rp_attachment_begin_info.pAttachments = &image_view; VkRenderPassBeginInfo rp_begin_info = vku::InitStructHelper(&rp_attachment_begin_info); @@ -609,8 +609,7 @@ TEST_F(PositiveRenderPass, BeginWithViewMasks) { const vkt::DescriptorSetLayout ds_layout(*m_device, {dsl_binding}); // Create push descriptor set layout - const vkt::DescriptorSetLayout push_ds_layout(*m_device, {dsl_binding}, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT_KHR); + const vkt::DescriptorSetLayout push_ds_layout(*m_device, {dsl_binding}, VK_DESCRIPTOR_SET_LAYOUT_CREATE_PUSH_DESCRIPTOR_BIT); // Use helper to create graphics pipeline CreatePipelineHelper helper(*this); @@ -1308,7 +1307,7 @@ TEST_F(PositiveRenderPass, BeginRenderPassWithRenderPassStriped) { VkCommandBufferSubmitInfo cb_submit_info = vku::InitStructHelper(&rp_stripe_submit_info); cb_submit_info.commandBuffer = cmd_buffer.handle(); - VkSubmitInfo2KHR submit_info = vku::InitStructHelper(); + VkSubmitInfo2 submit_info = vku::InitStructHelper(); submit_info.commandBufferInfoCount = 1; submit_info.pCommandBufferInfos = &cb_submit_info; vk::QueueSubmit2KHR(m_default_queue->handle(), 1, &submit_info, VK_NULL_HANDLE); diff --git a/tests/unit/robustness.cpp b/tests/unit/robustness.cpp index 53a410647ea..7e1126fdb51 100644 --- a/tests/unit/robustness.cpp +++ b/tests/unit/robustness.cpp @@ -23,8 +23,8 @@ TEST_F(NegativeRobustness, PipelineRobustnessDisabled) { RETURN_IF_SKIP(Init()); { - VkPipelineRobustnessCreateInfoEXT pipeline_robustness_info = vku::InitStructHelper(); - pipeline_robustness_info.storageBuffers = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT; + VkPipelineRobustnessCreateInfo pipeline_robustness_info = vku::InitStructHelper(); + pipeline_robustness_info.storageBuffers = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2; CreateComputePipelineHelper pipe(*this, &pipeline_robustness_info); m_errorMonitor->SetDesiredError("VUID-VkPipelineRobustnessCreateInfo-pipelineRobustness-06926"); @@ -33,8 +33,8 @@ TEST_F(NegativeRobustness, PipelineRobustnessDisabled) { } { - VkPipelineRobustnessCreateInfoEXT pipeline_robustness_info = vku::InitStructHelper(); - pipeline_robustness_info.uniformBuffers = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT; + VkPipelineRobustnessCreateInfo pipeline_robustness_info = vku::InitStructHelper(); + pipeline_robustness_info.uniformBuffers = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2; CreateComputePipelineHelper pipe(*this, &pipeline_robustness_info); m_errorMonitor->SetDesiredError("VUID-VkPipelineRobustnessCreateInfo-pipelineRobustness-06927"); @@ -43,8 +43,8 @@ TEST_F(NegativeRobustness, PipelineRobustnessDisabled) { } { - VkPipelineRobustnessCreateInfoEXT pipeline_robustness_info = vku::InitStructHelper(); - pipeline_robustness_info.vertexInputs = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT; + VkPipelineRobustnessCreateInfo pipeline_robustness_info = vku::InitStructHelper(); + pipeline_robustness_info.vertexInputs = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2; CreateComputePipelineHelper pipe(*this, &pipeline_robustness_info); m_errorMonitor->SetDesiredError("VUID-VkPipelineRobustnessCreateInfo-pipelineRobustness-06928"); @@ -53,8 +53,8 @@ TEST_F(NegativeRobustness, PipelineRobustnessDisabled) { } { - VkPipelineRobustnessCreateInfoEXT pipeline_robustness_info = vku::InitStructHelper(); - pipeline_robustness_info.images = VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_2_EXT; + VkPipelineRobustnessCreateInfo pipeline_robustness_info = vku::InitStructHelper(); + pipeline_robustness_info.images = VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_2; CreateComputePipelineHelper pipe(*this, &pipeline_robustness_info); m_errorMonitor->SetDesiredError("VUID-VkPipelineRobustnessCreateInfo-pipelineRobustness-06929"); @@ -74,8 +74,8 @@ TEST_F(NegativeRobustness, PipelineRobustnessDisabledShaderStage) { pipe.LateBindPipelineInfo(); - VkPipelineRobustnessCreateInfoEXT pipeline_robustness_info = vku::InitStructHelper(); - pipeline_robustness_info.storageBuffers = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT; + VkPipelineRobustnessCreateInfo pipeline_robustness_info = vku::InitStructHelper(); + pipeline_robustness_info.storageBuffers = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2; pipe.cp_ci_.stage.pNext = &pipeline_robustness_info; m_errorMonitor->SetDesiredError("VUID-VkPipelineRobustnessCreateInfo-pipelineRobustness-06926"); @@ -105,8 +105,8 @@ TEST_F(NegativeRobustness, PipelineRobustnessDisabledShaderStageWithIdentifier) sm_id_create_info.identifierSize = get_identifier.identifierSize; sm_id_create_info.pIdentifier = get_identifier.identifier; - VkPipelineRobustnessCreateInfoEXT pipeline_robustness_info = vku::InitStructHelper(&sm_id_create_info); - pipeline_robustness_info.storageBuffers = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT; + VkPipelineRobustnessCreateInfo pipeline_robustness_info = vku::InitStructHelper(&sm_id_create_info); + pipeline_robustness_info.storageBuffers = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2; pipe.cp_ci_.stage.module = VK_NULL_HANDLE; pipe.cp_ci_.stage.pNext = &pipeline_robustness_info; pipe.cp_ci_.flags |= VK_PIPELINE_CREATE_FAIL_ON_PIPELINE_COMPILE_REQUIRED_BIT; @@ -146,9 +146,9 @@ TEST_F(NegativeRobustness, DISABLED_PipelineRobustnessRobustBufferAccess2Unsuppo RETURN_IF_SKIP(InitState(nullptr, &features2)); { - VkPipelineRobustnessCreateInfoEXT pipeline_robustness_info = vku::InitStructHelper(); + VkPipelineRobustnessCreateInfo pipeline_robustness_info = vku::InitStructHelper(); CreateComputePipelineHelper pipe(*this, &pipeline_robustness_info); - pipeline_robustness_info.storageBuffers = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT; + pipeline_robustness_info.storageBuffers = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2; m_errorMonitor->SetDesiredError("VUID-VkPipelineRobustnessCreateInfo-robustBufferAccess2-06931"); pipe.CreateComputePipeline(); @@ -156,9 +156,9 @@ TEST_F(NegativeRobustness, DISABLED_PipelineRobustnessRobustBufferAccess2Unsuppo } { - VkPipelineRobustnessCreateInfoEXT pipeline_robustness_info = vku::InitStructHelper(); + VkPipelineRobustnessCreateInfo pipeline_robustness_info = vku::InitStructHelper(); CreateComputePipelineHelper pipe(*this, &pipeline_robustness_info); - pipeline_robustness_info.uniformBuffers = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT; + pipeline_robustness_info.uniformBuffers = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2; m_errorMonitor->SetDesiredError("VUID-VkPipelineRobustnessCreateInfo-robustBufferAccess2-06932"); pipe.CreateComputePipeline(); @@ -166,9 +166,9 @@ TEST_F(NegativeRobustness, DISABLED_PipelineRobustnessRobustBufferAccess2Unsuppo } { - VkPipelineRobustnessCreateInfoEXT pipeline_robustness_info = vku::InitStructHelper(); + VkPipelineRobustnessCreateInfo pipeline_robustness_info = vku::InitStructHelper(); CreateComputePipelineHelper pipe(*this, &pipeline_robustness_info); - pipeline_robustness_info.vertexInputs = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2_EXT; + pipeline_robustness_info.vertexInputs = VK_PIPELINE_ROBUSTNESS_BUFFER_BEHAVIOR_ROBUST_BUFFER_ACCESS_2; m_errorMonitor->SetDesiredError("VUID-VkPipelineRobustnessCreateInfo-robustBufferAccess2-06933"); pipe.CreateComputePipeline(); @@ -205,9 +205,9 @@ TEST_F(NegativeRobustness, DISABLED_PipelineRobustnessRobustImageAccess2Unsuppor RETURN_IF_SKIP(InitState(nullptr, &features2)); - VkPipelineRobustnessCreateInfoEXT pipeline_robustness_info = vku::InitStructHelper(); + VkPipelineRobustnessCreateInfo pipeline_robustness_info = vku::InitStructHelper(); CreateComputePipelineHelper pipe(*this, &pipeline_robustness_info); - pipeline_robustness_info.images = VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_2_EXT; + pipeline_robustness_info.images = VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_2; m_errorMonitor->SetDesiredError("VUID-VkPipelineRobustnessCreateInfo-robustImageAccess2-06934"); pipe.CreateComputePipeline(); @@ -228,9 +228,9 @@ TEST_F(NegativeRobustness, PipelineRobustnessRobustImageAccessNotExposed) { GTEST_SKIP() << "VK_EXT_image_robustness is supported"; } - VkPipelineRobustnessCreateInfoEXT pipeline_robustness_info = vku::InitStructHelper(); + VkPipelineRobustnessCreateInfo pipeline_robustness_info = vku::InitStructHelper(); CreateComputePipelineHelper pipe(*this, &pipeline_robustness_info); - pipeline_robustness_info.images = VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_EXT; + pipeline_robustness_info.images = VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS; m_errorMonitor->SetDesiredError("VUID-VkPipelineRobustnessCreateInfo-robustImageAccess-06930"); pipe.CreateComputePipeline(); diff --git a/tests/unit/robustness_positive.cpp b/tests/unit/robustness_positive.cpp index 839c1b003f6..524e25b135d 100644 --- a/tests/unit/robustness_positive.cpp +++ b/tests/unit/robustness_positive.cpp @@ -81,8 +81,8 @@ TEST_F(PositiveRobustness, PipelineRobustnessRobustImageAccessExposed) { AddRequiredFeature(vkt::Feature::pipelineRobustness); RETURN_IF_SKIP(Init()); - VkPipelineRobustnessCreateInfoEXT pipeline_robustness_info = vku::InitStructHelper(); + VkPipelineRobustnessCreateInfo pipeline_robustness_info = vku::InitStructHelper(); CreateComputePipelineHelper pipe(*this, &pipeline_robustness_info); - pipeline_robustness_info.images = VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS_EXT; + pipeline_robustness_info.images = VK_PIPELINE_ROBUSTNESS_IMAGE_BEHAVIOR_ROBUST_IMAGE_ACCESS; pipe.CreateComputePipeline(); } diff --git a/tests/unit/sampler.cpp b/tests/unit/sampler.cpp index 1c511f627e5..bb89679f623 100644 --- a/tests/unit/sampler.cpp +++ b/tests/unit/sampler.cpp @@ -1028,7 +1028,7 @@ TEST_F(NegativeSampler, UnnormalizedCoordinatesCombinedSampler) { vk::GetPhysicalDeviceFormatProperties2(Gpu(), VK_FORMAT_R8G8B8A8_UNORM, &fmt_props); - if (!(fmt_props_3.optimalTilingFeatures & VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT_KHR)) { + if (!(fmt_props_3.optimalTilingFeatures & VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT)) { GTEST_SKIP() << "R8G8B8A8_UNORM does not support OpImage*Dref* operations"; } } @@ -1121,7 +1121,7 @@ TEST_F(NegativeSampler, UnnormalizedCoordinatesSeparateSampler) { vk::GetPhysicalDeviceFormatProperties2(Gpu(), VK_FORMAT_R8G8B8A8_UNORM, &fmt_props); - if (!(fmt_props_3.optimalTilingFeatures & VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT_KHR)) { + if (!(fmt_props_3.optimalTilingFeatures & VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT)) { GTEST_SKIP() << "R8G8B8A8_UNORM does not support OpImage*Dref* operations"; } } diff --git a/tests/unit/secondary_command_buffer.cpp b/tests/unit/secondary_command_buffer.cpp index fb4588632fb..5615d4abaa4 100644 --- a/tests/unit/secondary_command_buffer.cpp +++ b/tests/unit/secondary_command_buffer.cpp @@ -109,10 +109,10 @@ TEST_F(NegativeSecondaryCommandBuffer, Sync2AsPrimary) { secondary.Begin(); secondary.End(); - VkCommandBufferSubmitInfoKHR cb_info = vku::InitStructHelper(); + VkCommandBufferSubmitInfo cb_info = vku::InitStructHelper(); cb_info.commandBuffer = secondary.handle(); - VkSubmitInfo2KHR submit_info = vku::InitStructHelper(); + VkSubmitInfo2 submit_info = vku::InitStructHelper(); submit_info.commandBufferInfoCount = 1; submit_info.pCommandBufferInfos = &cb_info; @@ -718,7 +718,7 @@ TEST_F(NegativeSecondaryCommandBuffer, NestedCommandBufferRendering) { vkt::CommandBuffer secondary1(*m_device, m_command_pool, VK_COMMAND_BUFFER_LEVEL_SECONDARY); vkt::CommandBuffer secondary2(*m_device, m_command_pool, VK_COMMAND_BUFFER_LEVEL_SECONDARY); - VkCommandBufferInheritanceRenderingInfoKHR cbiri = vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo cbiri = vku::InitStructHelper(); cbiri.colorAttachmentCount = 1; cbiri.pColorAttachmentFormats = &m_render_target_fmt; cbiri.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; @@ -754,7 +754,7 @@ TEST_F(NegativeSecondaryCommandBuffer, NestedCommandBufferSimultaneousUse) { vkt::CommandBuffer secondary1(*m_device, m_command_pool, VK_COMMAND_BUFFER_LEVEL_SECONDARY); vkt::CommandBuffer secondary2(*m_device, m_command_pool, VK_COMMAND_BUFFER_LEVEL_SECONDARY); - VkCommandBufferInheritanceRenderingInfoKHR cbiri = vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo cbiri = vku::InitStructHelper(); cbiri.colorAttachmentCount = 1; cbiri.pColorAttachmentFormats = &m_render_target_fmt; cbiri.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; @@ -797,7 +797,7 @@ TEST_F(NegativeSecondaryCommandBuffer, MaxCommandBufferNestingLevel) { vkt::CommandBuffer secondary3(*m_device, m_command_pool, VK_COMMAND_BUFFER_LEVEL_SECONDARY); vkt::CommandBuffer secondary4(*m_device, m_command_pool, VK_COMMAND_BUFFER_LEVEL_SECONDARY); - VkCommandBufferInheritanceRenderingInfoKHR cbiri = vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo cbiri = vku::InitStructHelper(); cbiri.colorAttachmentCount = 1; cbiri.pColorAttachmentFormats = &m_render_target_fmt; cbiri.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; diff --git a/tests/unit/secondary_command_buffer_positive.cpp b/tests/unit/secondary_command_buffer_positive.cpp index d8ac51ab608..d2665551d68 100644 --- a/tests/unit/secondary_command_buffer_positive.cpp +++ b/tests/unit/secondary_command_buffer_positive.cpp @@ -377,7 +377,7 @@ TEST_F(PositiveSecondaryCommandBuffer, Nested) { vkt::CommandBuffer secondary1(*m_device, m_command_pool, VK_COMMAND_BUFFER_LEVEL_SECONDARY); vkt::CommandBuffer secondary2(*m_device, m_command_pool, VK_COMMAND_BUFFER_LEVEL_SECONDARY); - VkCommandBufferInheritanceRenderingInfoKHR cbiri = vku::InitStructHelper(); + VkCommandBufferInheritanceRenderingInfo cbiri = vku::InitStructHelper(); cbiri.colorAttachmentCount = 1; cbiri.pColorAttachmentFormats = &m_render_target_fmt; cbiri.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; diff --git a/tests/unit/shader_interface.cpp b/tests/unit/shader_interface.cpp index 5a6ca50675c..7b9ac6ebfe8 100644 --- a/tests/unit/shader_interface.cpp +++ b/tests/unit/shader_interface.cpp @@ -1695,7 +1695,7 @@ TEST_F(NegativeShaderInterface, DISABLED_CreatePipelineFragmentOutputNotWrittenD VkShaderObj fs(this, kMinimalShaderGlsl, VK_SHADER_STAGE_FRAGMENT_BIT); VkFormat color_formats = VK_FORMAT_R8G8B8A8_UNORM; - VkPipelineRenderingCreateInfoKHR pipeline_rendering_info = vku::InitStructHelper(); + VkPipelineRenderingCreateInfo pipeline_rendering_info = vku::InitStructHelper(); pipeline_rendering_info.colorAttachmentCount = 1; pipeline_rendering_info.pColorAttachmentFormats = &color_formats; diff --git a/tests/unit/shader_object.cpp b/tests/unit/shader_object.cpp index aaba056711c..8d82ced1475 100644 --- a/tests/unit/shader_object.cpp +++ b/tests/unit/shader_object.cpp @@ -1555,7 +1555,7 @@ TEST_F(NegativeShaderObject, ColorWriteEnableAttachmentCount) { attachments[1].loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; attachments[1].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - VkRenderingInfoKHR renderingInfo = vku::InitStructHelper(); + VkRenderingInfo renderingInfo = vku::InitStructHelper(); renderingInfo.renderArea = {{0, 0}, {100u, 100u}}; renderingInfo.layerCount = 1u; renderingInfo.colorAttachmentCount = 2u; @@ -2284,7 +2284,7 @@ TEST_F(NegativeShaderObject, MissingPolygonModeCmdSetLineStippleEnableEXT) { m_command_buffer.BeginRenderingColor(GetDynamicRenderTarget(), GetRenderTargetArea()); SetDefaultDynamicStatesExclude(); vk::CmdSetPolygonModeEXT(m_command_buffer.handle(), VK_POLYGON_MODE_LINE); - vk::CmdSetLineRasterizationModeEXT(m_command_buffer.handle(), VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR); + vk::CmdSetLineRasterizationModeEXT(m_command_buffer.handle(), VK_LINE_RASTERIZATION_MODE_DEFAULT); m_command_buffer.BindVertFragShader(vertShader, fragShader); vk::CmdDraw(m_command_buffer.handle(), 4, 1, 0, 0); m_command_buffer.EndRendering(); @@ -2311,7 +2311,7 @@ TEST_F(NegativeShaderObject, MissingPrimitiveTopologyCmdSetLineStippleEnableEXT) m_command_buffer.BeginRenderingColor(GetDynamicRenderTarget(), GetRenderTargetArea()); SetDefaultDynamicStatesExclude(); vk::CmdSetPrimitiveTopologyEXT(m_command_buffer.handle(), VK_PRIMITIVE_TOPOLOGY_LINE_LIST); - vk::CmdSetLineRasterizationModeEXT(m_command_buffer.handle(), VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR); + vk::CmdSetLineRasterizationModeEXT(m_command_buffer.handle(), VK_LINE_RASTERIZATION_MODE_DEFAULT); m_command_buffer.BindVertFragShader(vertShader, fragShader); vk::CmdDraw(m_command_buffer.handle(), 4, 1, 0, 0); m_command_buffer.EndRendering(); @@ -3245,7 +3245,7 @@ TEST_F(NegativeShaderObject, MissingCmdSetPrimitiveTopologyEXT) { GLSLToSPV(VK_SHADER_STAGE_FRAGMENT_BIT, kFragmentMinimalGlsl)); m_command_buffer.Begin(); m_command_buffer.BeginRenderingColor(GetDynamicRenderTarget(), GetRenderTargetArea()); - SetDefaultDynamicStatesExclude({VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY_EXT}); + SetDefaultDynamicStatesExclude({VK_DYNAMIC_STATE_PRIMITIVE_TOPOLOGY}); m_command_buffer.BindVertFragShader(vertShader, fragShader); vk::CmdDraw(m_command_buffer.handle(), 4, 1, 0, 0); m_command_buffer.EndRendering(); @@ -3331,7 +3331,7 @@ TEST_F(NegativeShaderObject, MissingCmdSetPrimitiveRestartEnableEXT) { GLSLToSPV(VK_SHADER_STAGE_FRAGMENT_BIT, kFragmentMinimalGlsl)); m_command_buffer.Begin(); m_command_buffer.BeginRenderingColor(GetDynamicRenderTarget(), GetRenderTargetArea()); - SetDefaultDynamicStatesExclude({VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE_EXT}); + SetDefaultDynamicStatesExclude({VK_DYNAMIC_STATE_PRIMITIVE_RESTART_ENABLE}); m_command_buffer.BindVertFragShader(vertShader, fragShader); vk::CmdDraw(m_command_buffer.handle(), 4, 1, 0, 0); m_command_buffer.EndRendering(); @@ -3651,7 +3651,7 @@ TEST_F(NegativeShaderObject, MissingCmdSetCullModeEXT) { GLSLToSPV(VK_SHADER_STAGE_FRAGMENT_BIT, kFragmentMinimalGlsl)); m_command_buffer.Begin(); m_command_buffer.BeginRenderingColor(GetDynamicRenderTarget(), GetRenderTargetArea()); - SetDefaultDynamicStatesExclude({VK_DYNAMIC_STATE_CULL_MODE_EXT}); + SetDefaultDynamicStatesExclude({VK_DYNAMIC_STATE_CULL_MODE}); m_command_buffer.BindVertFragShader(vertShader, fragShader); vk::CmdDraw(m_command_buffer.handle(), 4, 1, 0, 0); m_command_buffer.EndRendering(); @@ -3674,7 +3674,7 @@ TEST_F(NegativeShaderObject, MissingCmdSetFrontFaceEXT) { GLSLToSPV(VK_SHADER_STAGE_FRAGMENT_BIT, kFragmentMinimalGlsl)); m_command_buffer.Begin(); m_command_buffer.BeginRenderingColor(GetDynamicRenderTarget(), GetRenderTargetArea()); - SetDefaultDynamicStatesExclude({VK_DYNAMIC_STATE_FRONT_FACE_EXT}); + SetDefaultDynamicStatesExclude({VK_DYNAMIC_STATE_FRONT_FACE}); m_command_buffer.BindVertFragShader(vertShader, fragShader); vk::CmdSetCullModeEXT(m_command_buffer.handle(), VK_CULL_MODE_BACK_BIT); vk::CmdDraw(m_command_buffer.handle(), 4, 1, 0, 0); @@ -3698,7 +3698,7 @@ TEST_F(NegativeShaderObject, MissingCmdSetDepthTestEnableEXT) { GLSLToSPV(VK_SHADER_STAGE_FRAGMENT_BIT, kFragmentMinimalGlsl)); m_command_buffer.Begin(); m_command_buffer.BeginRenderingColor(GetDynamicRenderTarget(), GetRenderTargetArea()); - SetDefaultDynamicStatesExclude({VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT}); + SetDefaultDynamicStatesExclude({VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE}); m_command_buffer.BindVertFragShader(vertShader, fragShader); vk::CmdDraw(m_command_buffer.handle(), 4, 1, 0, 0); m_command_buffer.EndRendering(); @@ -3721,7 +3721,7 @@ TEST_F(NegativeShaderObject, MissingCmdSetDepthWriteEnableEXT) { GLSLToSPV(VK_SHADER_STAGE_FRAGMENT_BIT, kFragmentMinimalGlsl)); m_command_buffer.Begin(); m_command_buffer.BeginRenderingColor(GetDynamicRenderTarget(), GetRenderTargetArea()); - SetDefaultDynamicStatesExclude({VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT}); + SetDefaultDynamicStatesExclude({VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE}); m_command_buffer.BindVertFragShader(vertShader, fragShader); vk::CmdDraw(m_command_buffer.handle(), 4, 1, 0, 0); m_command_buffer.EndRendering(); @@ -3744,7 +3744,7 @@ TEST_F(NegativeShaderObject, MissingCmdSetDepthCompareOp) { GLSLToSPV(VK_SHADER_STAGE_FRAGMENT_BIT, kFragmentMinimalGlsl)); m_command_buffer.Begin(); m_command_buffer.BeginRenderingColor(GetDynamicRenderTarget(), GetRenderTargetArea()); - SetDefaultDynamicStatesExclude({VK_DYNAMIC_STATE_DEPTH_COMPARE_OP_EXT}); + SetDefaultDynamicStatesExclude({VK_DYNAMIC_STATE_DEPTH_COMPARE_OP}); vk::CmdSetDepthTestEnableEXT(m_command_buffer.handle(), VK_TRUE); m_command_buffer.BindVertFragShader(vertShader, fragShader); vk::CmdDraw(m_command_buffer.handle(), 4, 1, 0, 0); @@ -3769,7 +3769,7 @@ TEST_F(NegativeShaderObject, MissingCmdSetDepthBoundsTestEnable) { GLSLToSPV(VK_SHADER_STAGE_FRAGMENT_BIT, kFragmentMinimalGlsl)); m_command_buffer.Begin(); m_command_buffer.BeginRenderingColor(GetDynamicRenderTarget(), GetRenderTargetArea()); - SetDefaultDynamicStatesExclude({VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE_EXT}); + SetDefaultDynamicStatesExclude({VK_DYNAMIC_STATE_DEPTH_BOUNDS_TEST_ENABLE}); m_command_buffer.BindVertFragShader(vertShader, fragShader); vk::CmdDraw(m_command_buffer.handle(), 4, 1, 0, 0); m_command_buffer.EndRendering(); @@ -3815,7 +3815,7 @@ TEST_F(NegativeShaderObject, MissingCmdSetStencilOp) { GLSLToSPV(VK_SHADER_STAGE_FRAGMENT_BIT, kFragmentMinimalGlsl)); m_command_buffer.Begin(); m_command_buffer.BeginRenderingColor(GetDynamicRenderTarget(), GetRenderTargetArea()); - SetDefaultDynamicStatesExclude({VK_DYNAMIC_STATE_STENCIL_OP_EXT}); + SetDefaultDynamicStatesExclude({VK_DYNAMIC_STATE_STENCIL_OP}); vk::CmdSetStencilTestEnableEXT(m_command_buffer.handle(), VK_TRUE); m_command_buffer.BindVertFragShader(vertShader, fragShader); vk::CmdDraw(m_command_buffer.handle(), 4, 1, 0, 0); @@ -5272,7 +5272,7 @@ TEST_F(NegativeShaderObject, MissingLineStippleEnable) { m_command_buffer.BeginRenderingColor(GetDynamicRenderTarget(), GetRenderTargetArea()); SetDefaultDynamicStatesExclude({VK_DYNAMIC_STATE_LINE_STIPPLE_ENABLE_EXT}); m_command_buffer.BindVertFragShader(vertShader, fragShader); - vk::CmdSetLineRasterizationModeEXT(m_command_buffer.handle(), VK_LINE_RASTERIZATION_MODE_DEFAULT_KHR); + vk::CmdSetLineRasterizationModeEXT(m_command_buffer.handle(), VK_LINE_RASTERIZATION_MODE_DEFAULT); vk::CmdBindShadersEXT(m_command_buffer.handle(), 1u, &stages[1], &geomShader.handle()); vk::CmdDraw(m_command_buffer.handle(), 3, 1, 0, 0); m_command_buffer.EndRendering(); @@ -5888,7 +5888,7 @@ TEST_F(NegativeShaderObject, MaxMultiviewInstanceIndex) { color_attachment.loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; color_attachment.storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - VkRenderingInfoKHR renderingInfo = vku::InitStructHelper(); + VkRenderingInfo renderingInfo = vku::InitStructHelper(); renderingInfo.renderArea = {{0, 0}, {100u, 100u}}; renderingInfo.layerCount = 1u; renderingInfo.colorAttachmentCount = 1u; @@ -5951,7 +5951,7 @@ TEST_F(NegativeShaderObject, MaxFragmentDualSrcAttachmentsDynamicBlendEnable) { attachments[1].loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; attachments[1].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - VkRenderingInfoKHR renderingInfo = vku::InitStructHelper(); + VkRenderingInfo renderingInfo = vku::InitStructHelper(); renderingInfo.renderArea = {{0, 0}, {100u, 100u}}; renderingInfo.layerCount = 1u; renderingInfo.colorAttachmentCount = 2u; @@ -7146,7 +7146,7 @@ TEST_F(NegativeShaderObject, InlineUniformBlockArray) { OneOffDescriptorSet descriptor_set(m_device, { {0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_ALL, nullptr}, - {1, VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT, 8, VK_SHADER_STAGE_ALL, nullptr}, + {1, VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK, 8, VK_SHADER_STAGE_ALL, nullptr}, }, 0, nullptr, 0, nullptr, &pool_inline_info); diff --git a/tests/unit/shader_object_positive.cpp b/tests/unit/shader_object_positive.cpp index f341ce33dbc..03cd2087a70 100644 --- a/tests/unit/shader_object_positive.cpp +++ b/tests/unit/shader_object_positive.cpp @@ -733,7 +733,7 @@ TEST_F(PositiveShaderObject, FailCreateShaders) { createInfos[fail_index].pCode = reinterpret_cast(pCode); VkResult res = vk::CreateShadersEXT(m_device->handle(), 20u, createInfos, nullptr, shaders); - ASSERT_EQ(res, VK_ERROR_INCOMPATIBLE_SHADER_BINARY_EXT); + ASSERT_EQ(res, VK_INCOMPATIBLE_SHADER_BINARY_EXT); for (uint32_t i = 0; i < shaders_count; ++i) { if (i < fail_index) { @@ -1239,7 +1239,7 @@ TEST_F(PositiveShaderObject, OutputToMultipleAttachments) { attachments[1].loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; attachments[1].storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - VkRenderingInfoKHR renderingInfo = vku::InitStructHelper(); + VkRenderingInfo renderingInfo = vku::InitStructHelper(); renderingInfo.renderArea = {{0, 0}, {100u, 100u}}; renderingInfo.layerCount = 1u; renderingInfo.colorAttachmentCount = 2u; @@ -1321,11 +1321,11 @@ TEST_F(PositiveShaderObject, DrawInSecondaryCommandBuffersWithRenderPassContinue m_command_buffer.Begin(); - VkRenderingAttachmentInfoKHR color_attachment = vku::InitStructHelper(); + VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = GetDynamicRenderTarget(); color_attachment.imageLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - VkRenderingInfoKHR renderingInfo = vku::InitStructHelper(); + VkRenderingInfo renderingInfo = vku::InitStructHelper(); renderingInfo.flags = VK_RENDERING_CONTENTS_SECONDARY_COMMAND_BUFFERS_BIT; renderingInfo.colorAttachmentCount = 1; renderingInfo.pColorAttachments = &color_attachment; @@ -1535,7 +1535,7 @@ TEST_F(PositiveShaderObject, IgnoredColorAttachmentCount) { const vkt::Shader fragShader(*m_device, VK_SHADER_STAGE_FRAGMENT_BIT, GLSLToSPV(VK_SHADER_STAGE_FRAGMENT_BIT, kFragmentMinimalGlsl)); - VkRenderingInfoKHR renderingInfo = vku::InitStructHelper(); + VkRenderingInfo renderingInfo = vku::InitStructHelper(); renderingInfo.colorAttachmentCount = 0; renderingInfo.layerCount = 1; renderingInfo.renderArea = {{0, 0}, {1, 1}}; diff --git a/tests/unit/shader_spirv_positive.cpp b/tests/unit/shader_spirv_positive.cpp index b43bdeb2a5e..cb70d130253 100644 --- a/tests/unit/shader_spirv_positive.cpp +++ b/tests/unit/shader_spirv_positive.cpp @@ -728,7 +728,7 @@ TEST_F(PositiveShaderSpirv, UnnormalizedCoordinatesNotSampled) { vk::GetPhysicalDeviceFormatProperties2(Gpu(), VK_FORMAT_R8G8B8A8_UNORM, &fmt_props); - if (!(fmt_props_3.optimalTilingFeatures & VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT_KHR)) { + if (!(fmt_props_3.optimalTilingFeatures & VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT)) { GTEST_SKIP() << "R8G8B8A8_UNORM does not support OpImage*Dref* operations"; } } diff --git a/tests/unit/shader_storage_image.cpp b/tests/unit/shader_storage_image.cpp index 2afb3d27249..a46db8abd75 100644 --- a/tests/unit/shader_storage_image.cpp +++ b/tests/unit/shader_storage_image.cpp @@ -161,7 +161,7 @@ TEST_F(NegativeShaderStorageImage, MissingFormatReadForFormat) { vk::GetPhysicalDeviceFormatProperties2(Gpu(), (VkFormat)fmt, &fmt_props); - const bool has_storage = (fmt_props_3.optimalTilingFeatures & VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT_KHR) != 0; + const bool has_storage = (fmt_props_3.optimalTilingFeatures & VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT) != 0; const bool has_read_without_format = (fmt_props_3.optimalTilingFeatures & VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT_KHR) != 0; @@ -311,9 +311,9 @@ TEST_F(NegativeShaderStorageImage, MissingFormatWriteForFormat) { vk::GetPhysicalDeviceFormatProperties2(Gpu(), (VkFormat)fmt, &fmt_props); - const bool has_storage = (fmt_props_3.optimalTilingFeatures & VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT_KHR) != 0; + const bool has_storage = (fmt_props_3.optimalTilingFeatures & VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT) != 0; const bool has_write_without_format = - (fmt_props_3.optimalTilingFeatures & VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT_KHR) != 0; + (fmt_props_3.optimalTilingFeatures & VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT) != 0; if (!has_storage) continue; @@ -424,13 +424,13 @@ TEST_F(NegativeShaderStorageImage, MissingFormatWriteForFormat) { vk::CmdBindDescriptorSets(m_command_buffer.handle(), VK_PIPELINE_BIND_POINT_COMPUTE, cs_pipeline.pipeline_layout_.handle(), 0, 1, &ds.set_, 0, nullptr); - if ((tests[t].props.optimalTilingFeatures & VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT_KHR) == 0) { + if ((tests[t].props.optimalTilingFeatures & VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT) == 0) { m_errorMonitor->SetDesiredError("VUID-vkCmdDispatch-OpTypeImage-07027"); } vk::CmdDispatch(m_command_buffer.handle(), 1, 1, 1); m_command_buffer.End(); - if ((tests[t].props.optimalTilingFeatures & VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT_KHR) == 0) { + if ((tests[t].props.optimalTilingFeatures & VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT) == 0) { m_errorMonitor->VerifyFound(); } } @@ -767,7 +767,7 @@ TEST_F(NegativeShaderStorageImage, UnknownWriteLessComponent) { VkFormatProperties3KHR fmt_props_3 = vku::InitStructHelper(); VkFormatProperties2 fmt_props = vku::InitStructHelper(&fmt_props_3); vk::GetPhysicalDeviceFormatProperties2(Gpu(), format, &fmt_props); - if ((fmt_props_3.optimalTilingFeatures & VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT_KHR) == 0) { + if ((fmt_props_3.optimalTilingFeatures & VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT) == 0) { GTEST_SKIP() << "Format doesn't support storage write without format"; } diff --git a/tests/unit/shader_storage_image_positive.cpp b/tests/unit/shader_storage_image_positive.cpp index 8b0d805f63f..a36f070b838 100644 --- a/tests/unit/shader_storage_image_positive.cpp +++ b/tests/unit/shader_storage_image_positive.cpp @@ -144,7 +144,7 @@ TEST_F(PositiveShaderStorageImage, UnknownWriteMoreComponent) { VkFormatProperties3KHR fmt_props_3 = vku::InitStructHelper(); VkFormatProperties2 fmt_props = vku::InitStructHelper(&fmt_props_3); vk::GetPhysicalDeviceFormatProperties2(Gpu(), format, &fmt_props); - if ((fmt_props_3.optimalTilingFeatures & VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT_KHR) == 0) { + if ((fmt_props_3.optimalTilingFeatures & VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT) == 0) { GTEST_SKIP() << "Format doesn't support storage write without format"; } diff --git a/tests/unit/shader_storage_texel.cpp b/tests/unit/shader_storage_texel.cpp index dc2d8aea90f..88c43043ab5 100644 --- a/tests/unit/shader_storage_texel.cpp +++ b/tests/unit/shader_storage_texel.cpp @@ -127,7 +127,7 @@ TEST_F(NegativeShaderStorageTexel, UnknownWriteLessComponent) { VkFormatProperties3KHR fmt_props_3 = vku::InitStructHelper(); VkFormatProperties2 fmt_props = vku::InitStructHelper(&fmt_props_3); vk::GetPhysicalDeviceFormatProperties2(Gpu(), VK_FORMAT_R8G8B8A8_UINT, &fmt_props); - if ((fmt_props_3.bufferFeatures & VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT_KHR) == 0) { + if ((fmt_props_3.bufferFeatures & VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT) == 0) { GTEST_SKIP() << "Format doesn't support storage write without format"; } diff --git a/tests/unit/sparse_image.cpp b/tests/unit/sparse_image.cpp index 9373f01dc00..b5c9a838a4e 100644 --- a/tests/unit/sparse_image.cpp +++ b/tests/unit/sparse_image.cpp @@ -760,10 +760,10 @@ TEST_F(NegativeSparseImage, DISABLED_QueueBindSparseMemoryType4) { SetTargetApiVersion(VK_API_VERSION_1_1); #ifdef _WIN32 const auto ext_mem_extension_name = VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR; + const auto handle_type = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_WIN32_BIT; #else const auto ext_mem_extension_name = VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR; + const auto handle_type = VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT; #endif AddRequiredExtensions(VK_KHR_EXTERNAL_MEMORY_EXTENSION_NAME); @@ -783,8 +783,8 @@ TEST_F(NegativeSparseImage, DISABLED_QueueBindSparseMemoryType4) { VkExternalBufferPropertiesKHR external_buffer_props = {VK_STRUCTURE_TYPE_EXTERNAL_BUFFER_PROPERTIES_KHR, nullptr, {0, 0, 0}}; vk::GetPhysicalDeviceExternalBufferPropertiesKHR(Gpu(), &external_buffer_info, &external_buffer_props); if (!(external_buffer_props.externalMemoryProperties.compatibleHandleTypes & handle_type) || - !(external_buffer_props.externalMemoryProperties.externalMemoryFeatures & VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT_KHR) || - !(external_buffer_props.externalMemoryProperties.externalMemoryFeatures & VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_KHR)) { + !(external_buffer_props.externalMemoryProperties.externalMemoryFeatures & VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT) || + !(external_buffer_props.externalMemoryProperties.externalMemoryFeatures & VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT)) { GTEST_SKIP() << "External buffer does not support importing and exporting"; } @@ -794,10 +794,10 @@ TEST_F(NegativeSparseImage, DISABLED_QueueBindSparseMemoryType4) { // Check if dedicated allocation is required const bool dedicated_allocation = - external_buffer_props.externalMemoryProperties.externalMemoryFeatures & VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT_KHR; + external_buffer_props.externalMemoryProperties.externalMemoryFeatures & VK_EXTERNAL_MEMORY_FEATURE_DEDICATED_ONLY_BIT; /// Allocate buffer and buffer memory with no supported external type - VkExternalMemoryBufferCreateInfoKHR external_memory_buffer_info = vku::InitStructHelper(); + VkExternalMemoryBufferCreateInfo external_memory_buffer_info = vku::InitStructHelper(); external_memory_buffer_info.handleTypes = handle_type; // TODO ".handleTypes = 0;" used handle_type for debugging purposes VkBufferCreateInfo buffer_create_info = vku::InitStructHelper(&external_memory_buffer_info); buffer_create_info.flags = VK_BUFFER_CREATE_SPARSE_BINDING_BIT; @@ -806,12 +806,12 @@ TEST_F(NegativeSparseImage, DISABLED_QueueBindSparseMemoryType4) { vkt::Buffer buffer(*m_device, buffer_create_info, vkt::no_mem); VkMemoryAllocateInfo buffer_mem_alloc = vkt::DeviceMemory::GetResourceAllocInfo(*m_device, buffer.MemoryRequirements(), 0); - VkExportMemoryAllocateInfoKHR export_info = vku::InitStructHelper(); + VkExportMemoryAllocateInfo export_info = vku::InitStructHelper(); export_info.handleTypes = handle_type; buffer_mem_alloc.pNext = &export_info; // Add dedicated allocation info to pNext chain if required - VkMemoryDedicatedAllocateInfoKHR dedicated_info = vku::InitStructHelper(); + VkMemoryDedicatedAllocateInfo dedicated_info = vku::InitStructHelper(); dedicated_info.buffer = buffer; if (dedicated_allocation) { export_info.pNext = &dedicated_info; diff --git a/tests/unit/subgroups.cpp b/tests/unit/subgroups.cpp index f47d65ec8ed..0e5ee1fb485 100644 --- a/tests/unit/subgroups.cpp +++ b/tests/unit/subgroups.cpp @@ -311,14 +311,14 @@ TEST_F(NegativeSubgroup, PipelineSubgroupSizeControl) { GTEST_SKIP() << "Required shader stage not present in requiredSubgroupSizeStages"; } - VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT subgroup_size_control = vku::InitStructHelper(); + VkPipelineShaderStageRequiredSubgroupSizeCreateInfo subgroup_size_control = vku::InitStructHelper(); subgroup_size_control.requiredSubgroupSize = subgroup_properties.minSubgroupSize; { CreateComputePipelineHelper cs_pipeline(*this); cs_pipeline.LateBindPipelineInfo(); cs_pipeline.cp_ci_.stage.pNext = &subgroup_size_control; - cs_pipeline.cp_ci_.stage.flags = VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT_EXT; + cs_pipeline.cp_ci_.stage.flags = VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT; m_errorMonitor->SetDesiredError("VUID-VkPipelineShaderStageCreateInfo-pNext-02754"); cs_pipeline.CreateComputePipeline(false); // need false to prevent late binding m_errorMonitor->VerifyFound(); @@ -336,8 +336,8 @@ TEST_F(NegativeSubgroup, PipelineSubgroupSizeControl) { CreateComputePipelineHelper cs_pipeline(*this); cs_pipeline.cs_ = std::make_unique(this, csSource.str().c_str(), VK_SHADER_STAGE_COMPUTE_BIT); cs_pipeline.LateBindPipelineInfo(); - cs_pipeline.cp_ci_.stage.flags = VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT_EXT | - VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT_EXT; + cs_pipeline.cp_ci_.stage.flags = VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT | + VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT; m_errorMonitor->SetDesiredError("VUID-VkPipelineShaderStageCreateInfo-flags-02758"); cs_pipeline.CreateComputePipeline(false); // need false to prevent late binding m_errorMonitor->VerifyFound(); @@ -355,7 +355,7 @@ TEST_F(NegativeSubgroup, PipelineSubgroupSizeControl) { CreateComputePipelineHelper cs_pipeline(*this); cs_pipeline.cs_ = std::make_unique(this, csSource.str().c_str(), VK_SHADER_STAGE_COMPUTE_BIT); cs_pipeline.LateBindPipelineInfo(); - cs_pipeline.cp_ci_.stage.flags = VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT_EXT; + cs_pipeline.cp_ci_.stage.flags = VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT; m_errorMonitor->SetDesiredError("VUID-VkPipelineShaderStageCreateInfo-flags-02759"); cs_pipeline.CreateComputePipeline(false); // need false to prevent late binding m_errorMonitor->VerifyFound(); @@ -421,13 +421,13 @@ TEST_F(NegativeSubgroup, SubgroupSizeControlFeaturesNotEnabled) { CreateComputePipelineHelper pipe(*this); pipe.cs_ = std::make_unique(this, csSource.str().c_str(), VK_SHADER_STAGE_COMPUTE_BIT); pipe.LateBindPipelineInfo(); - pipe.cp_ci_.stage.flags = VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT_EXT; + pipe.cp_ci_.stage.flags = VK_PIPELINE_SHADER_STAGE_CREATE_ALLOW_VARYING_SUBGROUP_SIZE_BIT; m_errorMonitor->SetDesiredError("VUID-VkPipelineShaderStageCreateInfo-flags-02784"); pipe.CreateComputePipeline(false); m_errorMonitor->VerifyFound(); - pipe.cp_ci_.stage.flags = VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT_EXT; + pipe.cp_ci_.stage.flags = VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT; m_errorMonitor->SetDesiredError("VUID-VkPipelineShaderStageCreateInfo-flags-02785"); pipe.CreateComputePipeline(false); m_errorMonitor->VerifyFound(); @@ -543,7 +543,7 @@ TEST_F(NegativeSubgroup, SubgroupSizeControlStage) { CreatePipelineHelper pipe(*this); pipe.shader_stages_ = {vs.GetStageCreateInfo(), pipe.fs_->GetStageCreateInfo()}; - pipe.shader_stages_[0].flags = VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT_EXT; + pipe.shader_stages_[0].flags = VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT; m_errorMonitor->SetDesiredError("VUID-VkPipelineShaderStageCreateInfo-flags-08988"); pipe.CreateGraphicsPipeline(); m_errorMonitor->VerifyFound(); @@ -608,7 +608,7 @@ TEST_F(NegativeSubgroup, ComputeLocalWorkgroupSize) { GTEST_SKIP() << "Required shader stage not present in requiredSubgroupSizeStages"; } - VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT subgroup_size_control = vku::InitStructHelper(); + VkPipelineShaderStageRequiredSubgroupSizeCreateInfo subgroup_size_control = vku::InitStructHelper(); subgroup_size_control.requiredSubgroupSize = subgroup_properties.minSubgroupSize; uint32_t size = static_cast( @@ -691,7 +691,7 @@ TEST_F(NegativeSubgroup, MeshLocalWorkgroupSize) { GTEST_SKIP() << "Required shader stage not present in requiredSubgroupSizeStages"; } - VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT subgroup_size_control = vku::InitStructHelper(); + VkPipelineShaderStageRequiredSubgroupSizeCreateInfo subgroup_size_control = vku::InitStructHelper(); subgroup_size_control.requiredSubgroupSize = subgroup_properties.minSubgroupSize; if (subgroup_size_control.requiredSubgroupSize * subgroup_properties.maxComputeWorkgroupSubgroups > @@ -764,7 +764,7 @@ TEST_F(NegativeSubgroup, SubgroupSizeControlFeature) { VkPhysicalDeviceSubgroupSizeControlPropertiesEXT subgroup_properties = vku::InitStructHelper(); GetPhysicalDeviceProperties2(subgroup_properties); - VkPipelineShaderStageRequiredSubgroupSizeCreateInfoEXT subgroup_size_control = vku::InitStructHelper(); + VkPipelineShaderStageRequiredSubgroupSizeCreateInfo subgroup_size_control = vku::InitStructHelper(); subgroup_size_control.requiredSubgroupSize = subgroup_properties.minSubgroupSize; CreateComputePipelineHelper pipe(*this); diff --git a/tests/unit/subpass.cpp b/tests/unit/subpass.cpp index d4fd462e5e8..0fa5199ed56 100644 --- a/tests/unit/subpass.cpp +++ b/tests/unit/subpass.cpp @@ -55,7 +55,7 @@ TEST_F(NegativeSubpass, InputAttachmentParameters) { reference.layout = VK_IMAGE_LAYOUT_GENERAL; reference.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; - VkSubpassDescription2KHR subpass = vku::InitStructHelper(); + VkSubpassDescription2 subpass = vku::InitStructHelper(); subpass.pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; subpass.viewMask = 0; subpass.inputAttachmentCount = 1; @@ -321,8 +321,8 @@ TEST_F(NegativeSubpass, NextSubpassExcessive) { m_errorMonitor->VerifyFound(); if (rp2Supported) { - auto subpassBeginInfo = vku::InitStruct(nullptr, VK_SUBPASS_CONTENTS_INLINE); - VkSubpassEndInfoKHR subpassEndInfo = vku::InitStructHelper(); + auto subpassBeginInfo = vku::InitStruct(nullptr, VK_SUBPASS_CONTENTS_INLINE); + VkSubpassEndInfo subpassEndInfo = vku::InitStructHelper(); m_errorMonitor->SetDesiredError("VUID-vkCmdNextSubpass2-None-03102"); @@ -358,7 +358,7 @@ TEST_F(NegativeSubpass, RenderPassEndBeforeFinalSubpass) { m_errorMonitor->VerifyFound(); if (rp2Supported) { - VkSubpassEndInfoKHR subpassEndInfo = vku::InitStructHelper(); + VkSubpassEndInfo subpassEndInfo = vku::InitStructHelper(); m_command_buffer.Reset(); m_command_buffer.Begin(); diff --git a/tests/unit/sync_object.cpp b/tests/unit/sync_object.cpp index 69cd174b477..6d58d480565 100644 --- a/tests/unit/sync_object.cpp +++ b/tests/unit/sync_object.cpp @@ -833,7 +833,7 @@ TEST_F(NegativeSyncObject, Sync2Barriers) { m_command_buffer.EndRenderPass(); // Duplicate barriers that change layout - VkImageMemoryBarrier2KHR img_barrier = vku::InitStructHelper(); + VkImageMemoryBarrier2 img_barrier = vku::InitStructHelper(); img_barrier.image = image.handle(); img_barrier.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED; img_barrier.newLayout = VK_IMAGE_LAYOUT_GENERAL; @@ -848,9 +848,9 @@ TEST_F(NegativeSyncObject, Sync2Barriers) { img_barrier.subresourceRange.baseMipLevel = 0; img_barrier.subresourceRange.layerCount = 1; img_barrier.subresourceRange.levelCount = 1; - VkImageMemoryBarrier2KHR img_barriers[2] = {img_barrier, img_barrier}; + VkImageMemoryBarrier2 img_barriers[2] = {img_barrier, img_barrier}; - VkDependencyInfoKHR dep_info = vku::InitStructHelper(); + VkDependencyInfo dep_info = vku::InitStructHelper(); dep_info.imageMemoryBarrierCount = 2; dep_info.pImageMemoryBarriers = img_barriers; dep_info.dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT; @@ -1402,7 +1402,7 @@ TEST_F(NegativeSyncObject, ImageOwnershipTransferQueueMismatch) { VkImageMemoryBarrier2 acquire_barrier = vku::InitStructHelper(); acquire_barrier.srcStageMask = VK_PIPELINE_STAGE_2_NONE; acquire_barrier.srcAccessMask = VK_ACCESS_2_NONE; - acquire_barrier.dstStageMask = VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT_KHR; + acquire_barrier.dstStageMask = VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT; acquire_barrier.dstAccessMask = VK_ACCESS_2_SHADER_SAMPLED_READ_BIT; acquire_barrier.oldLayout = VK_IMAGE_LAYOUT_GENERAL; acquire_barrier.newLayout = VK_IMAGE_LAYOUT_GENERAL; @@ -2362,7 +2362,7 @@ TEST_F(NegativeSyncObject, Sync2LayoutFeature) { img_barrier.oldLayout = VK_IMAGE_LAYOUT_ATTACHMENT_OPTIMAL; img_barrier.newLayout = VK_IMAGE_LAYOUT_READ_ONLY_OPTIMAL; - VkDependencyInfoKHR dep_info = vku::InitStructHelper(); + VkDependencyInfo dep_info = vku::InitStructHelper(); dep_info.imageMemoryBarrierCount = 1; dep_info.pImageMemoryBarriers = &img_barrier; m_errorMonitor->SetDesiredError("VUID-vkCmdPipelineBarrier2-synchronization2-03848"); @@ -2469,7 +2469,7 @@ TEST_F(NegativeSyncObject, QueueSubmit2KHRUsedButSynchronizaion2Disabled) { bool vulkan_13 = (DeviceValidationVersion() >= VK_API_VERSION_1_3); - VkSubmitInfo2KHR submit_info = vku::InitStructHelper(); + VkSubmitInfo2 submit_info = vku::InitStructHelper(); m_errorMonitor->SetDesiredError("VUID-vkQueueSubmit2-synchronization2-03866"); vk::QueueSubmit2KHR(m_default_queue->handle(), 1, &submit_info, VK_NULL_HANDLE); m_errorMonitor->VerifyFound(); @@ -2541,7 +2541,7 @@ TEST_F(NegativeSyncObject, SemaphoreTypeCreateInfoCore) { VkSemaphore semaphore; - VkSemaphoreTypeCreateInfoKHR semaphore_type_create_info = vku::InitStructHelper(); + VkSemaphoreTypeCreateInfo semaphore_type_create_info = vku::InitStructHelper(); semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE; semaphore_type_create_info.initialValue = 1; @@ -2571,7 +2571,7 @@ TEST_F(NegativeSyncObject, SemaphoreTypeCreateInfoExtension) { VkSemaphore semaphore; - VkSemaphoreTypeCreateInfoKHR semaphore_type_create_info = vku::InitStructHelper(); + VkSemaphoreTypeCreateInfo semaphore_type_create_info = vku::InitStructHelper(); semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE; semaphore_type_create_info.initialValue = 1; @@ -2600,8 +2600,8 @@ TEST_F(NegativeSyncObject, MixedTimelineAndBinarySemaphores) { VkPhysicalDeviceTimelineSemaphorePropertiesKHR timelineproperties = vku::InitStructHelper(); GetPhysicalDeviceProperties2(timelineproperties); - VkSemaphoreTypeCreateInfoKHR semaphore_type_create_info = vku::InitStructHelper(); - semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE_KHR; + VkSemaphoreTypeCreateInfo semaphore_type_create_info = vku::InitStructHelper(); + semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE; semaphore_type_create_info.initialValue = 5; VkSemaphoreCreateInfo semaphore_create_info = vku::InitStructHelper(&semaphore_type_create_info); @@ -2620,7 +2620,7 @@ TEST_F(NegativeSyncObject, MixedTimelineAndBinarySemaphores) { semaphore_signal_info.value = 10; vk::SignalSemaphoreKHR(device(), &semaphore_signal_info); - VkTimelineSemaphoreSubmitInfoKHR timeline_semaphore_submit_info = vku::InitStructHelper(); + VkTimelineSemaphoreSubmitInfo timeline_semaphore_submit_info = vku::InitStructHelper(); uint64_t signalValue = 20; timeline_semaphore_submit_info.waitSemaphoreValueCount = 0; timeline_semaphore_submit_info.pWaitSemaphoreValues = nullptr; @@ -2677,14 +2677,14 @@ TEST_F(NegativeSyncObject, MixedTimelineAndBinarySemaphores) { } TEST_F(NegativeSyncObject, QueueSubmitNoTimelineSemaphoreInfo) { - TEST_DESCRIPTION("Submit a queue with a timeline semaphore but not a VkTimelineSemaphoreSubmitInfoKHR."); + TEST_DESCRIPTION("Submit a queue with a timeline semaphore but not a VkTimelineSemaphoreSubmitInfo."); AddRequiredExtensions(VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME); AddRequiredFeature(vkt::Feature::timelineSemaphore); RETURN_IF_SKIP(Init()); - VkSemaphoreTypeCreateInfoKHR semaphore_type_create_info = vku::InitStructHelper(); - semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE_KHR; + VkSemaphoreTypeCreateInfo semaphore_type_create_info = vku::InitStructHelper(); + semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE; VkSemaphoreCreateInfo semaphore_create_info = vku::InitStructHelper(&semaphore_type_create_info); @@ -2703,7 +2703,7 @@ TEST_F(NegativeSyncObject, QueueSubmitNoTimelineSemaphoreInfo) { vk::QueueSubmit(m_default_queue->handle(), 1, submit_info, VK_NULL_HANDLE); m_errorMonitor->VerifyFound(); - VkTimelineSemaphoreSubmitInfoKHR timeline_semaphore_submit_info = vku::InitStructHelper(); + VkTimelineSemaphoreSubmitInfo timeline_semaphore_submit_info = vku::InitStructHelper(); uint64_t signalValue = 1; timeline_semaphore_submit_info.signalSemaphoreValueCount = 1; timeline_semaphore_submit_info.pSignalSemaphoreValues = &signalValue; @@ -2732,14 +2732,14 @@ TEST_F(NegativeSyncObject, QueueSubmitTimelineSemaphoreValue) { VkPhysicalDeviceTimelineSemaphorePropertiesKHR timelineproperties = vku::InitStructHelper(); GetPhysicalDeviceProperties2(timelineproperties); - VkSemaphoreTypeCreateInfoKHR semaphore_type_create_info = vku::InitStructHelper(); - semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE_KHR; + VkSemaphoreTypeCreateInfo semaphore_type_create_info = vku::InitStructHelper(); + semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE; VkSemaphoreCreateInfo semaphore_create_info = vku::InitStructHelper(&semaphore_type_create_info); vkt::Semaphore semaphore(*m_device, semaphore_create_info); - VkTimelineSemaphoreSubmitInfoKHR timeline_semaphore_submit_info = vku::InitStructHelper(); + VkTimelineSemaphoreSubmitInfo timeline_semaphore_submit_info = vku::InitStructHelper(); uint64_t signalValue = 1; uint64_t waitValue = 3; timeline_semaphore_submit_info.signalSemaphoreValueCount = 1; @@ -2797,7 +2797,7 @@ TEST_F(NegativeSyncObject, QueueSubmitTimelineSemaphoreValue) { uint64_t signal_values[2] = {signalValue, signalValue}; VkSemaphore signal_sems[2] = {semaphore.handle(), semaphore.handle()}; - VkTimelineSemaphoreSubmitInfoKHR tl_info_2 = vku::InitStructHelper(); + VkTimelineSemaphoreSubmitInfo tl_info_2 = vku::InitStructHelper(); tl_info_2.signalSemaphoreValueCount = 2; tl_info_2.pSignalSemaphoreValues = signal_values; @@ -2852,14 +2852,14 @@ TEST_F(NegativeSyncObject, QueueBindSparseTimelineSemaphoreValue) { VkPhysicalDeviceTimelineSemaphorePropertiesKHR timelineproperties = vku::InitStructHelper(); GetPhysicalDeviceProperties2(timelineproperties); - VkSemaphoreTypeCreateInfoKHR semaphore_type_create_info = vku::InitStructHelper(); - semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE_KHR; + VkSemaphoreTypeCreateInfo semaphore_type_create_info = vku::InitStructHelper(); + semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE; VkSemaphoreCreateInfo semaphore_create_info = vku::InitStructHelper(&semaphore_type_create_info); vkt::Semaphore semaphore(*m_device, semaphore_create_info); - VkTimelineSemaphoreSubmitInfoKHR timeline_semaphore_submit_info = vku::InitStructHelper(); + VkTimelineSemaphoreSubmitInfo timeline_semaphore_submit_info = vku::InitStructHelper(); uint64_t signalValue = 1; uint64_t waitValue = 3; timeline_semaphore_submit_info.signalSemaphoreValueCount = 1; @@ -2926,7 +2926,7 @@ TEST_F(NegativeSyncObject, QueueBindSparseTimelineSemaphoreValue) { uint64_t signal_values[2] = {signalValue, signalValue}; VkSemaphore signal_sems[2] = {semaphore.handle(), semaphore.handle()}; - VkTimelineSemaphoreSubmitInfoKHR tl_info_2 = vku::InitStructHelper(); + VkTimelineSemaphoreSubmitInfo tl_info_2 = vku::InitStructHelper(); tl_info_2.signalSemaphoreValueCount = 2; tl_info_2.pSignalSemaphoreValues = signal_values; @@ -3181,8 +3181,8 @@ TEST_F(NegativeSyncObject, WaitSemaphoresType) { AddRequiredFeature(vkt::Feature::timelineSemaphore); RETURN_IF_SKIP(Init()); - VkSemaphoreTypeCreateInfoKHR semaphore_type_create_info = vku::InitStructHelper(); - semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE_KHR; + VkSemaphoreTypeCreateInfo semaphore_type_create_info = vku::InitStructHelper(); + semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE; VkSemaphoreCreateInfo semaphore_create_info = vku::InitStructHelper(&semaphore_type_create_info); @@ -3270,7 +3270,7 @@ TEST_F(NegativeSyncObject, SignalSemaphoreValue) { uint64_t signalValue = 1; uint64_t offendingValue = timelineproperties.maxTimelineSemaphoreValueDifference + 1; - VkTimelineSemaphoreSubmitInfoKHR timeline_semaphore_submit_info = vku::InitStructHelper(); + VkTimelineSemaphoreSubmitInfo timeline_semaphore_submit_info = vku::InitStructHelper(); timeline_semaphore_submit_info.waitSemaphoreValueCount = 1; timeline_semaphore_submit_info.pWaitSemaphoreValues = &signalValue; // These two assignments are not required by the spec, but would segfault on older versions of validation layers @@ -3303,8 +3303,8 @@ TEST_F(NegativeSyncObject, Sync2SignalSemaphoreValue) { VkPhysicalDeviceTimelineSemaphorePropertiesKHR timelineproperties = vku::InitStructHelper(); GetPhysicalDeviceProperties2(timelineproperties); - VkSemaphoreTypeCreateInfoKHR semaphore_type_create_info = vku::InitStructHelper(); - semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE_KHR; + VkSemaphoreTypeCreateInfo semaphore_type_create_info = vku::InitStructHelper(); + semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE; semaphore_type_create_info.initialValue = 5; VkSemaphoreCreateInfo semaphore_create_info = vku::InitStructHelper(&semaphore_type_create_info); @@ -3318,14 +3318,14 @@ TEST_F(NegativeSyncObject, Sync2SignalSemaphoreValue) { semaphore_signal_info.value = 10; ASSERT_EQ(VK_SUCCESS, vk::SignalSemaphore(device(), &semaphore_signal_info)); - VkSemaphoreSubmitInfoKHR signal_info = vku::InitStructHelper(); + VkSemaphoreSubmitInfo signal_info = vku::InitStructHelper(); signal_info.semaphore = semaphore[0].handle(); - VkSemaphoreSubmitInfoKHR wait_info = vku::InitStructHelper(); + VkSemaphoreSubmitInfo wait_info = vku::InitStructHelper(); wait_info.semaphore = semaphore[0].handle(); wait_info.stageMask = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT; - VkSubmitInfo2KHR submit_info = vku::InitStructHelper(); + VkSubmitInfo2 submit_info = vku::InitStructHelper(); submit_info.signalSemaphoreInfoCount = 1; submit_info.pSignalSemaphoreInfos = &signal_info; submit_info.waitSemaphoreInfoCount = 1; @@ -3668,7 +3668,7 @@ TEST_F(NegativeSyncObject, SetEvent2DependencyFlags) { m_command_buffer.Begin(); - VkDependencyInfoKHR dependency_info = vku::InitStructHelper(); + VkDependencyInfo dependency_info = vku::InitStructHelper(); dependency_info.dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT; vkt::Event event(*m_device); @@ -3690,7 +3690,7 @@ TEST_F(NegativeSyncObject, SetEvent2HostStage) { barrier.dstAccessMask = VK_ACCESS_HOST_READ_BIT; barrier.srcStageMask = VK_PIPELINE_STAGE_2_HOST_BIT; barrier.dstStageMask = VK_PIPELINE_STAGE_2_HOST_BIT; - VkDependencyInfoKHR dependency_info = vku::InitStructHelper(); + VkDependencyInfo dependency_info = vku::InitStructHelper(); dependency_info.memoryBarrierCount = 1; dependency_info.pMemoryBarriers = &barrier; diff --git a/tests/unit/sync_object_positive.cpp b/tests/unit/sync_object_positive.cpp index 5abd0adc5da..5b8ed3093e5 100644 --- a/tests/unit/sync_object_positive.cpp +++ b/tests/unit/sync_object_positive.cpp @@ -53,8 +53,8 @@ TEST_F(PositiveSyncObject, Sync2OwnershipTranfersImage) { // Change layouts while changing ownership image_barrier.srcQueueFamilyIndex = no_gfx_queue->family_index; image_barrier.dstQueueFamilyIndex = m_device->graphics_queue_node_index_; - image_barrier.srcStageMask = VK_PIPELINE_STAGE_2_TRANSFER_BIT_KHR; - image_barrier.dstStageMask = VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT_KHR; + image_barrier.srcStageMask = VK_PIPELINE_STAGE_2_TRANSFER_BIT; + image_barrier.dstStageMask = VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT; image_barrier.oldLayout = image.Layout(); // Make sure the new layout is different from the old if (image_barrier.oldLayout == VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL) { @@ -82,8 +82,8 @@ TEST_F(PositiveSyncObject, Sync2OwnershipTranfersBuffer) { vkt::CommandBuffer no_gfx_cb(*m_device, no_gfx_pool, VK_COMMAND_BUFFER_LEVEL_PRIMARY); vkt::Buffer buffer(*m_device, 256, VK_BUFFER_USAGE_UNIFORM_TEXEL_BUFFER_BIT); - auto buffer_barrier = buffer.BufferMemoryBarrier(VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT_KHR, VK_PIPELINE_STAGE_2_TRANSFER_BIT_KHR, - VK_ACCESS_2_NONE_KHR, VK_ACCESS_2_NONE_KHR, 0, VK_WHOLE_SIZE); + auto buffer_barrier = buffer.BufferMemoryBarrier(VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT, VK_PIPELINE_STAGE_2_TRANSFER_BIT, + VK_ACCESS_2_NONE, VK_ACCESS_2_NONE, 0, VK_WHOLE_SIZE); // Let gfx own it. buffer_barrier.srcQueueFamilyIndex = m_device->graphics_queue_node_index_; @@ -97,8 +97,8 @@ TEST_F(PositiveSyncObject, Sync2OwnershipTranfersBuffer) { // Transfer it to gfx buffer_barrier.srcQueueFamilyIndex = no_gfx_queue->family_index; buffer_barrier.dstQueueFamilyIndex = m_device->graphics_queue_node_index_; - buffer_barrier.srcStageMask = VK_PIPELINE_STAGE_2_TRANSFER_BIT_KHR; - buffer_barrier.dstStageMask = VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT_KHR; + buffer_barrier.srcStageMask = VK_PIPELINE_STAGE_2_TRANSFER_BIT; + buffer_barrier.dstStageMask = VK_PIPELINE_STAGE_2_ALL_GRAPHICS_BIT; ValidOwnershipTransfer(m_errorMonitor, no_gfx_queue, no_gfx_cb, m_default_queue, m_command_buffer, &buffer_barrier, nullptr); } @@ -731,10 +731,10 @@ TEST_F(PositiveSyncObject, LongSemaphoreChain) { TEST_F(PositiveSyncObject, ExternalSemaphore) { #ifdef VK_USE_PLATFORM_WIN32_KHR const auto extension_name = VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT_KHR; + const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_KMT_BIT; #else const auto extension_name = VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR; + const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT; #endif AddRequiredExtensions(extension_name); @@ -744,18 +744,18 @@ TEST_F(PositiveSyncObject, ExternalSemaphore) { RETURN_IF_SKIP(Init()); // Check for external semaphore import and export capability - VkPhysicalDeviceExternalSemaphoreInfoKHR esi = vku::InitStructHelper(); + VkPhysicalDeviceExternalSemaphoreInfo esi = vku::InitStructHelper(); esi.handleType = handle_type; VkExternalSemaphorePropertiesKHR esp = vku::InitStructHelper(); vk::GetPhysicalDeviceExternalSemaphorePropertiesKHR(Gpu(), &esi, &esp); - if (!(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT_KHR) || - !(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT_KHR)) { + if (!(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT) || + !(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT)) { GTEST_SKIP() << "External semaphore does not support importing and exporting"; } // Create a semaphore to export payload from - VkExportSemaphoreCreateInfoKHR esci = vku::InitStructHelper(); + VkExportSemaphoreCreateInfo esci = vku::InitStructHelper(); esci.handleTypes = handle_type; VkSemaphoreCreateInfo sci = vku::InitStructHelper(&esci); @@ -804,10 +804,10 @@ TEST_F(PositiveSyncObject, ExternalTimelineSemaphore) { "Should be roughly equivalant to the CTS *cross_instance*timeline_semaphore* tests"); #ifdef VK_USE_PLATFORM_WIN32_KHR const auto extension_name = VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR; + const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT; #else const auto extension_name = VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR; + const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT; #endif AddRequiredExtensions(VK_KHR_EXTERNAL_SEMAPHORE_CAPABILITIES_EXTENSION_NAME); AddRequiredExtensions(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME); @@ -821,26 +821,26 @@ TEST_F(PositiveSyncObject, ExternalTimelineSemaphore) { } // Check for external semaphore import and export capability - VkSemaphoreTypeCreateInfoKHR tci = vku::InitStructHelper(); - tci.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE_KHR; + VkSemaphoreTypeCreateInfo tci = vku::InitStructHelper(); + tci.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE; - VkPhysicalDeviceExternalSemaphoreInfoKHR esi = vku::InitStructHelper(&tci); + VkPhysicalDeviceExternalSemaphoreInfo esi = vku::InitStructHelper(&tci); esi.handleType = handle_type; VkExternalSemaphorePropertiesKHR esp = vku::InitStructHelper(); vk::GetPhysicalDeviceExternalSemaphorePropertiesKHR(Gpu(), &esi, &esp); - if (!(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT_KHR) || - !(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT_KHR)) { + if (!(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT) || + !(esp.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT)) { GTEST_SKIP() << "External semaphore does not support importing and exporting, skipping test"; } // Create a semaphore to export payload from - VkExportSemaphoreCreateInfoKHR esci = vku::InitStructHelper(); + VkExportSemaphoreCreateInfo esci = vku::InitStructHelper(); esci.handleTypes = handle_type; - VkSemaphoreTypeCreateInfoKHR stci = vku::InitStructHelper(&esci); - stci.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE_KHR; + VkSemaphoreTypeCreateInfo stci = vku::InitStructHelper(&esci); + stci.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE; VkSemaphoreCreateInfo sci = vku::InitStructHelper(&stci); vkt::Semaphore export_semaphore(*m_device, sci); @@ -890,10 +890,10 @@ TEST_F(PositiveSyncObject, ExternalTimelineSemaphore) { TEST_F(PositiveSyncObject, ExternalFence) { #ifdef VK_USE_PLATFORM_WIN32_KHR const auto extension_name = VK_KHR_EXTERNAL_FENCE_WIN32_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR; + const auto handle_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_WIN32_BIT; #else const auto extension_name = VK_KHR_EXTERNAL_FENCE_FD_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR; + const auto handle_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_OPAQUE_FD_BIT; #endif AddRequiredExtensions(VK_KHR_EXTERNAL_FENCE_CAPABILITIES_EXTENSION_NAME); AddRequiredExtensions(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME); @@ -902,18 +902,18 @@ TEST_F(PositiveSyncObject, ExternalFence) { RETURN_IF_SKIP(Init()); // Check for external fence import and export capability - VkPhysicalDeviceExternalFenceInfoKHR efi = vku::InitStructHelper(); + VkPhysicalDeviceExternalFenceInfo efi = vku::InitStructHelper(); efi.handleType = handle_type; VkExternalFencePropertiesKHR efp = vku::InitStructHelper(); vk::GetPhysicalDeviceExternalFencePropertiesKHR(Gpu(), &efi, &efp); - if (!(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT_KHR) || - !(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT_KHR)) { + if (!(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT) || + !(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT)) { GTEST_SKIP() << "External fence does not support importing and exporting, skipping test."; } // Create a fence to export payload from - VkExportFenceCreateInfoKHR efci = vku::InitStructHelper(); + VkExportFenceCreateInfo efci = vku::InitStructHelper(); efci.handleTypes = handle_type; VkFenceCreateInfo fci = vku::InitStructHelper(&efci); vkt::Fence export_fence(*m_device, fci); @@ -949,7 +949,7 @@ TEST_F(PositiveSyncObject, ExternalFence) { TEST_F(PositiveSyncObject, ExternalFenceSyncFdLoop) { const auto extension_name = VK_KHR_EXTERNAL_FENCE_FD_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT_KHR; + const auto handle_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT; AddRequiredExtensions(VK_KHR_EXTERNAL_FENCE_CAPABILITIES_EXTENSION_NAME); AddRequiredExtensions(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME); AddRequiredExtensions(VK_KHR_EXTERNAL_FENCE_EXTENSION_NAME); @@ -957,19 +957,19 @@ TEST_F(PositiveSyncObject, ExternalFenceSyncFdLoop) { RETURN_IF_SKIP(Init()); // Check for external fence import and export capability - VkPhysicalDeviceExternalFenceInfoKHR efi = vku::InitStructHelper(); + VkPhysicalDeviceExternalFenceInfo efi = vku::InitStructHelper(); efi.handleType = handle_type; VkExternalFencePropertiesKHR efp = vku::InitStructHelper(); vk::GetPhysicalDeviceExternalFencePropertiesKHR(Gpu(), &efi, &efp); - if (!(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT_KHR) || - !(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT_KHR)) { + if (!(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT) || + !(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_IMPORTABLE_BIT)) { GTEST_SKIP() << "External fence does not support importing and exporting, skipping test."; return; } // Create a fence to export payload from - VkExportFenceCreateInfoKHR efci = vku::InitStructHelper(); + VkExportFenceCreateInfo efci = vku::InitStructHelper(); efci.handleTypes = handle_type; VkFenceCreateInfo fci = vku::InitStructHelper(&efci); vkt::Fence export_fence(*m_device, fci); @@ -1001,7 +1001,7 @@ TEST_F(PositiveSyncObject, ExternalFenceSyncFdLoop) { TEST_F(PositiveSyncObject, ExternalFenceSubmitCmdBuffer) { const auto extension_name = VK_KHR_EXTERNAL_FENCE_FD_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT_KHR; + const auto handle_type = VK_EXTERNAL_FENCE_HANDLE_TYPE_SYNC_FD_BIT; AddRequiredExtensions(VK_KHR_EXTERNAL_FENCE_CAPABILITIES_EXTENSION_NAME); AddRequiredExtensions(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME); AddRequiredExtensions(VK_KHR_EXTERNAL_FENCE_EXTENSION_NAME); @@ -1012,18 +1012,18 @@ TEST_F(PositiveSyncObject, ExternalFenceSubmitCmdBuffer) { } // Check for external fence export capability - VkPhysicalDeviceExternalFenceInfoKHR efi = vku::InitStructHelper(); + VkPhysicalDeviceExternalFenceInfo efi = vku::InitStructHelper(); efi.handleType = handle_type; VkExternalFencePropertiesKHR efp = vku::InitStructHelper(); vk::GetPhysicalDeviceExternalFencePropertiesKHR(Gpu(), &efi, &efp); - if (!(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT_KHR)) { + if (!(efp.externalFenceFeatures & VK_EXTERNAL_FENCE_FEATURE_EXPORTABLE_BIT)) { GTEST_SKIP() << "External fence does not support exporting, skipping test."; return; } // Create a fence to export payload from - VkExportFenceCreateInfoKHR efci = vku::InitStructHelper(); + VkExportFenceCreateInfo efci = vku::InitStructHelper(); efci.handleTypes = handle_type; VkFenceCreateInfo fci = vku::InitStructHelper(&efci); vkt::Fence export_fence(*m_device, fci); @@ -1758,7 +1758,7 @@ TEST_F(PositiveSyncObject, DynamicRenderingLocalReadImageBarrier) { vkt::Image image(*m_device, 128, 128, 1, VK_FORMAT_B8G8R8A8_UNORM, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT); - image.SetLayout(VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR); + image.SetLayout(VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ); VkFormat colorAttachment = VK_FORMAT_R16_UNORM; @@ -1776,8 +1776,8 @@ TEST_F(PositiveSyncObject, DynamicRenderingLocalReadImageBarrier) { VkImageMemoryBarrier imageMemoryBarrier = vku::InitStructHelper(); imageMemoryBarrier.srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; imageMemoryBarrier.dstAccessMask = VK_ACCESS_INPUT_ATTACHMENT_READ_BIT; - imageMemoryBarrier.oldLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR; - imageMemoryBarrier.newLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ_KHR; + imageMemoryBarrier.oldLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ; + imageMemoryBarrier.newLayout = VK_IMAGE_LAYOUT_RENDERING_LOCAL_READ; imageMemoryBarrier.image = image.handle(); imageMemoryBarrier.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0u, 1u, 0u, 1u}; @@ -1866,10 +1866,10 @@ TEST_F(PositiveSyncObject, SubmitImportedBinarySemaphoreWithNonZeroValue) { TEST_DESCRIPTION("QueueSubmit2 can specify arbitrary payload value for binary semaphore and it should be ignored"); #ifdef VK_USE_PLATFORM_WIN32_KHR const auto extension_name = VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT_KHR; + const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_WIN32_BIT; #else const auto extension_name = VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME; - const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT_KHR; + const auto handle_type = VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT; #endif AddRequiredExtensions(extension_name); SetTargetApiVersion(VK_API_VERSION_1_3); @@ -1877,17 +1877,17 @@ TEST_F(PositiveSyncObject, SubmitImportedBinarySemaphoreWithNonZeroValue) { RETURN_IF_SKIP(Init()); // Check semaphore's import/export capability - VkPhysicalDeviceExternalSemaphoreInfoKHR semaphore_info = vku::InitStructHelper(); + VkPhysicalDeviceExternalSemaphoreInfo semaphore_info = vku::InitStructHelper(); semaphore_info.handleType = handle_type; VkExternalSemaphorePropertiesKHR semaphore_properties = vku::InitStructHelper(); vk::GetPhysicalDeviceExternalSemaphorePropertiesKHR(Gpu(), &semaphore_info, &semaphore_properties); - if (!(semaphore_properties.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT_KHR) || - !(semaphore_properties.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT_KHR)) { + if (!(semaphore_properties.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_EXPORTABLE_BIT) || + !(semaphore_properties.externalSemaphoreFeatures & VK_EXTERNAL_SEMAPHORE_FEATURE_IMPORTABLE_BIT)) { GTEST_SKIP() << "Semaphore does not support import and/or export"; } // Signaling semaphore - VkExportSemaphoreCreateInfoKHR export_info = vku::InitStructHelper(); + VkExportSemaphoreCreateInfo export_info = vku::InitStructHelper(); export_info.handleTypes = handle_type; VkSemaphoreCreateInfo semaphore_ci = vku::InitStructHelper(&export_info); vkt::Semaphore semaphore(*m_device, semaphore_ci); @@ -2147,7 +2147,7 @@ TEST_F(PositiveSyncObject, TimelineHostWaitThenSubmitSignal) { GTEST_SKIP() << "Test not supported by MockICD (WaitSemaphores)"; } - vkt::Semaphore semaphore(*m_device, VK_SEMAPHORE_TYPE_TIMELINE_KHR); + vkt::Semaphore semaphore(*m_device, VK_SEMAPHORE_TYPE_TIMELINE); auto thread = [&semaphore]() { semaphore.Wait(1, kWaitTimeout); }; std::thread t(thread); @@ -2169,7 +2169,7 @@ TEST_F(PositiveSyncObject, TimelineHostWaitThenSubmitLargerSignal) { GTEST_SKIP() << "Test not supported by MockICD (WaitSemaphores)"; } - vkt::Semaphore semaphore(*m_device, VK_SEMAPHORE_TYPE_TIMELINE_KHR); + vkt::Semaphore semaphore(*m_device, VK_SEMAPHORE_TYPE_TIMELINE); auto thread = [&semaphore]() { semaphore.Wait(1, kWaitTimeout); }; std::thread t(thread); @@ -2190,7 +2190,7 @@ TEST_F(PositiveSyncObject, TimelineHostWaitThenHostSignal) { if (IsPlatformMockICD()) { GTEST_SKIP() << "Test not supported by MockICD (WaitSemaphores)"; } - vkt::Semaphore semaphore(*m_device, VK_SEMAPHORE_TYPE_TIMELINE_KHR); + vkt::Semaphore semaphore(*m_device, VK_SEMAPHORE_TYPE_TIMELINE); auto thread = [&semaphore]() { semaphore.Wait(1, kWaitTimeout); }; std::thread t(thread); @@ -2208,7 +2208,7 @@ TEST_F(PositiveSyncObject, TimelineHostSignalThenHostWait) { AddRequiredFeature(vkt::Feature::timelineSemaphore); RETURN_IF_SKIP(Init()); - vkt::Semaphore semaphore(*m_device, VK_SEMAPHORE_TYPE_TIMELINE_KHR); + vkt::Semaphore semaphore(*m_device, VK_SEMAPHORE_TYPE_TIMELINE); semaphore.Signal(1); semaphore.Wait(1, kWaitTimeout); } diff --git a/tests/unit/sync_val.cpp b/tests/unit/sync_val.cpp index 6bdd5a0403e..2952950beb5 100644 --- a/tests/unit/sync_val.cpp +++ b/tests/unit/sync_val.cpp @@ -234,15 +234,15 @@ TEST_F(NegativeSyncVal, BufferCopyHazardsSync2) { // Use the barrier to clean up the WAW, and try again. (and show that validation is accounting for the barrier effect too.) { - VkBufferMemoryBarrier2KHR buffer_barrier = vku::InitStructHelper(); - buffer_barrier.srcStageMask = VK_PIPELINE_STAGE_2_COPY_BIT_KHR; - buffer_barrier.dstStageMask = VK_PIPELINE_STAGE_2_COPY_BIT_KHR; - buffer_barrier.srcAccessMask = VK_ACCESS_2_TRANSFER_READ_BIT_KHR; - buffer_barrier.dstAccessMask = VK_ACCESS_2_TRANSFER_WRITE_BIT_KHR; + VkBufferMemoryBarrier2 buffer_barrier = vku::InitStructHelper(); + buffer_barrier.srcStageMask = VK_PIPELINE_STAGE_2_COPY_BIT; + buffer_barrier.dstStageMask = VK_PIPELINE_STAGE_2_COPY_BIT; + buffer_barrier.srcAccessMask = VK_ACCESS_2_TRANSFER_READ_BIT; + buffer_barrier.dstAccessMask = VK_ACCESS_2_TRANSFER_WRITE_BIT; buffer_barrier.buffer = buffer_a.handle(); buffer_barrier.offset = 0; buffer_barrier.size = 256; - VkDependencyInfoKHR dep_info = vku::InitStructHelper(); + VkDependencyInfo dep_info = vku::InitStructHelper(); dep_info.bufferMemoryBarrierCount = 1; dep_info.pBufferMemoryBarriers = &buffer_barrier; vk::CmdPipelineBarrier2KHR(cb, &dep_info); @@ -264,12 +264,12 @@ TEST_F(NegativeSyncVal, BufferCopyHazardsSync2) { // Use the barrier to clean up the WAW, and try again. (and show that validation is accounting for the barrier effect too.) { - VkMemoryBarrier2KHR mem_barrier = vku::InitStructHelper(); - mem_barrier.srcStageMask = VK_PIPELINE_STAGE_2_COPY_BIT_KHR; - mem_barrier.dstStageMask = VK_PIPELINE_STAGE_2_COPY_BIT_KHR; - mem_barrier.srcAccessMask = VK_ACCESS_2_TRANSFER_WRITE_BIT_KHR; - mem_barrier.dstAccessMask = VK_ACCESS_2_TRANSFER_WRITE_BIT_KHR; - VkDependencyInfoKHR dep_info = vku::InitStructHelper(); + VkMemoryBarrier2 mem_barrier = vku::InitStructHelper(); + mem_barrier.srcStageMask = VK_PIPELINE_STAGE_2_COPY_BIT; + mem_barrier.dstStageMask = VK_PIPELINE_STAGE_2_COPY_BIT; + mem_barrier.srcAccessMask = VK_ACCESS_2_TRANSFER_WRITE_BIT; + mem_barrier.dstAccessMask = VK_ACCESS_2_TRANSFER_WRITE_BIT; + VkDependencyInfo dep_info = vku::InitStructHelper(); dep_info.memoryBarrierCount = 1; dep_info.pMemoryBarriers = &mem_barrier; vk::CmdPipelineBarrier2KHR(cb, &dep_info); @@ -277,8 +277,8 @@ TEST_F(NegativeSyncVal, BufferCopyHazardsSync2) { vk::CmdCopyBuffer(m_command_buffer.handle(), buffer_c.handle(), buffer_b.handle(), 1, ®ion); m_errorMonitor->SetDesiredError("SYNC-HAZARD-READ-AFTER-WRITE"); - mem_barrier.srcAccessMask = VK_ACCESS_2_TRANSFER_READ_BIT_KHR; // Protect C but not B - mem_barrier.dstAccessMask = VK_ACCESS_2_TRANSFER_WRITE_BIT_KHR; + mem_barrier.srcAccessMask = VK_ACCESS_2_TRANSFER_READ_BIT; // Protect C but not B + mem_barrier.dstAccessMask = VK_ACCESS_2_TRANSFER_WRITE_BIT; vk::CmdPipelineBarrier2KHR(cb, &dep_info); vk::CmdCopyBuffer(m_command_buffer.handle(), buffer_b.handle(), buffer_c.handle(), 1, ®ion); m_errorMonitor->VerifyFound(); @@ -501,10 +501,10 @@ TEST_F(NegativeSyncVal, CmdClearAttachmentsHazards) { VkAttachmentDescription attachment = {}; attachment.format = format; attachment.samples = VK_SAMPLE_COUNT_1_BIT; - attachment.loadOp = VK_ATTACHMENT_LOAD_OP_NONE_KHR; - attachment.storeOp = VK_ATTACHMENT_STORE_OP_NONE_KHR; - attachment.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_NONE_KHR; - attachment.stencilStoreOp = VK_ATTACHMENT_STORE_OP_NONE_KHR; + attachment.loadOp = VK_ATTACHMENT_LOAD_OP_NONE; + attachment.storeOp = VK_ATTACHMENT_STORE_OP_NONE; + attachment.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_NONE; + attachment.stencilStoreOp = VK_ATTACHMENT_STORE_OP_NONE; attachment.initialLayout = VK_IMAGE_LAYOUT_GENERAL; attachment.finalLayout = VK_IMAGE_LAYOUT_GENERAL; return attachment; @@ -557,14 +557,14 @@ TEST_F(NegativeSyncVal, CmdClearAttachmentsDynamicHazards) { VkRenderingAttachmentInfo color_attachment = vku::InitStructHelper(); color_attachment.imageView = helper.rt_view; color_attachment.imageLayout = VK_IMAGE_LAYOUT_GENERAL; - color_attachment.loadOp = VK_ATTACHMENT_LOAD_OP_NONE_KHR; + color_attachment.loadOp = VK_ATTACHMENT_LOAD_OP_NONE; color_attachment.storeOp = VK_ATTACHMENT_STORE_OP_NONE; color_attachment.clearValue.color = m_clear_color; VkRenderingAttachmentInfo depth_attachment = vku::InitStructHelper(); depth_attachment.imageView = helper.ds_view; depth_attachment.imageLayout = VK_IMAGE_LAYOUT_GENERAL; - depth_attachment.loadOp = VK_ATTACHMENT_LOAD_OP_NONE_KHR; + depth_attachment.loadOp = VK_ATTACHMENT_LOAD_OP_NONE; depth_attachment.storeOp = VK_ATTACHMENT_STORE_OP_NONE; depth_attachment.clearValue.color = m_clear_color; @@ -834,16 +834,16 @@ TEST_F(NegativeSyncVal, CopyOptimalImageHazardsSync2) { // Use the barrier to clean up the WAW, and try again. (and show that validation is accounting for the barrier effect too.) { - VkImageMemoryBarrier2KHR image_barrier = vku::InitStructHelper(); - image_barrier.srcStageMask = VK_PIPELINE_STAGE_2_COPY_BIT_KHR; - image_barrier.dstStageMask = VK_PIPELINE_STAGE_2_COPY_BIT_KHR; - image_barrier.srcAccessMask = VK_ACCESS_2_TRANSFER_READ_BIT_KHR; - image_barrier.dstAccessMask = VK_ACCESS_2_TRANSFER_WRITE_BIT_KHR; + VkImageMemoryBarrier2 image_barrier = vku::InitStructHelper(); + image_barrier.srcStageMask = VK_PIPELINE_STAGE_2_COPY_BIT; + image_barrier.dstStageMask = VK_PIPELINE_STAGE_2_COPY_BIT; + image_barrier.srcAccessMask = VK_ACCESS_2_TRANSFER_READ_BIT; + image_barrier.dstAccessMask = VK_ACCESS_2_TRANSFER_WRITE_BIT; image_barrier.image = image_a.handle(); image_barrier.subresourceRange = full_subresource_range; image_barrier.oldLayout = VK_IMAGE_LAYOUT_GENERAL; image_barrier.newLayout = VK_IMAGE_LAYOUT_GENERAL; - VkDependencyInfoKHR dep_info = vku::InitStructHelper(); + VkDependencyInfo dep_info = vku::InitStructHelper(); dep_info.imageMemoryBarrierCount = 1; dep_info.pImageMemoryBarriers = &image_barrier; vk::CmdPipelineBarrier2KHR(cb, &dep_info); @@ -865,12 +865,12 @@ TEST_F(NegativeSyncVal, CopyOptimalImageHazardsSync2) { // Use the barrier to clean up the WAW, and try again. (and show that validation is accounting for the barrier effect too.) { - VkMemoryBarrier2KHR mem_barrier = vku::InitStructHelper(); - mem_barrier.srcStageMask = VK_PIPELINE_STAGE_2_COPY_BIT_KHR; - mem_barrier.dstStageMask = VK_PIPELINE_STAGE_2_COPY_BIT_KHR; + VkMemoryBarrier2 mem_barrier = vku::InitStructHelper(); + mem_barrier.srcStageMask = VK_PIPELINE_STAGE_2_COPY_BIT; + mem_barrier.dstStageMask = VK_PIPELINE_STAGE_2_COPY_BIT; mem_barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; mem_barrier.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; - VkDependencyInfoKHR dep_info = vku::InitStructHelper(); + VkDependencyInfo dep_info = vku::InitStructHelper(); dep_info.memoryBarrierCount = 1; dep_info.pMemoryBarriers = &mem_barrier; vk::CmdPipelineBarrier2KHR(cb, &dep_info); @@ -878,8 +878,8 @@ TEST_F(NegativeSyncVal, CopyOptimalImageHazardsSync2) { // Use barrier to protect last reader, but not last writer... m_errorMonitor->SetDesiredError("SYNC-HAZARD-READ-AFTER-WRITE"); - mem_barrier.srcAccessMask = VK_ACCESS_2_TRANSFER_READ_BIT_KHR; // Protects C but not B - mem_barrier.dstAccessMask = VK_ACCESS_2_TRANSFER_WRITE_BIT_KHR; + mem_barrier.srcAccessMask = VK_ACCESS_2_TRANSFER_READ_BIT; // Protects C but not B + mem_barrier.dstAccessMask = VK_ACCESS_2_TRANSFER_WRITE_BIT; vk::CmdPipelineBarrier2KHR(cb, &dep_info); vk::CmdCopyImage(cb, image_b.handle(), VK_IMAGE_LAYOUT_GENERAL, image_c.handle(), VK_IMAGE_LAYOUT_GENERAL, 1, &full_region); m_errorMonitor->VerifyFound(); @@ -2441,10 +2441,10 @@ TEST_F(NegativeSyncVal, RenderPassLoadHazardVsInitialLayout) { vkt::RenderPass rp_no_load_store; if (load_store_op_none) { - attachmentDescriptions[0].loadOp = VK_ATTACHMENT_LOAD_OP_NONE_KHR; - attachmentDescriptions[0].storeOp = VK_ATTACHMENT_STORE_OP_NONE_KHR; - attachmentDescriptions[1].loadOp = VK_ATTACHMENT_LOAD_OP_NONE_KHR; - attachmentDescriptions[1].storeOp = VK_ATTACHMENT_STORE_OP_NONE_KHR; + attachmentDescriptions[0].loadOp = VK_ATTACHMENT_LOAD_OP_NONE; + attachmentDescriptions[0].storeOp = VK_ATTACHMENT_STORE_OP_NONE; + attachmentDescriptions[1].loadOp = VK_ATTACHMENT_LOAD_OP_NONE; + attachmentDescriptions[1].storeOp = VK_ATTACHMENT_STORE_OP_NONE; rp_no_load_store.init(*m_device, renderPassInfo); m_renderPassBeginInfo.renderPass = rp_no_load_store.handle(); m_command_buffer.BeginRenderPass(m_renderPassBeginInfo); @@ -3769,7 +3769,7 @@ TEST_F(NegativeSyncVal, CmdWaitEvents2KHRUsedButSynchronizaion2Disabled) { event.init(*m_device, vkt::Event::CreateInfo(0)); VkEvent event_handle = event.handle(); - VkDependencyInfoKHR dependency_info = vku::InitStructHelper(); + VkDependencyInfo dependency_info = vku::InitStructHelper(); m_command_buffer.Begin(); m_errorMonitor->SetDesiredError("VUID-vkCmdWaitEvents2-synchronization2-03836"); @@ -3805,7 +3805,7 @@ TEST_F(NegativeSyncVal, Sync2FeatureDisabled) { m_command_buffer.Begin(); - VkDependencyInfoKHR dependency_info = vku::InitStructHelper(); + VkDependencyInfo dependency_info = vku::InitStructHelper(); m_errorMonitor->SetDesiredError("VUID-vkCmdPipelineBarrier2-synchronization2-03848"); vk::CmdPipelineBarrier2KHR(m_command_buffer.handle(), &dependency_info); @@ -3813,7 +3813,7 @@ TEST_F(NegativeSyncVal, Sync2FeatureDisabled) { vkt::Event event(*m_device); - VkPipelineStageFlagBits2KHR stage = VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT_KHR; + VkPipelineStageFlagBits2 stage = VK_PIPELINE_STAGE_2_TOP_OF_PIPE_BIT; m_errorMonitor->SetDesiredError("VUID-vkCmdResetEvent2-synchronization2-03829"); vk::CmdResetEvent2KHR(m_command_buffer.handle(), event.handle(), stage); @@ -3865,13 +3865,12 @@ TEST_F(NegativeSyncVal, DestroyedUnusedDescriptors) { InitRenderTarget(); - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT layout_createinfo_binding_flags = - vku::InitStructHelper(); + VkDescriptorSetLayoutBindingFlagsCreateInfo layout_createinfo_binding_flags = vku::InitStructHelper(); constexpr size_t kNumDescriptors = 6; std::array ds_binding_flags; for (auto &elem : ds_binding_flags) { - elem = VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT_EXT | VK_DESCRIPTOR_BINDING_UPDATE_UNUSED_WHILE_PENDING_BIT_EXT; + elem = VK_DESCRIPTOR_BINDING_PARTIALLY_BOUND_BIT | VK_DESCRIPTOR_BINDING_UPDATE_UNUSED_WHILE_PENDING_BIT; } layout_createinfo_binding_flags.bindingCount = ds_binding_flags.size(); @@ -4181,7 +4180,7 @@ TEST_F(NegativeSyncVal, CopyToCompressedImage) { if (copy_commands_2) { m_command_buffer.Reset(); - VkImageCopy2KHR copy_regions2[2]; + VkImageCopy2 copy_regions2[2]; copy_regions2[0] = vku::InitStructHelper(); copy_regions2[0].srcSubresource = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 0, 1}; copy_regions2[0].srcOffset = {0, 0, 0}; @@ -4195,7 +4194,7 @@ TEST_F(NegativeSyncVal, CopyToCompressedImage) { copy_regions2[1].dstOffset = {4, 0, 0}; copy_regions2[1].extent = {1, 1, 1}; - VkCopyImageInfo2KHR copy_image_info = vku::InitStructHelper(); + VkCopyImageInfo2 copy_image_info = vku::InitStructHelper(); copy_image_info.srcImage = src_image.handle(); copy_image_info.srcImageLayout = VK_IMAGE_LAYOUT_GENERAL; copy_image_info.dstImage = dst_image.handle(); @@ -5698,7 +5697,7 @@ TEST_F(NegativeSyncVal, ExpandedMetaStage) { barrier.srcAccessMask = VK_ACCESS_2_TRANSFER_WRITE_BIT; barrier.dstStageMask = VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT; barrier.dstAccessMask = VK_ACCESS_2_SHADER_READ_BIT; // Read access mask does not protect subsequent copy writes - VkDependencyInfoKHR dep_info = vku::InitStructHelper(); + VkDependencyInfo dep_info = vku::InitStructHelper(); dep_info.memoryBarrierCount = 1; dep_info.pMemoryBarriers = &barrier; @@ -5725,7 +5724,7 @@ TEST_F(NegativeSyncVal, ExpandedMetaStage2) { barrier.srcAccessMask = VK_ACCESS_2_TRANSFER_WRITE_BIT; barrier.dstStageMask = VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT; barrier.dstAccessMask = VK_ACCESS_2_MEMORY_READ_BIT; // Read access mask does not protect subsequent copy writes - VkDependencyInfoKHR dep_info = vku::InitStructHelper(); + VkDependencyInfo dep_info = vku::InitStructHelper(); dep_info.memoryBarrierCount = 1; dep_info.pMemoryBarriers = &barrier; @@ -5752,7 +5751,7 @@ TEST_F(NegativeSyncVal, ExpandedMetaStage3) { barrier.srcAccessMask = VK_ACCESS_2_TRANSFER_WRITE_BIT; barrier.dstStageMask = VK_PIPELINE_STAGE_2_ALL_COMMANDS_BIT; barrier.dstAccessMask = VK_ACCESS_2_SHADER_WRITE_BIT; // Shader write access mask does not protect subsequent copy writes - VkDependencyInfoKHR dep_info = vku::InitStructHelper(); + VkDependencyInfo dep_info = vku::InitStructHelper(); dep_info.memoryBarrierCount = 1; dep_info.pMemoryBarriers = &barrier; diff --git a/tests/unit/sync_val_positive.cpp b/tests/unit/sync_val_positive.cpp index 102b5f5bd09..fc4dac6c67d 100644 --- a/tests/unit/sync_val_positive.cpp +++ b/tests/unit/sync_val_positive.cpp @@ -113,10 +113,10 @@ TEST_F(PositiveSyncVal, CmdClearAttachmentLayer) { VkAttachmentDescription attachment = {}; attachment.format = format; attachment.samples = VK_SAMPLE_COUNT_1_BIT; - attachment.loadOp = VK_ATTACHMENT_LOAD_OP_NONE_KHR; - attachment.storeOp = VK_ATTACHMENT_STORE_OP_NONE_KHR; - attachment.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_NONE_KHR; - attachment.stencilStoreOp = VK_ATTACHMENT_STORE_OP_NONE_KHR; + attachment.loadOp = VK_ATTACHMENT_LOAD_OP_NONE; + attachment.storeOp = VK_ATTACHMENT_STORE_OP_NONE; + attachment.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_NONE; + attachment.stencilStoreOp = VK_ATTACHMENT_STORE_OP_NONE; attachment.initialLayout = VK_IMAGE_LAYOUT_GENERAL; attachment.finalLayout = VK_IMAGE_LAYOUT_GENERAL; return attachment; @@ -793,7 +793,7 @@ TEST_F(PositiveSyncVal, QSTransitionWithSrcNoneStage) { layout_transition.image = image; layout_transition.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}; - VkDependencyInfoKHR dep_info = vku::InitStructHelper(); + VkDependencyInfo dep_info = vku::InitStructHelper(); dep_info.imageMemoryBarrierCount = 1; dep_info.pImageMemoryBarriers = &layout_transition; @@ -873,7 +873,7 @@ TEST_F(PositiveSyncVal, QSTransitionAndRead) { layout_transition.image = image; layout_transition.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}; - VkDependencyInfoKHR dep_info = vku::InitStructHelper(); + VkDependencyInfo dep_info = vku::InitStructHelper(); dep_info.imageMemoryBarrierCount = 1; dep_info.pImageMemoryBarriers = &layout_transition; @@ -1110,7 +1110,7 @@ TEST_F(PositiveSyncVal, QSSynchronizedWritesAndAsyncWait) { image_barrier.srcStageMask = VK_PIPELINE_STAGE_2_NONE; image_barrier.srcAccessMask = VK_ACCESS_2_NONE; image_barrier.dstStageMask = VK_PIPELINE_STAGE_2_COPY_BIT; - image_barrier.dstAccessMask = VK_ACCESS_2_TRANSFER_WRITE_BIT_KHR; + image_barrier.dstAccessMask = VK_ACCESS_2_TRANSFER_WRITE_BIT; image_barrier.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED; image_barrier.newLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL; image_barrier.image = image; @@ -1167,7 +1167,7 @@ TEST_F(PositiveSyncVal, DISABLED_RenderPassStoreOpNone) { VkImageMemoryBarrier2 layout_transition = vku::InitStructHelper(); // Form an execution dependency with draw command (FRAGMENT_SHADER). Execution dependency is enough to sync with READ. - layout_transition.srcStageMask = VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT_KHR; + layout_transition.srcStageMask = VK_PIPELINE_STAGE_2_FRAGMENT_SHADER_BIT; layout_transition.srcAccessMask = VK_ACCESS_2_NONE; layout_transition.dstStageMask = VK_PIPELINE_STAGE_2_NONE; layout_transition.dstAccessMask = VK_ACCESS_2_NONE; diff --git a/tests/unit/sync_val_wsi.cpp b/tests/unit/sync_val_wsi.cpp index d3e85aa9470..d9eed67bf4f 100644 --- a/tests/unit/sync_val_wsi.cpp +++ b/tests/unit/sync_val_wsi.cpp @@ -195,7 +195,7 @@ TEST_F(NegativeSyncValWsi, SubmitDoesNotWaitForAcquire) { layout_transition.image = swapchain_images[image_index]; layout_transition.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}; - VkDependencyInfoKHR dep_info = vku::InitStructHelper(); + VkDependencyInfo dep_info = vku::InitStructHelper(); dep_info.imageMemoryBarrierCount = 1; dep_info.pImageMemoryBarriers = &layout_transition; @@ -237,7 +237,7 @@ TEST_F(NegativeSyncValWsi, PresentDoesNotWaitForSubmit2) { layout_transition.subresourceRange.baseArrayLayer = 0; layout_transition.subresourceRange.layerCount = 1; - VkDependencyInfoKHR dep_info = vku::InitStructHelper(); + VkDependencyInfo dep_info = vku::InitStructHelper(); dep_info.imageMemoryBarrierCount = 1; dep_info.pImageMemoryBarriers = &layout_transition; diff --git a/tests/unit/sync_val_wsi_positive.cpp b/tests/unit/sync_val_wsi_positive.cpp index aaf20f35fd9..ad6f4d2ffd6 100644 --- a/tests/unit/sync_val_wsi_positive.cpp +++ b/tests/unit/sync_val_wsi_positive.cpp @@ -58,7 +58,7 @@ TEST_F(PositiveSyncValWsi, PresentAfterSubmit2AutomaticVisibility) { layout_transition.subresourceRange.baseArrayLayer = 0; layout_transition.subresourceRange.layerCount = 1; - VkDependencyInfoKHR dep_info = vku::InitStructHelper(); + VkDependencyInfo dep_info = vku::InitStructHelper(); dep_info.imageMemoryBarrierCount = 1; dep_info.pImageMemoryBarriers = &layout_transition; @@ -136,7 +136,7 @@ TEST_F(PositiveSyncValWsi, PresentAfterSubmitNoneDstStage) { layout_transition.image = swapchain_images[image_index]; layout_transition.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}; - VkDependencyInfoKHR dep_info = vku::InitStructHelper(); + VkDependencyInfo dep_info = vku::InitStructHelper(); dep_info.imageMemoryBarrierCount = 1; dep_info.pImageMemoryBarriers = &layout_transition; @@ -439,7 +439,7 @@ TEST_F(PositiveSyncValWsi, RecreateImage) { layout_transition.image = dst_image; layout_transition.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}; - VkDependencyInfoKHR dep_info = vku::InitStructHelper(); + VkDependencyInfo dep_info = vku::InitStructHelper(); dep_info.imageMemoryBarrierCount = 1; dep_info.pImageMemoryBarriers = &layout_transition; diff --git a/tests/unit/threading_positive.cpp b/tests/unit/threading_positive.cpp index e1c6797f8a2..895393bef64 100644 --- a/tests/unit/threading_positive.cpp +++ b/tests/unit/threading_positive.cpp @@ -75,8 +75,8 @@ TEST_F(PositiveThreading, UpdateDescriptorUpdateAfterBindNoCollision) { InitRenderTarget(); std::array flags = { - {VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT_EXT, VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT_EXT}}; - VkDescriptorSetLayoutBindingFlagsCreateInfoEXT flags_create_info = vku::InitStructHelper(); + {VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT, VK_DESCRIPTOR_BINDING_UPDATE_AFTER_BIND_BIT}}; + VkDescriptorSetLayoutBindingFlagsCreateInfo flags_create_info = vku::InitStructHelper(); flags_create_info.bindingCount = (uint32_t)flags.size(); flags_create_info.pBindingFlags = flags.data(); @@ -85,8 +85,8 @@ TEST_F(PositiveThreading, UpdateDescriptorUpdateAfterBindNoCollision) { {0, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_COMPUTE_BIT, nullptr}, {1, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER, 1, VK_SHADER_STAGE_COMPUTE_BIT, nullptr}, }, - VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT_EXT, &flags_create_info, - VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT_EXT); + VK_DESCRIPTOR_SET_LAYOUT_CREATE_UPDATE_AFTER_BIND_POOL_BIT, &flags_create_info, + VK_DESCRIPTOR_POOL_CREATE_UPDATE_AFTER_BIND_BIT); vkt::Buffer buffer(*m_device, 256, VK_BUFFER_USAGE_STORAGE_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT); diff --git a/tests/unit/vertex_input.cpp b/tests/unit/vertex_input.cpp index 426fa2c6816..710500defe2 100644 --- a/tests/unit/vertex_input.cpp +++ b/tests/unit/vertex_input.cpp @@ -58,8 +58,8 @@ TEST_F(NegativeVertexInput, DivisorExtension) { VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT pdvad_props = vku::InitStructHelper(); GetPhysicalDeviceProperties2(pdvad_props); - VkVertexInputBindingDivisorDescriptionEXT vibdd = {}; - VkPipelineVertexInputDivisorStateCreateInfoEXT pvids_ci = vku::InitStructHelper(); + VkVertexInputBindingDivisorDescription vibdd = {}; + VkPipelineVertexInputDivisorStateCreateInfo pvids_ci = vku::InitStructHelper(); pvids_ci.vertexBindingDivisorCount = 1; pvids_ci.pVertexBindingDivisors = &vibdd; VkVertexInputBindingDescription vibd = {}; @@ -131,10 +131,10 @@ TEST_F(NegativeVertexInput, DivisorDisabled) { VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT pdvad_props = vku::InitStructHelper(); GetPhysicalDeviceProperties2(pdvad_props); - VkVertexInputBindingDivisorDescriptionEXT vibdd = {}; + VkVertexInputBindingDivisorDescription vibdd = {}; vibdd.binding = 0; vibdd.divisor = 2; - VkPipelineVertexInputDivisorStateCreateInfoEXT pvids_ci = vku::InitStructHelper(); + VkPipelineVertexInputDivisorStateCreateInfo pvids_ci = vku::InitStructHelper(); pvids_ci.vertexBindingDivisorCount = 1; pvids_ci.pVertexBindingDivisors = &vibdd; VkVertexInputBindingDescription vibd = {}; @@ -163,10 +163,10 @@ TEST_F(NegativeVertexInput, DivisorInstanceRateZero) { RETURN_IF_SKIP(Init()); InitRenderTarget(); - VkVertexInputBindingDivisorDescriptionEXT vibdd = {}; + VkVertexInputBindingDivisorDescription vibdd = {}; vibdd.binding = 0; vibdd.divisor = 0; - VkPipelineVertexInputDivisorStateCreateInfoEXT pvids_ci = vku::InitStructHelper(); + VkPipelineVertexInputDivisorStateCreateInfo pvids_ci = vku::InitStructHelper(); pvids_ci.vertexBindingDivisorCount = 1; pvids_ci.pVertexBindingDivisors = &vibdd; VkVertexInputBindingDescription vibd = {}; @@ -196,8 +196,8 @@ TEST_F(NegativeVertexInput, DivisorExtensionKHR) { VkPhysicalDeviceVertexAttributeDivisorPropertiesKHR pdvad_props = vku::InitStructHelper(); GetPhysicalDeviceProperties2(pdvad_props); - VkVertexInputBindingDivisorDescriptionKHR vibdd = {}; - VkPipelineVertexInputDivisorStateCreateInfoKHR pvids_ci = vku::InitStructHelper(); + VkVertexInputBindingDivisorDescription vibdd = {}; + VkPipelineVertexInputDivisorStateCreateInfo pvids_ci = vku::InitStructHelper(); pvids_ci.vertexBindingDivisorCount = 1; pvids_ci.pVertexBindingDivisors = &vibdd; VkVertexInputBindingDescription vibd = {}; @@ -270,10 +270,10 @@ TEST_F(NegativeVertexInput, DivisorDisabledKHR) { VkPhysicalDeviceVertexAttributeDivisorPropertiesKHR pdvad_props = vku::InitStructHelper(); GetPhysicalDeviceProperties2(pdvad_props); - VkVertexInputBindingDivisorDescriptionEXT vibdd = {}; + VkVertexInputBindingDivisorDescription vibdd = {}; vibdd.binding = 0; vibdd.divisor = 2; - VkPipelineVertexInputDivisorStateCreateInfoKHR pvids_ci = vku::InitStructHelper(); + VkPipelineVertexInputDivisorStateCreateInfo pvids_ci = vku::InitStructHelper(); pvids_ci.vertexBindingDivisorCount = 1; pvids_ci.pVertexBindingDivisors = &vibdd; VkVertexInputBindingDescription vibd = {}; @@ -303,10 +303,10 @@ TEST_F(NegativeVertexInput, DivisorInstanceRateZeroKHR) { RETURN_IF_SKIP(Init()); InitRenderTarget(); - VkVertexInputBindingDivisorDescriptionKHR vibdd = {}; + VkVertexInputBindingDivisorDescription vibdd = {}; vibdd.binding = 0; vibdd.divisor = 0; - VkPipelineVertexInputDivisorStateCreateInfoKHR pvids_ci = vku::InitStructHelper(); + VkPipelineVertexInputDivisorStateCreateInfo pvids_ci = vku::InitStructHelper(); pvids_ci.vertexBindingDivisorCount = 1; pvids_ci.pVertexBindingDivisors = &vibdd; VkVertexInputBindingDescription vibd = {}; @@ -1598,11 +1598,11 @@ TEST_F(NegativeVertexInput, UnsupportedDivisor) { GTEST_SKIP() << "Test requires supportsNonZeroFirstInstance to be VK_FALSE"; } - VkVertexInputBindingDivisorDescriptionKHR vertex_binding_divisor; + VkVertexInputBindingDivisorDescription vertex_binding_divisor; vertex_binding_divisor.binding = 0u; vertex_binding_divisor.divisor = 2u; - VkPipelineVertexInputDivisorStateCreateInfoKHR vertex_input_divisor_state = vku::InitStructHelper(); + VkPipelineVertexInputDivisorStateCreateInfo vertex_input_divisor_state = vku::InitStructHelper(); vertex_input_divisor_state.vertexBindingDivisorCount = 1u; vertex_input_divisor_state.pVertexBindingDivisors = &vertex_binding_divisor; diff --git a/tests/unit/vertex_input_positive.cpp b/tests/unit/vertex_input_positive.cpp index 54e179fc04c..26ae1a36ee7 100644 --- a/tests/unit/vertex_input_positive.cpp +++ b/tests/unit/vertex_input_positive.cpp @@ -573,9 +573,9 @@ TEST_F(PositiveVertexInput, VertexAttributeDivisorFirstInstance) { VkPhysicalDeviceVertexAttributeDivisorPropertiesEXT pdvad_props = vku::InitStructHelper(); GetPhysicalDeviceProperties2(pdvad_props); - VkVertexInputBindingDivisorDescriptionEXT vibdd = {}; + VkVertexInputBindingDivisorDescription vibdd = {}; vibdd.divisor = 1; - VkPipelineVertexInputDivisorStateCreateInfoEXT pvids_ci = vku::InitStructHelper(); + VkPipelineVertexInputDivisorStateCreateInfo pvids_ci = vku::InitStructHelper(); pvids_ci.vertexBindingDivisorCount = 1; pvids_ci.pVertexBindingDivisors = &vibdd; VkVertexInputBindingDescription vibd = {}; diff --git a/tests/unit/video.cpp b/tests/unit/video.cpp index 4371fa700bd..87fe8f561fa 100644 --- a/tests/unit/video.cpp +++ b/tests/unit/video.cpp @@ -16066,7 +16066,7 @@ TEST_F(NegativeVideo, CreateImageViewProfileIndependent) { vkt::Image image(*m_device, image_ci); - auto image_usage_ci = vku::InitStruct(); + auto image_usage_ci = vku::InitStruct(); image_usage_ci.usage = test_case.usage; auto image_view_ci = vku::InitStruct(&image_usage_ci); image_view_ci.image = image.handle(); diff --git a/tests/unit/wsi.cpp b/tests/unit/wsi.cpp index 4dc64024618..08b99f52af9 100644 --- a/tests/unit/wsi.cpp +++ b/tests/unit/wsi.cpp @@ -531,8 +531,8 @@ TEST_F(NegativeWsi, SwapchainAcquireImageNoBinarySemaphore) { RETURN_IF_SKIP(Init()); RETURN_IF_SKIP(InitSwapchain()); - VkSemaphoreTypeCreateInfoKHR semaphore_type_create_info = vku::InitStructHelper(); - semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE_KHR; + VkSemaphoreTypeCreateInfo semaphore_type_create_info = vku::InitStructHelper(); + semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE; VkSemaphoreCreateInfo semaphore_create_info = vku::InitStructHelper(&semaphore_type_create_info); @@ -557,8 +557,8 @@ TEST_F(NegativeWsi, SwapchainAcquireImageNoBinarySemaphore2KHR) { RETURN_IF_SKIP(Init()); RETURN_IF_SKIP(InitSwapchain()); - VkSemaphoreTypeCreateInfoKHR semaphore_type_create_info = vku::InitStructHelper(); - semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE_KHR; + VkSemaphoreTypeCreateInfo semaphore_type_create_info = vku::InitStructHelper(); + semaphore_type_create_info.semaphoreType = VK_SEMAPHORE_TYPE_TIMELINE; VkSemaphoreCreateInfo semaphore_create_info = vku::InitStructHelper(&semaphore_type_create_info);