Mesa (main): dzn: Re-order includes in dzn_nir to prevent TRUE redefinition

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sat Jul 9 14:39:11 UTC 2022


Module: Mesa
Branch: main
Commit: 4ea58cf35fee4e81463ac44417ac03d21a79bca0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4ea58cf35fee4e81463ac44417ac03d21a79bca0

Author: Jesse Natalie <jenatali at microsoft.com>
Date:   Fri Jul  8 07:15:18 2022 -0700

dzn: Re-order includes in dzn_nir to prevent TRUE redefinition

Reviewed-by: Boris Brezillon <boris.brezillon at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17423>

---

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

diff --git a/src/microsoft/vulkan/dzn_nir.c b/src/microsoft/vulkan/dzn_nir.c
index ae0dc26706a..9b49d97ff3f 100644
--- a/src/microsoft/vulkan/dzn_nir.c
+++ b/src/microsoft/vulkan/dzn_nir.c
@@ -21,13 +21,13 @@
  * IN THE SOFTWARE.
  */
 
+#include "dzn_nir.h"
+
 #include "spirv_to_dxil.h"
 #include "nir_to_dxil.h"
 #include "nir_builder.h"
 #include "nir_vulkan.h"
 
-#include "dzn_nir.h"
-
 static nir_ssa_def *
 dzn_nir_create_bo_desc(nir_builder *b,
                        nir_variable_mode mode,



More information about the mesa-commit mailing list