From b0b3b9e8b11c7719b1e4540aadb4da85926504b5 Mon Sep 17 00:00:00 2001
From: Constantine Shablya <constantine.shablya@collabora.com>
Date: Wed, 15 Mar 2023 16:03:49 +0200
Subject: [PATCH] vulkan: relocate rmv to its correct home

Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21754>
---
 src/vulkan/runtime/meson.build                     | 4 ++++
 src/vulkan/{util => runtime}/rmv/vk_rmv_common.c   | 0
 src/vulkan/{util => runtime}/rmv/vk_rmv_common.h   | 0
 src/vulkan/{util => runtime}/rmv/vk_rmv_exporter.c | 0
 src/vulkan/{util => runtime}/rmv/vk_rmv_tokens.h   | 0
 src/vulkan/util/meson.build                        | 4 ----
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename src/vulkan/{util => runtime}/rmv/vk_rmv_common.c (100%)
 rename src/vulkan/{util => runtime}/rmv/vk_rmv_common.h (100%)
 rename src/vulkan/{util => runtime}/rmv/vk_rmv_exporter.c (100%)
 rename src/vulkan/{util => runtime}/rmv/vk_rmv_tokens.h (100%)

diff --git a/src/vulkan/runtime/meson.build b/src/vulkan/runtime/meson.build
index bb0c487d0ba..4024c568c8c 100644
--- a/src/vulkan/runtime/meson.build
+++ b/src/vulkan/runtime/meson.build
@@ -22,6 +22,10 @@
 # dependency tracking.
 
 vulkan_runtime_files = files(
+  'rmv/vk_rmv_common.c',
+  'rmv/vk_rmv_common.h',
+  'rmv/vk_rmv_exporter.c',
+  'rmv/vk_rmv_tokens.h',
   'vk_acceleration_structure.c',
   'vk_acceleration_structure.h',
   'vk_buffer.c',
diff --git a/src/vulkan/util/rmv/vk_rmv_common.c b/src/vulkan/runtime/rmv/vk_rmv_common.c
similarity index 100%
rename from src/vulkan/util/rmv/vk_rmv_common.c
rename to src/vulkan/runtime/rmv/vk_rmv_common.c
diff --git a/src/vulkan/util/rmv/vk_rmv_common.h b/src/vulkan/runtime/rmv/vk_rmv_common.h
similarity index 100%
rename from src/vulkan/util/rmv/vk_rmv_common.h
rename to src/vulkan/runtime/rmv/vk_rmv_common.h
diff --git a/src/vulkan/util/rmv/vk_rmv_exporter.c b/src/vulkan/runtime/rmv/vk_rmv_exporter.c
similarity index 100%
rename from src/vulkan/util/rmv/vk_rmv_exporter.c
rename to src/vulkan/runtime/rmv/vk_rmv_exporter.c
diff --git a/src/vulkan/util/rmv/vk_rmv_tokens.h b/src/vulkan/runtime/rmv/vk_rmv_tokens.h
similarity index 100%
rename from src/vulkan/util/rmv/vk_rmv_tokens.h
rename to src/vulkan/runtime/rmv/vk_rmv_tokens.h
diff --git a/src/vulkan/util/meson.build b/src/vulkan/util/meson.build
index 957925eb733..589b4f9a396 100644
--- a/src/vulkan/util/meson.build
+++ b/src/vulkan/util/meson.build
@@ -58,10 +58,6 @@ vk_dispatch_trampolines_gen = files('vk_dispatch_trampolines_gen.py')
 vk_physical_device_features_gen = files('vk_physical_device_features.py')
 
 files_vulkan_util = files(
-  'rmv/vk_rmv_common.c',
-  'rmv/vk_rmv_common.h',
-  'rmv/vk_rmv_exporter.c',
-  'rmv/vk_rmv_tokens.h',
   'vk_alloc.c',
   'vk_alloc.h',
   'vk_format.c',