From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Sun, 21 Jan 2018 19:19:48 +0000 (+0100)
Subject: radv: Fix ordering issue in meta memory allocation failure path.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d956e0bdf53a9dd51d4a07d3cb58ee16e37a4ace;p=mesa.git

radv: Fix ordering issue in meta memory allocation failure path.

CC: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/amd/vulkan/radv_meta.c b/src/amd/vulkan/radv_meta.c
index e13fa928dbc..f0222470973 100644
--- a/src/amd/vulkan/radv_meta.c
+++ b/src/amd/vulkan/radv_meta.c
@@ -379,9 +379,9 @@ fail_resolve_fragment:
 fail_resolve_compute:
 	radv_device_finish_meta_fast_clear_flush_state(device);
 fail_fast_clear:
-	radv_device_finish_meta_buffer_state(device);
-fail_query:
 	radv_device_finish_meta_query_state(device);
+fail_query:
+	radv_device_finish_meta_buffer_state(device);
 fail_buffer:
 	radv_device_finish_meta_depth_decomp_state(device);
 fail_depth_decomp: