vk/0.170.2: s/baseArraySlice/baseArrayLayer/
This commit is contained in:
parent
d4446a7e58
commit
1e4263b7d2
|
@ -1397,7 +1397,7 @@ typedef struct {
|
||||||
typedef struct {
|
typedef struct {
|
||||||
VkImageAspect aspect;
|
VkImageAspect aspect;
|
||||||
uint32_t mipLevel;
|
uint32_t mipLevel;
|
||||||
uint32_t arraySlice;
|
uint32_t arrayLayer;
|
||||||
} VkImageSubresource;
|
} VkImageSubresource;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
@ -1496,7 +1496,7 @@ typedef struct {
|
||||||
VkImageAspectFlags aspectMask;
|
VkImageAspectFlags aspectMask;
|
||||||
uint32_t baseMipLevel;
|
uint32_t baseMipLevel;
|
||||||
uint32_t mipLevels;
|
uint32_t mipLevels;
|
||||||
uint32_t baseArraySlice;
|
uint32_t baseArrayLayer;
|
||||||
uint32_t arraySize;
|
uint32_t arraySize;
|
||||||
} VkImageSubresourceRange;
|
} VkImageSubresourceRange;
|
||||||
|
|
||||||
|
|
|
@ -411,12 +411,12 @@ anv_validate_CreateImageView(VkDevice _device,
|
||||||
assert(subresource->arraySize > 0);
|
assert(subresource->arraySize > 0);
|
||||||
assert(subresource->baseMipLevel < image->levels);
|
assert(subresource->baseMipLevel < image->levels);
|
||||||
assert(subresource->baseMipLevel + subresource->mipLevels <= image->levels);
|
assert(subresource->baseMipLevel + subresource->mipLevels <= image->levels);
|
||||||
assert(subresource->baseArraySlice < image->array_size);
|
assert(subresource->baseArrayLayer < image->array_size);
|
||||||
assert(subresource->baseArraySlice + subresource->arraySize <= image->array_size);
|
assert(subresource->baseArrayLayer + subresource->arraySize <= image->array_size);
|
||||||
assert(pView);
|
assert(pView);
|
||||||
|
|
||||||
if (view_info->is_cube) {
|
if (view_info->is_cube) {
|
||||||
assert(subresource->baseArraySlice % 6 == 0);
|
assert(subresource->baseArrayLayer % 6 == 0);
|
||||||
assert(subresource->arraySize % 6 == 0);
|
assert(subresource->arraySize % 6 == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1018,7 +1018,7 @@ do_buffer_copy(struct anv_cmd_buffer *cmd_buffer,
|
||||||
.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
|
.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT,
|
||||||
.baseMipLevel = 0,
|
.baseMipLevel = 0,
|
||||||
.mipLevels = 1,
|
.mipLevels = 1,
|
||||||
.baseArraySlice = 0,
|
.baseArrayLayer = 0,
|
||||||
.arraySize = 1
|
.arraySize = 1
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -1166,7 +1166,7 @@ void anv_CmdCopyImage(
|
||||||
.aspectMask = 1 << pRegions[r].srcSubresource.aspect,
|
.aspectMask = 1 << pRegions[r].srcSubresource.aspect,
|
||||||
.baseMipLevel = pRegions[r].srcSubresource.mipLevel,
|
.baseMipLevel = pRegions[r].srcSubresource.mipLevel,
|
||||||
.mipLevels = 1,
|
.mipLevels = 1,
|
||||||
.baseArraySlice = pRegions[r].srcSubresource.arrayLayer,
|
.baseArrayLayer = pRegions[r].srcSubresource.arrayLayer,
|
||||||
.arraySize = 1
|
.arraySize = 1
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -1255,7 +1255,7 @@ void anv_CmdBlitImage(
|
||||||
.aspectMask = 1 << pRegions[r].srcSubresource.aspect,
|
.aspectMask = 1 << pRegions[r].srcSubresource.aspect,
|
||||||
.baseMipLevel = pRegions[r].srcSubresource.mipLevel,
|
.baseMipLevel = pRegions[r].srcSubresource.mipLevel,
|
||||||
.mipLevels = 1,
|
.mipLevels = 1,
|
||||||
.baseArraySlice = pRegions[r].srcSubresource.arrayLayer,
|
.baseArrayLayer = pRegions[r].srcSubresource.arrayLayer,
|
||||||
.arraySize = 1
|
.arraySize = 1
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -1388,7 +1388,7 @@ void anv_CmdCopyBufferToImage(
|
||||||
.aspectMask = 1 << proxy_aspect,
|
.aspectMask = 1 << proxy_aspect,
|
||||||
.baseMipLevel = 0,
|
.baseMipLevel = 0,
|
||||||
.mipLevels = 1,
|
.mipLevels = 1,
|
||||||
.baseArraySlice = 0,
|
.baseArrayLayer = 0,
|
||||||
.arraySize = 1
|
.arraySize = 1
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -1478,7 +1478,7 @@ void anv_CmdCopyImageToBuffer(
|
||||||
.aspectMask = 1 << pRegions[r].imageSubresource.aspect,
|
.aspectMask = 1 << pRegions[r].imageSubresource.aspect,
|
||||||
.baseMipLevel = pRegions[r].imageSubresource.mipLevel,
|
.baseMipLevel = pRegions[r].imageSubresource.mipLevel,
|
||||||
.mipLevels = 1,
|
.mipLevels = 1,
|
||||||
.baseArraySlice = pRegions[r].imageSubresource.arrayLayer,
|
.baseArrayLayer = pRegions[r].imageSubresource.arrayLayer,
|
||||||
.arraySize = 1
|
.arraySize = 1
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -1565,7 +1565,7 @@ void anv_CmdClearColorImage(
|
||||||
.image = _image,
|
.image = _image,
|
||||||
.format = image->format->vk_format,
|
.format = image->format->vk_format,
|
||||||
.mipLevel = pRanges[r].baseMipLevel + l,
|
.mipLevel = pRanges[r].baseMipLevel + l,
|
||||||
.baseArraySlice = pRanges[r].baseArraySlice + s,
|
.baseArraySlice = pRanges[r].baseArrayLayer + s,
|
||||||
.arraySize = 1,
|
.arraySize = 1,
|
||||||
},
|
},
|
||||||
cmd_buffer);
|
cmd_buffer);
|
||||||
|
|
|
@ -322,7 +322,7 @@ gen7_image_view_init(struct anv_image_view *iview,
|
||||||
.Width = image->extent.width - 1,
|
.Width = image->extent.width - 1,
|
||||||
.Depth = depth - 1,
|
.Depth = depth - 1,
|
||||||
.SurfacePitch = surface->stride - 1,
|
.SurfacePitch = surface->stride - 1,
|
||||||
.MinimumArrayElement = range->baseArraySlice,
|
.MinimumArrayElement = range->baseArrayLayer,
|
||||||
.NumberofMultisamples = MULTISAMPLECOUNT_1,
|
.NumberofMultisamples = MULTISAMPLECOUNT_1,
|
||||||
.XOffset = 0,
|
.XOffset = 0,
|
||||||
.YOffset = 0,
|
.YOffset = 0,
|
||||||
|
|
|
@ -243,7 +243,7 @@ gen8_image_view_init(struct anv_image_view *iview,
|
||||||
.Depth = depth - 1,
|
.Depth = depth - 1,
|
||||||
.SurfacePitch = surface->stride - 1,
|
.SurfacePitch = surface->stride - 1,
|
||||||
.RenderTargetViewExtent = rt_view_extent - 1,
|
.RenderTargetViewExtent = rt_view_extent - 1,
|
||||||
.MinimumArrayElement = range->baseArraySlice,
|
.MinimumArrayElement = range->baseArrayLayer,
|
||||||
.NumberofMultisamples = MULTISAMPLECOUNT_1,
|
.NumberofMultisamples = MULTISAMPLECOUNT_1,
|
||||||
.XOffset = 0,
|
.XOffset = 0,
|
||||||
.YOffset = 0,
|
.YOffset = 0,
|
||||||
|
|
Loading…
Reference in New Issue