Mesa (master): radv: Fix ordering issue in meta memory allocation failure path.

Bas Nieuwenhuizen bnieuwenhuizen at kemper.freedesktop.org
Sun Jan 21 23:16:13 UTC 2018


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

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Sun Jan 21 20:19:48 2018 +0100

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

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

---

 src/amd/vulkan/radv_meta.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/amd/vulkan/radv_meta.c b/src/amd/vulkan/radv_meta.c
index e13fa928db..f022247097 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:




More information about the mesa-commit mailing list