From 28c4960ca57e3988e44cdf03df999210d5f16c60 Mon Sep 17 00:00:00 2001
From: James Park <jpark37@lagfreegames.com>
Date: Mon, 14 Dec 2020 10:33:03 -0800
Subject: [PATCH] radv: Use typed outarray API

MSVC cannot perform GCC __typeof__ for C code. (C++ has decltype.)

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7793>
---
 src/amd/vulkan/radv_device.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index e23c2012a83..3a50a3790dc 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -8302,7 +8302,7 @@ VkResult radv_GetPhysicalDeviceFragmentShadingRatesKHR(
 	uint32_t*                                   pFragmentShadingRateCount,
 	VkPhysicalDeviceFragmentShadingRateKHR*     pFragmentShadingRates)
 {
-	VK_OUTARRAY_MAKE(out, pFragmentShadingRates, pFragmentShadingRateCount);
+	VK_OUTARRAY_MAKE_TYPED(VkPhysicalDeviceFragmentShadingRateKHR, out, pFragmentShadingRates, pFragmentShadingRateCount);
 
 #define append_rate(w, h, s) {									\
 	VkPhysicalDeviceFragmentShadingRateKHR rate = {						\
@@ -8310,7 +8310,7 @@ VkResult radv_GetPhysicalDeviceFragmentShadingRatesKHR(
 		.sampleCounts = s,								\
 		.fragmentSize = { .width = w, .height = h },					\
 	};											\
-	vk_outarray_append(&out, r) *r = rate;							\
+	vk_outarray_append_typed(VkPhysicalDeviceFragmentShadingRateKHR, &out, r) *r = rate;	\
 }
 
 	for (uint32_t x = 2; x >= 1; x--) {