nir: fix deref offset builder

[mesa.git] / src / freedreno / vulkan / tu_image.c

diff --git a/src/freedreno/vulkan/tu_image.c b/src/freedreno/vulkan/tu_image.c
index 50bd1dbbb1929f219a8c90054eca47b785d25b4d..0b14a28d44d732241c7d1be60e4c3a902e739c93 100644 (file)
--- a/src/freedreno/vulkan/tu_image.c
+++ b/src/freedreno/vulkan/tu_image.c
@@ -74,7 +74,7 @@ static void
 setup_slices(struct tu_image *image, const VkImageCreateInfo *pCreateInfo)
 {
    VkFormat format = pCreateInfo->format;
-   enum vk_format_layout layout = vk_format_description(format)->layout;
+   enum util_format_layout layout = vk_format_description(format)->layout;
    uint32_t layer_size = 0;
    int ta = image->cpp;
 
@@ -113,7 +113,7 @@ setup_slices(struct tu_image *image, const VkImageCreateInfo *pCreateInfo)
       if (level + 1 == pCreateInfo->mipLevels)
          aligned_height = align(aligned_height, 32);
 
-      if (layout == VK_FORMAT_LAYOUT_ASTC)
+      if (layout == UTIL_FORMAT_LAYOUT_ASTC)
          slice->pitch =
             util_align_npot(width, pitchalign * vk_format_get_blockwidth(format));
       else
@@ -218,7 +218,7 @@ tu_image_create(VkDevice _device,
 static enum a6xx_tex_fetchsize
 tu6_fetchsize(VkFormat format)
 {
-   if (vk_format_description(format)->layout == VK_FORMAT_LAYOUT_ASTC)
+   if (vk_format_description(format)->layout == UTIL_FORMAT_LAYOUT_ASTC)
       return TFETCH6_16_BYTE;
 
    switch (vk_format_get_blocksize(format) / vk_format_get_blockwidth(format)) {
@@ -249,8 +249,8 @@ tu6_texswiz(const VkComponentMapping *comps, const unsigned char *fmt_swiz)
       /* if format has 0/1 in channel, use that (needed for bc1_rgb) */
       if (swiz[i] < 4) {
          switch (fmt_swiz[swiz[i]]) {
-         case VK_SWIZZLE_0: swiz[i] = A6XX_TEX_ZERO; break;
-         case VK_SWIZZLE_1: swiz[i] = A6XX_TEX_ONE;  break;
+         case PIPE_SWIZZLE_0: swiz[i] = A6XX_TEX_ZERO; break;
+         case PIPE_SWIZZLE_1: swiz[i] = A6XX_TEX_ONE;  break;
          }
       }
    }
@@ -335,7 +335,7 @@ tu_image_view_init(struct tu_image_view *iview,
       A6XX_TEX_CONST_0_TILE_MODE(tile_mode) |
       COND(vk_format_is_srgb(iview->vk_format), A6XX_TEX_CONST_0_SRGB) |
       A6XX_TEX_CONST_0_FMT(fmt->tex) |
-      A6XX_TEX_CONST_0_SAMPLES(0) |
+      A6XX_TEX_CONST_0_SAMPLES(tu_msaa_samples(image->samples)) |
       A6XX_TEX_CONST_0_SWAP(image->tile_mode ? WZYX : fmt->swap) |
       tu6_texswiz(&pCreateInfo->components, vk_format_description(iview->vk_format)->swizzle) |
       A6XX_TEX_CONST_0_MIPLVLS(iview->level_count - 1);