fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 11:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vk/gen8: Refactor setting of SURFACE_STATE::Depth

Browse source 
The field's meaning depends on SURFACE_STATE::SurfaceType.
Make that correlation explicit by switching on VkImageType.
For good measure, add some PRM quotes too.
This commit is contained in:
Chad Versace 2015-09-14 11:14:21 -07:00
parent eed74e3a02
commit ffa61e1572
1 changed files with 44 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/vulkan/gen8_state.c
View file

@ -152,6 +152,8 @@ gen8_image_view_init(struct anv_image_view *iview,
struct anv_surface *surface =
anv_image_get_surface_for_aspect(image, range->aspect);
uint32_t depth = 1; /* RENDER_SURFACE_STATE::Depth */
const struct anv_format *format_info =
anv_format_for_vk_format(pCreateInfo->format);
@ -171,11 +173,28 @@ gen8_image_view_init(struct anv_image_view *iview,
.depth = anv_minify(image->extent.depth, range->baseMipLevel),
};
uint32_t depth = 1;
if (range->arraySize > 1) {
switch (image->type) {
case VK_IMAGE_TYPE_1D:
case VK_IMAGE_TYPE_2D:
/* From the Broadwell PRM >> RENDER_SURFACE_STATE::Depth:
*
* For SURFTYPE_1D, 2D, and CUBE: The range of this field is reduced
* by one for each increase from zero of Minimum Array Element. For
* example, if Minimum Array Element is set to 1024 on a 2D surface,
* the range of this field is reduced to [0,1023].
*/
depth = range->arraySize;
} else if (image->extent.depth > 1) {
break;
case VK_IMAGE_TYPE_3D:
/* From the Broadwell PRM >> RENDER_SURFACE_STATE::Depth:
*
* If the volume texture is MIP-mapped, this field specifies the
* depth of the base MIP level.
*/
depth = image->extent.depth;
break;
default:
unreachable(!"bad VkImageType");
}
static const uint32_t vk_to_gen_swizzle[] = {
@ -260,6 +279,8 @@ gen8_color_attachment_view_init(struct anv_color_attachment_view *aview,
const struct anv_format *format_info =
anv_format_for_vk_format(pCreateInfo->format);
uint32_t depth = 1; /* RENDER_SURFACE_STATE::Depth */
aview->base.attachment_type = ANV_ATTACHMENT_VIEW_TYPE_COLOR;
anv_assert(pCreateInfo->arraySize > 0);
@ -276,11 +297,28 @@ gen8_color_attachment_view_init(struct anv_color_attachment_view *aview,
.depth = anv_minify(image->extent.depth, pCreateInfo->mipLevel),
};
uint32_t depth = 1;
if (pCreateInfo->arraySize > 1) {
switch (image->type) {
case VK_IMAGE_TYPE_1D:
case VK_IMAGE_TYPE_2D:
/* From the Broadwell PRM >> RENDER_SURFACE_STATE::Depth:
*
* For SURFTYPE_1D, 2D, and CUBE: The range of this field is reduced
* by one for each increase from zero of Minimum Array Element. For
* example, if Minimum Array Element is set to 1024 on a 2D surface,
* the range of this field is reduced to [0,1023].
*/
depth = pCreateInfo->arraySize;
} else if (image->extent.depth > 1) {
break;
case VK_IMAGE_TYPE_3D:
/* From the Broadwell PRM >> RENDER_SURFACE_STATE::Depth:
*
* If the volume texture is MIP-mapped, this field specifies the
* depth of the base MIP level.
*/
depth = image->extent.depth;
break;
default:
unreachable(!"bad VkImageType");
}
if (cmd_buffer) {