From 12e8ea26300c648b88205ba7860313c57918cbd9 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Sat, 28 May 2022 09:15:48 +1000
Subject: [PATCH] nvk: fix header guards to be less generic.

You could imagine want to use these defines for something
that isn't header guards, so just make the headers guards
more explicit.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
---
 src/nouveau/vulkan/nvk_buffer.h          | 4 ++--
 src/nouveau/vulkan/nvk_device.h          | 4 ++--
 src/nouveau/vulkan/nvk_device_memory.h   | 4 ++--
 src/nouveau/vulkan/nvk_image.h           | 4 ++--
 src/nouveau/vulkan/nvk_image_view.h      | 4 ++--
 src/nouveau/vulkan/nvk_instance.h        | 4 ++--
 src/nouveau/vulkan/nvk_physical_device.h | 4 ++--
 src/nouveau/vulkan/nvk_private.h         | 4 ++--
 src/nouveau/vulkan/nvk_sampler.h         | 4 ++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/nouveau/vulkan/nvk_buffer.h b/src/nouveau/vulkan/nvk_buffer.h
index 6af3ec9df4d..6914bd0e8d0 100644
--- a/src/nouveau/vulkan/nvk_buffer.h
+++ b/src/nouveau/vulkan/nvk_buffer.h
@@ -1,5 +1,5 @@
-#ifndef NVK_BUFFER
-#define NVK_BUFFER 1
+#ifndef NVK_BUFFER_H
+#define NVK_BUFFER_H 1
 
 #include "nvk_private.h"
 
diff --git a/src/nouveau/vulkan/nvk_device.h b/src/nouveau/vulkan/nvk_device.h
index 4991f71452e..5f1d47fa77e 100644
--- a/src/nouveau/vulkan/nvk_device.h
+++ b/src/nouveau/vulkan/nvk_device.h
@@ -1,5 +1,5 @@
-#ifndef NVK_DEVICE
-#define NVK_DEVICE 1
+#ifndef NVK_DEVICE_H
+#define NVK_DEVICE_H 1
 
 #include "nvk_private.h"
 
diff --git a/src/nouveau/vulkan/nvk_device_memory.h b/src/nouveau/vulkan/nvk_device_memory.h
index 14749c68eee..29cfb0c2794 100644
--- a/src/nouveau/vulkan/nvk_device_memory.h
+++ b/src/nouveau/vulkan/nvk_device_memory.h
@@ -1,5 +1,5 @@
-#ifndef NVK_MEMORY
-#define NVK_MEMORY 1
+#ifndef NVK_MEMORY_H
+#define NVK_MEMORY_H 1
 
 #include "nvk_private.h"
 
diff --git a/src/nouveau/vulkan/nvk_image.h b/src/nouveau/vulkan/nvk_image.h
index 8139b2ce6bd..b015e2a23f3 100644
--- a/src/nouveau/vulkan/nvk_image.h
+++ b/src/nouveau/vulkan/nvk_image.h
@@ -1,5 +1,5 @@
-#ifndef NVK_IMAGE
-#define NVK_IMAGE 1
+#ifndef NVK_IMAGE_H
+#define NVK_IMAGE_H 1
 
 #include "nvk_private.h"
 
diff --git a/src/nouveau/vulkan/nvk_image_view.h b/src/nouveau/vulkan/nvk_image_view.h
index 0b908120314..796adae021b 100644
--- a/src/nouveau/vulkan/nvk_image_view.h
+++ b/src/nouveau/vulkan/nvk_image_view.h
@@ -1,5 +1,5 @@
-#ifndef NVK_IMAGE_VIEW
-#define NVK_IMAGE_VIEW 1
+#ifndef NVK_IMAGE_VIEW_H
+#define NVK_IMAGE_VIEW_H 1
 
 #include "nvk_private.h"
 
diff --git a/src/nouveau/vulkan/nvk_instance.h b/src/nouveau/vulkan/nvk_instance.h
index 729f92f76bf..5a11b80853f 100644
--- a/src/nouveau/vulkan/nvk_instance.h
+++ b/src/nouveau/vulkan/nvk_instance.h
@@ -1,5 +1,5 @@
-#ifndef NVK_INSTANCE
-#define NVK_INSTANCE 1
+#ifndef NVK_INSTANCE_H
+#define NVK_INSTANCE_H 1
 
 #include "nvk_private.h"
 
diff --git a/src/nouveau/vulkan/nvk_physical_device.h b/src/nouveau/vulkan/nvk_physical_device.h
index aa4535f0d9a..fccea047780 100644
--- a/src/nouveau/vulkan/nvk_physical_device.h
+++ b/src/nouveau/vulkan/nvk_physical_device.h
@@ -1,5 +1,5 @@
-#ifndef NVK_PHYSICAL_DEVICE
-#define NVK_PHYSICAL_DEVICE 1
+#ifndef NVK_PHYSICAL_DEVICE_H
+#define NVK_PHYSICAL_DEVICE_H 1
 
 #include "nvk_private.h"
 
diff --git a/src/nouveau/vulkan/nvk_private.h b/src/nouveau/vulkan/nvk_private.h
index edb8acb2c48..48602b1854c 100644
--- a/src/nouveau/vulkan/nvk_private.h
+++ b/src/nouveau/vulkan/nvk_private.h
@@ -1,5 +1,5 @@
-#ifndef NVK_PRIVATE
-#define NVK_PRIVATE 1
+#ifndef NVK_PRIVATE_H
+#define NVK_PRIVATE_H 1
 
 #include "nvk_entrypoints.h"
 
diff --git a/src/nouveau/vulkan/nvk_sampler.h b/src/nouveau/vulkan/nvk_sampler.h
index 3e990e55c92..5b14f4dedc0 100644
--- a/src/nouveau/vulkan/nvk_sampler.h
+++ b/src/nouveau/vulkan/nvk_sampler.h
@@ -1,5 +1,5 @@
-#ifndef NVK_SAMPLER
-#define NVK_SAMPLER 1
+#ifndef NVK_SAMPLER_H
+#define NVK_SAMPLER_H 1
 
 #include "nvk_private.h"