diff options
| author | Jason Ekstrand <[email protected]> | 2015-10-06 10:27:50 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-10-06 14:08:08 -0700 |
| commit | 1e4263b7d2e3d6f88527510eaaf6ca6df2ce4058 (patch) | |
| tree | f490225077902ec825e231f3405c7a359b3d7432 /src | |
| parent | d4446a7e58e4c57da68432ed108320936a910e5d (diff) | |
vk/0.170.2: s/baseArraySlice/baseArrayLayer/
Diffstat (limited to 'src')
| -rw-r--r-- | src/vulkan/anv_image.c | 6 | ||||
| -rw-r--r-- | src/vulkan/anv_meta.c | 12 | ||||
| -rw-r--r-- | src/vulkan/gen7_state.c | 2 | ||||
| -rw-r--r-- | src/vulkan/gen8_state.c | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/vulkan/anv_image.c b/src/vulkan/anv_image.c index 8eb5a603c2b..f0620e4d67e 100644 --- a/src/vulkan/anv_image.c +++ b/src/vulkan/anv_image.c @@ -411,12 +411,12 @@ anv_validate_CreateImageView(VkDevice _device, assert(subresource->arraySize > 0); assert(subresource->baseMipLevel < image->levels); assert(subresource->baseMipLevel + subresource->mipLevels <= image->levels); - assert(subresource->baseArraySlice < image->array_size); - assert(subresource->baseArraySlice + subresource->arraySize <= image->array_size); + assert(subresource->baseArrayLayer < image->array_size); + assert(subresource->baseArrayLayer + subresource->arraySize <= image->array_size); assert(pView); if (view_info->is_cube) { - assert(subresource->baseArraySlice % 6 == 0); + assert(subresource->baseArrayLayer % 6 == 0); assert(subresource->arraySize % 6 == 0); } diff --git a/src/vulkan/anv_meta.c b/src/vulkan/anv_meta.c index c214dc30a4c..4abd8d38213 100644 --- a/src/vulkan/anv_meta.c +++ b/src/vulkan/anv_meta.c @@ -1018,7 +1018,7 @@ do_buffer_copy(struct anv_cmd_buffer *cmd_buffer, .aspectMask = VK_IMAGE_ASPECT_COLOR_BIT, .baseMipLevel = 0, .mipLevels = 1, - .baseArraySlice = 0, + .baseArrayLayer = 0, .arraySize = 1 }, }, @@ -1166,7 +1166,7 @@ void anv_CmdCopyImage( .aspectMask = 1 << pRegions[r].srcSubresource.aspect, .baseMipLevel = pRegions[r].srcSubresource.mipLevel, .mipLevels = 1, - .baseArraySlice = pRegions[r].srcSubresource.arrayLayer, + .baseArrayLayer = pRegions[r].srcSubresource.arrayLayer, .arraySize = 1 }, }, @@ -1255,7 +1255,7 @@ void anv_CmdBlitImage( .aspectMask = 1 << pRegions[r].srcSubresource.aspect, .baseMipLevel = pRegions[r].srcSubresource.mipLevel, .mipLevels = 1, - .baseArraySlice = pRegions[r].srcSubresource.arrayLayer, + .baseArrayLayer = pRegions[r].srcSubresource.arrayLayer, .arraySize = 1 }, }, @@ -1388,7 +1388,7 @@ void anv_CmdCopyBufferToImage( .aspectMask = 1 << proxy_aspect, .baseMipLevel = 0, .mipLevels = 1, - .baseArraySlice = 0, + .baseArrayLayer = 0, .arraySize = 1 }, }, @@ -1478,7 +1478,7 @@ void anv_CmdCopyImageToBuffer( .aspectMask = 1 << pRegions[r].imageSubresource.aspect, .baseMipLevel = pRegions[r].imageSubresource.mipLevel, .mipLevels = 1, - .baseArraySlice = pRegions[r].imageSubresource.arrayLayer, + .baseArrayLayer = pRegions[r].imageSubresource.arrayLayer, .arraySize = 1 }, }, @@ -1565,7 +1565,7 @@ void anv_CmdClearColorImage( .image = _image, .format = image->format->vk_format, .mipLevel = pRanges[r].baseMipLevel + l, - .baseArraySlice = pRanges[r].baseArraySlice + s, + .baseArraySlice = pRanges[r].baseArrayLayer + s, .arraySize = 1, }, cmd_buffer); diff --git a/src/vulkan/gen7_state.c b/src/vulkan/gen7_state.c index 1959b8b5a49..d7a4b10c6e8 100644 --- a/src/vulkan/gen7_state.c +++ b/src/vulkan/gen7_state.c @@ -322,7 +322,7 @@ gen7_image_view_init(struct anv_image_view *iview, .Width = image->extent.width - 1, .Depth = depth - 1, .SurfacePitch = surface->stride - 1, - .MinimumArrayElement = range->baseArraySlice, + .MinimumArrayElement = range->baseArrayLayer, .NumberofMultisamples = MULTISAMPLECOUNT_1, .XOffset = 0, .YOffset = 0, diff --git a/src/vulkan/gen8_state.c b/src/vulkan/gen8_state.c index d2a403b2f56..e836613db42 100644 --- a/src/vulkan/gen8_state.c +++ b/src/vulkan/gen8_state.c @@ -243,7 +243,7 @@ gen8_image_view_init(struct anv_image_view *iview, .Depth = depth - 1, .SurfacePitch = surface->stride - 1, .RenderTargetViewExtent = rt_view_extent - 1, - .MinimumArrayElement = range->baseArraySlice, + .MinimumArrayElement = range->baseArrayLayer, .NumberofMultisamples = MULTISAMPLECOUNT_1, .XOffset = 0, .YOffset = 0, |