projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '7.8'
[mesa.git]
/
src
/
mesa
/
main
/
execmem.c
diff --git
a/src/mesa/main/execmem.c
b/src/mesa/main/execmem.c
index 4c6139985fe5b4977dcbc240761856549a57eebc..ccd6ab43fc16e5420562d7ec69ee9ab7c632e592 100644
(file)
--- a/
src/mesa/main/execmem.c
+++ b/
src/mesa/main/execmem.c
@@
-106,7
+106,7
@@
_mesa_exec_malloc(GLuint size)
if (block)
addr = exec_mem + block->ofs;
else
if (block)
addr = exec_mem + block->ofs;
else
-
_mesa_
printf("_mesa_exec_malloc failed\n");
+ printf("_mesa_exec_malloc failed\n");
bail:
_glthread_UNLOCK_MUTEX(exec_mutex);
bail:
_glthread_UNLOCK_MUTEX(exec_mutex);
@@
-140,14
+140,14
@@
_mesa_exec_free(void *addr)
void *
_mesa_exec_malloc(GLuint size)
{
void *
_mesa_exec_malloc(GLuint size)
{
- return
_mesa_
malloc( size );
+ return malloc( size );
}
void
_mesa_exec_free(void *addr)
{
}
void
_mesa_exec_free(void *addr)
{
-
_mesa_
free(addr);
+ free(addr);
}
}