KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use vk_foreach_struct_const where needed 

We're about to make it so that the compiler warns/errors if you use the
wrong iterator macro.  Fix up a bunch of places where someone used the
wrong one before we break anything.

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17630>
This commit is contained in:
Jason Ekstrand 2022-07-19 03:39:14 -05:00 committed by Marge Bot
parent 9066cc86bb
commit b510ee0d22
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/amd/vulkan/radv_descriptor_set.c
View File

@ -797,7 +797,7 @@ radv_CreateDescriptorPool(VkDevice _device, const VkDescriptorPoolCreateInfo *pC
const VkMutableDescriptorTypeCreateInfoVALVE *mutable_info =
vk_find_struct_const(pCreateInfo->pNext, MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE);
vk_foreach_struct(ext, pCreateInfo->pNext)
vk_foreach_struct_const(ext, pCreateInfo->pNext)
{
switch (ext->sType) {
case VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_INLINE_UNIFORM_BLOCK_CREATE_INFO: {

2
src/freedreno/vulkan/tu_cmd_buffer.c
View File

@ -1759,7 +1759,7 @@ tu_BeginCommandBuffer(VkCommandBuffer commandBuffer,
cmd_buffer->inherited_pipeline_statistics =
pBeginInfo->pInheritanceInfo->pipelineStatistics;
vk_foreach_struct(ext, pBeginInfo->pInheritanceInfo) {
vk_foreach_struct_const(ext, pBeginInfo->pInheritanceInfo) {
switch (ext->sType) {
case VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_CONDITIONAL_RENDERING_INFO_EXT: {
const VkCommandBufferInheritanceConditionalRenderingInfoEXT *cond_rend = (void *) ext;

6
src/gallium/frontends/lavapipe/lvp_pipeline.c
View File

@ -141,7 +141,7 @@ deep_copy_vertex_input_state(void *mem_ctx,
src->vertexAttributeDescriptionCount);
if (src->pNext) {
vk_foreach_struct(ext, src->pNext) {
vk_foreach_struct_const(ext, src->pNext) {
switch (ext->sType) {
case VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT: {
const VkPipelineVertexInputDivisorStateCreateInfoEXT *ext_src = (VkPipelineVertexInputDivisorStateCreateInfoEXT *)ext;
@ -224,7 +224,7 @@ deep_copy_viewport_state(void *mem_ctx,
dst->scissorCount = 0;
if (src->pNext) {
vk_foreach_struct(ext, src->pNext) {
vk_foreach_struct_const(ext, src->pNext) {
switch (ext->sType) {
case VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_DEPTH_CLIP_CONTROL_CREATE_INFO_EXT: {
VkPipelineViewportDepthClipControlCreateInfoEXT *ext_src = (VkPipelineViewportDepthClipControlCreateInfoEXT *)ext;
@ -344,7 +344,7 @@ deep_copy_rasterization_state(void *mem_ctx,
dst->pNext = NULL;
if (src->pNext) {
vk_foreach_struct(ext, src->pNext) {
vk_foreach_struct_const(ext, src->pNext) {
switch (ext->sType) {
case VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_DEPTH_CLIP_STATE_CREATE_INFO_EXT: {
VkPipelineRasterizationDepthClipStateCreateInfoEXT *ext_src = (VkPipelineRasterizationDepthClipStateCreateInfoEXT *)ext;

6
src/imagination/vulkan/pvr_descriptor_set.c
View File

@ -437,7 +437,7 @@ VkResult pvr_CreateDescriptorSetLayout(
assert(pCreateInfo->sType ==
VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO);
vk_foreach_struct (ext, pCreateInfo->pNext) {
vk_foreach_struct_const (ext, pCreateInfo->pNext) {
pvr_debug_ignored_stype(ext->sType);
}
@ -1233,7 +1233,7 @@ pvr_AllocateDescriptorSets(VkDevice _device,
VkResult result;
uint32_t i;
vk_foreach_struct (ext, pAllocateInfo->pNext) {
vk_foreach_struct_const (ext, pAllocateInfo->pNext) {
pvr_debug_ignored_stype(ext->sType);
}
@ -1410,7 +1410,7 @@ void pvr_UpdateDescriptorSets(VkDevice _device,
PVR_FROM_HANDLE(pvr_descriptor_set, set, write_set->dstSet);
uint32_t *map = set->pvr_bo->bo->map;
vk_foreach_struct (ext, write_set->pNext) {
vk_foreach_struct_const (ext, write_set->pNext) {
pvr_debug_ignored_stype(ext->sType);
}

2
src/intel/vulkan/genX_state.c
View File

@ -912,7 +912,7 @@ VkResult genX(CreateSampler)(
bool enable_sampler_reduction = false;
#endif
vk_foreach_struct(ext, pCreateInfo->pNext) {
vk_foreach_struct_const(ext, pCreateInfo->pNext) {
switch (ext->sType) {
case VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_INFO: {
VkSamplerYcbcrConversionInfo *pSamplerConversion =

2
src/panfrost/vulkan/panvk_pass.c
View File

@ -58,7 +58,7 @@ panvk_CreateRenderPass2(VkDevice _device,
pass->subpass_count = pCreateInfo->subpassCount;
pass->attachments = (void *) pass + attachments_offset;
vk_foreach_struct(ext, pCreateInfo->pNext) {
vk_foreach_struct_const(ext, pCreateInfo->pNext) {
switch (ext->sType) {
case VK_STRUCTURE_TYPE_RENDER_PASS_MULTIVIEW_CREATE_INFO:
multiview_info = (VkRenderPassMultiviewCreateInfo *) ext;

4
src/vulkan/overlay-layer/overlay.cpp
View File

@ -269,7 +269,7 @@ static void unmap_object(uint64_t obj)
static VkLayerInstanceCreateInfo *get_instance_chain_info(const VkInstanceCreateInfo *pCreateInfo,
VkLayerFunction func)
{
vk_foreach_struct(item, pCreateInfo->pNext) {
vk_foreach_struct_const(item, pCreateInfo->pNext) {
if (item->sType == VK_STRUCTURE_TYPE_LOADER_INSTANCE_CREATE_INFO &&
((VkLayerInstanceCreateInfo *) item)->function == func)
return (VkLayerInstanceCreateInfo *) item;
@ -281,7 +281,7 @@ static VkLayerInstanceCreateInfo *get_instance_chain_info(const VkInstanceCreate
static VkLayerDeviceCreateInfo *get_device_chain_info(const VkDeviceCreateInfo *pCreateInfo,
VkLayerFunction func)
{
vk_foreach_struct(item, pCreateInfo->pNext) {
vk_foreach_struct_const(item, pCreateInfo->pNext) {
if (item->sType == VK_STRUCTURE_TYPE_LOADER_DEVICE_CREATE_INFO &&
((VkLayerDeviceCreateInfo *) item)->function == func)
return (VkLayerDeviceCreateInfo *)item;

2
src/vulkan/runtime/vk_render_pass.c
View File

@ -97,7 +97,7 @@ vk_common_CreateRenderPass(VkDevice _device,
const VkRenderPassMultiviewCreateInfo *multiview_info = NULL;
const VkRenderPassInputAttachmentAspectCreateInfo *aspect_info = NULL;
vk_foreach_struct(ext, pCreateInfo->pNext) {
vk_foreach_struct_const(ext, pCreateInfo->pNext) {
switch (ext->sType) {
case VK_STRUCTURE_TYPE_RENDER_PASS_INPUT_ATTACHMENT_ASPECT_CREATE_INFO:
aspect_info = (const VkRenderPassInputAttachmentAspectCreateInfo *)ext;

2
src/vulkan/wsi/wsi_common.c
View File

@ -1237,7 +1237,7 @@ wsi_common_create_swapchain_image(const struct wsi_device *wsi,
assert(pCreateInfo->tiling == VK_IMAGE_TILING_OPTIMAL);
assert(!(pCreateInfo->usage & ~swcInfo->usage));
vk_foreach_struct(ext, pCreateInfo->pNext) {
vk_foreach_struct_const(ext, pCreateInfo->pNext) {
switch (ext->sType) {
case VK_STRUCTURE_TYPE_IMAGE_FORMAT_LIST_CREATE_INFO: {
const VkImageFormatListCreateInfo *iflci =