v3d/compiler: fix image size for 1D arrays

[mesa.git] / src / broadcom / cle / v3d_packet_helpers.h

diff --git a/src/broadcom/cle/v3d_packet_helpers.h b/src/broadcom/cle/v3d_packet_helpers.h
index f340b790697e7f22838e8bf58f2118eb969172c5..53a5215fb9a2410dd478590081964a2b6f6301c2 100644 (file)
--- a/src/broadcom/cle/v3d_packet_helpers.h
+++ b/src/broadcom/cle/v3d_packet_helpers.h
@@ -21,12 +21,15 @@
  * IN THE SOFTWARE.
  */
 
+#ifndef MESA_V3D_PACKET_HELPERS_H
+#define MESA_V3D_PACKET_HELPERS_H
+
 #include <stdio.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <assert.h>
 #include <math.h>
-#include <gallium/auxiliary/util/u_math.h>
+#include "util/u_math.h"
 
 #ifdef HAVE_VALGRIND
 #include <valgrind.h>
@@ -36,7 +39,7 @@
 #define __gen_validate_value(x) VALGRIND_CHECK_MEM_IS_DEFINED(&(x), sizeof(x))
 #endif
 #else
-#define VG(x)
+#define VG(x) ((void)0)
 #endif
 
 #ifndef __gen_validate_value
@@ -214,3 +217,4 @@ __gen_unpack_f187(const uint8_t *restrict cl, uint32_t start, uint32_t end)
    return uif(bits << 16);
 }
 
+#endif