From 5d0aa694ee9b47bf42eec123332301c7354879da Mon Sep 17 00:00:00 2001
From: Emma Anholt <emma@anholt.net>
Date: Sat, 10 Sep 2022 22:19:57 -0700
Subject: [PATCH] nvk: Avoid strict aliasing warning in the pushbuffer
 encoding.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24326>
---
 src/nouveau/nvidia-headers/class_parser.py | 3 ++-
 src/nouveau/nvidia-headers/meson.build     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/nouveau/nvidia-headers/class_parser.py b/src/nouveau/nvidia-headers/class_parser.py
index 132633a7695..4a3510bb745 100644
--- a/src/nouveau/nvidia-headers/class_parser.py
+++ b/src/nouveau/nvidia-headers/class_parser.py
@@ -47,6 +47,7 @@ TEMPLATE_H = Template("""\
 #include "${clheader}"
 
 #include <assert.h>
+#include "util/u_math.h"
 
 %for mthd in mthddict:
 struct nv_${nvcl.lower()}_${mthd} {
@@ -190,7 +191,7 @@ P_DUMP_${nvcl}_MTHD_DATA(uint16_t idx, uint32_t data, const char *prefix)
         }
     %else:
       %if mthddict[mthd].is_float:
-        printf("%ff (0x%x)${bs}n", *(float *)&parsed, parsed);
+        printf("%ff (0x%x)${bs}n", uif(parsed), parsed);
       %else:
         printf("(0x%x)${bs}n", parsed);
       %endif
diff --git a/src/nouveau/nvidia-headers/meson.build b/src/nouveau/nvidia-headers/meson.build
index efbb5cff1f0..5b8735472de 100644
--- a/src/nouveau/nvidia-headers/meson.build
+++ b/src/nouveau/nvidia-headers/meson.build
@@ -35,7 +35,7 @@ endforeach
 _libnvidia_headers = static_library(
   'nvidia_headers',
   cl_generated,
-  include_directories : ['.', 'classes'],
+  include_directories : ['.', 'classes', inc_include, inc_src],
   c_args : [no_override_init_args],
   gnu_symbol_visibility : 'hidden',
 )