X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Famd%2Fvulkan%2Fradv_image.c;h=076b9ebf27abefb79d725c112815c33db13ff7f0;hb=f944a59996287de85d4c6d9b7b000d25f41b1d79;hp=ec99197fde90958835d7190f95b1ae8e528fbd5c;hpb=9bf3570fed064cfc5a863fa4bd4802f11b1030f5;p=mesa.git

diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index ec99197fde9..076b9ebf27a 100644
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -734,9 +734,9 @@ radv_image_get_fmask_info(struct radv_device *device,
 			  struct radv_fmask_info *out)
 {
 	if (device->physical_device->rad_info.chip_class >= GFX9) {
-		out->alignment = image->surface.u.gfx9.fmask_alignment;
-		out->size = image->surface.u.gfx9.fmask_size;
-		out->tile_swizzle = image->surface.u.gfx9.fmask_tile_swizzle;
+		out->alignment = image->surface.fmask_alignment;
+		out->size = image->surface.fmask_size;
+		out->tile_swizzle = image->surface.fmask_tile_swizzle;
 		return;
 	}
 
@@ -744,9 +744,9 @@ radv_image_get_fmask_info(struct radv_device *device,
 	out->tile_mode_index = image->surface.u.legacy.fmask.tiling_index;
 	out->pitch_in_pixels = image->surface.u.legacy.fmask.pitch_in_pixels;
 	out->bank_height = image->surface.u.legacy.fmask.bankh;
-	out->tile_swizzle = image->surface.u.legacy.fmask.tile_swizzle;
-	out->alignment = image->surface.u.legacy.fmask.alignment;
-	out->size = image->surface.u.legacy.fmask.size;
+	out->tile_swizzle = image->surface.fmask_tile_swizzle;
+	out->alignment = image->surface.fmask_alignment;
+	out->size = image->surface.fmask_size;
 
 	assert(!out->tile_swizzle || !image->shareable);
 }
@@ -937,6 +937,7 @@ radv_image_create(VkDevice _device,
 	image->info.height = pCreateInfo->extent.height;
 	image->info.depth = pCreateInfo->extent.depth;
 	image->info.samples = pCreateInfo->samples;
+	image->info.color_samples = pCreateInfo->samples;
 	image->info.array_size = pCreateInfo->arrayLayers;
 	image->info.levels = pCreateInfo->mipLevels;
 	image->info.num_channels = vk_format_get_nr_components(pCreateInfo->format);