aco: set constant_data_offset correctly in the case of merged shaders

[mesa.git] / src / mesa / main / format_utils.h

diff --git a/src/mesa/main/format_utils.h b/src/mesa/main/format_utils.h
index 78365cab5332c8ffae68325117499c69ae6e703f..9b6d1c39be746de981951da072a85edefd11f211 100644 (file)
--- a/src/mesa/main/format_utils.h
+++ b/src/mesa/main/format_utils.h
@@ -32,7 +32,7 @@
 #define FORMAT_UTILS_H
 
 #include "formats.h"
-#include "imports.h"
+
 #include "macros.h"
 #include "util/rounding.h"
 #include "util/half_float.h"
@@ -87,7 +87,7 @@ _mesa_float_to_unorm(float x, unsigned dst_bits)
    else if (x > 1.0f)
       return MAX_UINT(dst_bits);
    else
-      return _mesa_lroundevenf(x * MAX_UINT(dst_bits));
+      return _mesa_i64roundevenf(x * MAX_UINT(dst_bits));
 }
 
 static inline unsigned