Mesa (master): radv: init the trace BO before compiling meta shaders

[Samuel Pitoiset]

Module: Mesa
Branch: master
Commit: 3f6a17a8fcdb891409794bb7925a6fb4947b54e1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f6a17a8fcdb891409794bb7925a6fb4947b54e1

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Fri Sep 22 15:16:22 2017 +0200

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 at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

 src/amd/vulkan/radv_device.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 6171408ced..28a941e219 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);