[Mesa-dev] [PATCH 1/3] radv: Rename radv_radeon_winsys.h to radv_winsys.h.

[Bas Nieuwenhuizen]

The amdgpu winsys has radv_amdgpu_winsys.h, and getting another radv_radeon_winsys.h
in there for a radeon winsys would be awkward.

Signed-off-by: Bas Nieuwenhuizen <basni at google.com>
---
 src/amd/vulkan/Makefile.sources                        | 2 +-
 src/amd/vulkan/radv_cmd_buffer.c                       | 2 +-
 src/amd/vulkan/radv_image.c                            | 2 +-
 src/amd/vulkan/radv_private.h                          | 2 +-
 src/amd/vulkan/{radv_radeon_winsys.h => radv_winsys.h} | 6 +++---
 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c          | 2 +-
 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.h          | 2 +-
 src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h      | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)
 rename src/amd/vulkan/{radv_radeon_winsys.h => radv_winsys.h} (98%)

diff --git a/src/amd/vulkan/Makefile.sources b/src/amd/vulkan/Makefile.sources
index d3e0c81e9a3..584aea58213 100644
--- a/src/amd/vulkan/Makefile.sources
+++ b/src/amd/vulkan/Makefile.sources
@@ -56,7 +56,7 @@ VULKAN_FILES := \
 	radv_pipeline.c \
 	radv_pipeline_cache.c \
 	radv_private.h \
-	radv_radeon_winsys.h \
+	radv_winsys.h \
 	radv_query.c \
 	radv_util.c \
 	radv_util.h \
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 1ac9de139f1..0fb7bfa4bab 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -26,7 +26,7 @@
  */
 
 #include "radv_private.h"
-#include "radv_radeon_winsys.h"
+#include "radv_winsys.h"
 #include "radv_cs.h"
 #include "sid.h"
 #include "gfx9d.h"
diff --git a/src/amd/vulkan/radv_image.c b/src/amd/vulkan/radv_image.c
index 91c7e5ff79f..37610f1c249 100644
--- a/src/amd/vulkan/radv_image.c
+++ b/src/amd/vulkan/radv_image.c
@@ -27,7 +27,7 @@
 
 #include "radv_private.h"
 #include "vk_format.h"
-#include "radv_radeon_winsys.h"
+#include "radv_winsys.h"
 #include "sid.h"
 #include "gfx9d.h"
 #include "util/debug.h"
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 87cb0a67fe7..d13e4190510 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -50,7 +50,7 @@
 #include "main/macros.h"
 #include "vk_alloc.h"
 
-#include "radv_radeon_winsys.h"
+#include "radv_winsys.h"
 #include "ac_binary.h"
 #include "ac_nir_to_llvm.h"
 #include "ac_gpu_info.h"
diff --git a/src/amd/vulkan/radv_radeon_winsys.h b/src/amd/vulkan/radv_winsys.h
similarity index 98%
rename from src/amd/vulkan/radv_radeon_winsys.h
rename to src/amd/vulkan/radv_winsys.h
index cdcaeca46ec..b4a4793a127 100644
--- a/src/amd/vulkan/radv_radeon_winsys.h
+++ b/src/amd/vulkan/radv_winsys.h
@@ -26,8 +26,8 @@
  * IN THE SOFTWARE.
  */
 
-#ifndef RADV_RADEON_WINSYS_H
-#define RADV_RADEON_WINSYS_H
+#ifndef RADV_WINSYS_H
+#define RADV_WINSYS_H
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -238,4 +238,4 @@ static inline void radeon_emit_array(struct radeon_winsys_cs *cs,
 	cs->cdw += count;
 }
 
-#endif /* RADV_RADEON_WINSYS_H */
+#endif /* RADV_WINSYS_H */
diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
index 7b749700d1c..3655e0ebd3a 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.c
@@ -29,7 +29,7 @@
 
 #include "ac_debug.h"
 #include "amdgpu_id.h"
-#include "radv_radeon_winsys.h"
+#include "radv_winsys.h"
 #include "radv_amdgpu_cs.h"
 #include "radv_amdgpu_bo.h"
 #include "sid.h"
diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.h b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.h
index 42d89eee54d..41d0b2f2efb 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.h
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_cs.h
@@ -35,7 +35,7 @@
 #include "r600d_common.h"
 #include <amdgpu.h>
 
-#include "radv_radeon_winsys.h"
+#include "radv_winsys.h"
 #include "radv_amdgpu_winsys.h"
 
 enum {
diff --git a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
index 426cf692ec0..2d9cf248389 100644
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
@@ -28,7 +28,7 @@
 #ifndef RADV_AMDGPU_WINSYS_H
 #define RADV_AMDGPU_WINSYS_H
 
-#include "radv_radeon_winsys.h"
+#include "radv_winsys.h"
 #include "ac_gpu_info.h"
 #include "addrlib/addrinterface.h"
 #include <amdgpu.h>
-- 
2.13.0