From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Fri, 22 Sep 2017 13:16:22 +0000 (+0200)
Subject: radv: init the trace BO before compiling meta shaders
X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=3f6a17a8fcdb891409794bb7925a6fb4947b54e1

radv: init the trace BO before compiling meta shaders

Otherwise, the disasm string is NULL for meta shaders.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
---

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 6171408ced1..28a941e219c 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -1203,6 +1203,11 @@ VkResult radv_CreateDevice(
 		device->physical_device->rad_info.chip_class >= VI &&
 		device->physical_device->rad_info.max_se >= 2;
 
+	if (getenv("RADV_TRACE_FILE")) {
+		if (!radv_init_trace(device))
+			goto fail;
+	}
+
 	result = radv_device_init_meta(device);
 	if (result != VK_SUCCESS)
 		goto fail;
@@ -1225,11 +1230,6 @@ VkResult radv_CreateDevice(
 		device->ws->cs_finalize(device->empty_cs[family]);
 	}
 
-	if (getenv("RADV_TRACE_FILE")) {
-		if (!radv_init_trace(device))
-			goto fail;
-	}
-
 	if (device->physical_device->rad_info.chip_class >= CIK)
 		cik_create_gfx_config(device);