intel: Use specified alignment for writes into the upload buffer

[mesa.git] / src / mesa / drivers / dri / i965 / brw_util.c

diff --git a/src/mesa/drivers/dri/i965/brw_util.c b/src/mesa/drivers/dri/i965/brw_util.c
index ce21aa48695c47f428a99af2d333bd57cfa1fd93..e878da3850dba165d97080fe2529fb5794e2569b 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_util.c
+++ b/src/mesa/drivers/dri/i965/brw_util.c
@@ -30,12 +30,14 @@
   */
          
 
+#include <assert.h>
+
 #include "main/mtypes.h"
-#include "shader/prog_parameter.h"
+#include "program/prog_parameter.h"
 #include "brw_util.h"
 #include "brw_defines.h"
 
-GLuint brw_count_bits( GLuint val )
+GLuint brw_count_bits(uint64_t val)
 {
    GLuint i;
    for (i = 0; val ; val >>= 1)