Move compiler.h and imports.h/c from src/mesa/main into src/util

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

diff --git a/src/mesa/drivers/dri/i965/intel_upload.c b/src/mesa/drivers/dri/i965/intel_upload.c
index f165a7b4322469872a0bb7219d0b69a8e0da888a..595e330f3b6e589152549866aa5d78c2a9f415af 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_upload.c
+++ b/src/mesa/drivers/dri/i965/intel_upload.c
@@ -28,7 +28,7 @@
  * Batched upload via BOs.
  */
 
-#include "main/imports.h"
+#include "util/imports.h"
 #include "main/macros.h"
 #include "brw_bufmgr.h"
 #include "brw_context.h"
@@ -86,7 +86,8 @@ brw_upload_space(struct brw_uploader *upload,
    assert((upload->bo == NULL) == (upload->map == NULL));
    if (!upload->bo) {
       upload->bo = brw_bo_alloc(upload->bufmgr, "streamed data",
-                                MAX2(upload->default_size, size));
+                                MAX2(upload->default_size, size),
+                                BRW_MEMZONE_OTHER);
       upload->map = brw_bo_map(NULL, upload->bo,
                                MAP_READ | MAP_WRITE |
                                MAP_PERSISTENT | MAP_ASYNC);