diff options
| author | Chad Versace <[email protected]> | 2015-10-07 11:39:49 -0700 |
|---|---|---|
| committer | Chad Versace <[email protected]> | 2015-10-07 11:39:49 -0700 |
| commit | 0ca3c8480ddc280bc7faa8aec2db2c3cd299aade (patch) | |
| tree | be0528b72fcdcd765895182a0ca97af1098bb947 /src | |
| parent | f9c948ed00787c56bac265dc934049ed67a1cd61 (diff) | |
vk/0.170.2: Update remaining enums
Diffstat (limited to 'src')
| -rw-r--r-- | src/vulkan/anv_formats.c | 4 | ||||
| -rw-r--r-- | src/vulkan/anv_image.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/vulkan/anv_formats.c b/src/vulkan/anv_formats.c index 944e05f1476..2690ff24692 100644 --- a/src/vulkan/anv_formats.c +++ b/src/vulkan/anv_formats.c @@ -120,7 +120,7 @@ static const struct anv_format anv_formats[] = { fmt(VK_FORMAT_R9G9B9E5_UFLOAT, R9G9B9E5_SHAREDEXP, .cpp = 4, .num_channels = 3), fmt(VK_FORMAT_D16_UNORM, R16_UNORM, .cpp = 2, .num_channels = 1, .depth_format = D16_UNORM), - fmt(VK_FORMAT_D24_UNORM, R24_UNORM_X8_TYPELESS, .cpp = 4, .num_channels = 1, .depth_format = D24_UNORM_X8_UINT), + fmt(VK_FORMAT_D24_UNORM_X8, R24_UNORM_X8_TYPELESS, .cpp = 4, .num_channels = 1, .depth_format = D24_UNORM_X8_UINT), fmt(VK_FORMAT_D32_SFLOAT, R32_FLOAT, .cpp = 4, .num_channels = 1, .depth_format = D32_FLOAT), fmt(VK_FORMAT_S8_UINT, R8_UINT, .cpp = 1, .num_channels = 1, .has_stencil = true), fmt(VK_FORMAT_D16_UNORM_S8_UINT, R16_UNORM, .cpp = 2, .num_channels = 2, .depth_format = D16_UNORM, .has_stencil = true), @@ -429,7 +429,7 @@ VkResult anv_GetPhysicalDeviceImageFormatProperties( } } - if (usage & VK_IMAGE_USAGE_DEPTH_STENCIL_BIT) { + if (usage & VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT) { if (!(format_feature_flags & VK_FORMAT_FEATURE_DEPTH_STENCIL_ATTACHMENT_BIT)) { goto unsupported; } diff --git a/src/vulkan/anv_image.c b/src/vulkan/anv_image.c index 014a9b9b342..e72c592905f 100644 --- a/src/vulkan/anv_image.c +++ b/src/vulkan/anv_image.c @@ -484,7 +484,7 @@ anv_image_view_init(struct anv_image_view *iview, assert(image->usage & (VK_IMAGE_USAGE_SAMPLED_BIT | VK_IMAGE_USAGE_STORAGE_BIT | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | - VK_IMAGE_USAGE_DEPTH_STENCIL_BIT)); + VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT)); switch (image->type) { default: |