Mesa (main): turnip: Use correct type for OUTARRAY in FormatProperties2

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sat Apr 2 10:12:48 UTC 2022


Module: Mesa
Branch: main
Commit: 5ce06f8474fabb4680f97dbb4340c10bcf224446
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ce06f8474fabb4680f97dbb4340c10bcf224446

Author: Danylo Piliaiev <dpiliaiev at igalia.com>
Date:   Thu Mar 31 16:26:55 2022 +0300

turnip: Use correct type for OUTARRAY in FormatProperties2

Fixes: 799a9db24c334713c0ba5995f59b7db5f782e85e
("turnip: Stop using VK_OUTARRAY_MAKE()")

Signed-off-by: Danylo Piliaiev <dpiliaiev at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15694>

---

 src/freedreno/vulkan/tu_formats.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/freedreno/vulkan/tu_formats.c b/src/freedreno/vulkan/tu_formats.c
index beee335319b..1bd62265264 100644
--- a/src/freedreno/vulkan/tu_formats.c
+++ b/src/freedreno/vulkan/tu_formats.c
@@ -310,12 +310,12 @@ tu_GetPhysicalDeviceFormatProperties2(
    VkDrmFormatModifierPropertiesListEXT *list =
       vk_find_struct(pFormatProperties->pNext, DRM_FORMAT_MODIFIER_PROPERTIES_LIST_EXT);
    if (list) {
-      VK_OUTARRAY_MAKE_TYPED(VkDrmFormatModifierProperties2EXT, out,
+      VK_OUTARRAY_MAKE_TYPED(VkDrmFormatModifierPropertiesEXT, out,
                              list->pDrmFormatModifierProperties,
                              &list->drmFormatModifierCount);
 
       if (pFormatProperties->formatProperties.linearTilingFeatures) {
-         vk_outarray_append_typed(VkDrmFormatModifierProperties2EXT, &out, mod_props) {
+         vk_outarray_append_typed(VkDrmFormatModifierPropertiesEXT, &out, mod_props) {
             mod_props->drmFormatModifier = DRM_FORMAT_MOD_LINEAR;
             mod_props->drmFormatModifierPlaneCount = 1;
             mod_props->drmFormatModifierTilingFeatures =
@@ -327,7 +327,7 @@ tu_GetPhysicalDeviceFormatProperties2(
       if (pFormatProperties->formatProperties.optimalTilingFeatures &&
           tiling_possible(format) &&
           ubwc_possible(format, VK_IMAGE_TYPE_2D, 0, 0, physical_device->info, VK_SAMPLE_COUNT_1_BIT)) {
-         vk_outarray_append_typed(VkDrmFormatModifierProperties2EXT, &out, mod_props) {
+         vk_outarray_append_typed(VkDrmFormatModifierPropertiesEXT, &out, mod_props) {
             mod_props->drmFormatModifier = DRM_FORMAT_MOD_QCOM_COMPRESSED;
             mod_props->drmFormatModifierPlaneCount = 1;
             mod_props->drmFormatModifierTilingFeatures =



More information about the mesa-commit mailing list