From: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue, 3 Dec 2019 21:51:55 +0000 (-0800)
Subject: main: Change u_mmAllocMem align2 from bytes (old API) to bits (new API)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ef893db468c60e1ab57ba5fa1677b3d34f09833e;p=mesa.git

main: Change u_mmAllocMem align2 from bytes (old API) to bits (new API)

The main and Gallium implementations were recently merged, and the
align2 parameter in the Gallium one is in bits.  execmem.c expected
bytes still.  This led to every call here asserting.

Fixes: b6fd679a9e("mesa/main/util: moving gallium u_mm to util, remove main/mm")

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Tested-by: Clayton Craft <clayton.a.craft@intel.com>
---

diff --git a/src/mesa/main/execmem.c b/src/mesa/main/execmem.c
index 8c7325bebf3..35d4574ba2b 100644
--- a/src/mesa/main/execmem.c
+++ b/src/mesa/main/execmem.c
@@ -101,7 +101,7 @@ _mesa_exec_malloc(GLuint size)
 
    if (exec_heap) {
       size = (size + 31) & ~31;
-      block = u_mmAllocMem( exec_heap, size, 32, 0 );
+      block = u_mmAllocMem(exec_heap, size, 5, 0);
    }
 
    if (block)