From 3c5664b78d39e2d13f156369f8114ebbe08d6fb7 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 5 Oct 2017 13:30:32 -0600 Subject: [PATCH] mesa: move _mesa_exec_malloc/free() prototypes to their own header Try to start removing things from the cluttered imports.h file. v2: add new header to Makefile.sources Reviewed-by: Roland Scheidegger --- src/mesa/Makefile.sources | 1 + src/mesa/main/execmem.c | 1 + src/mesa/main/execmem.h | 37 +++++++++++++++++++++++++++++++++++++ src/mesa/main/imports.h | 7 ------- src/mesa/tnl/t_vertex.c | 1 + src/mesa/x86/rtasm/x86sse.c | 1 + 6 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 src/mesa/main/execmem.h diff --git a/src/mesa/Makefile.sources b/src/mesa/Makefile.sources index 7122304dd40..babdc2c41ff 100644 --- a/src/mesa/Makefile.sources +++ b/src/mesa/Makefile.sources @@ -80,6 +80,7 @@ MAIN_FILES = \ main/eval.c \ main/eval.h \ main/execmem.c \ + main/execmem.h \ main/extensions.c \ main/extensions.h \ main/extensions_table.c \ diff --git a/src/mesa/main/execmem.c b/src/mesa/main/execmem.c index 3a1338515fe..21c5de7ad9d 100644 --- a/src/mesa/main/execmem.c +++ b/src/mesa/main/execmem.c @@ -33,6 +33,7 @@ #include #include "imports.h" +#include "execmem.h" diff --git a/src/mesa/main/execmem.h b/src/mesa/main/execmem.h new file mode 100644 index 00000000000..bc51a8c8411 --- /dev/null +++ b/src/mesa/main/execmem.h @@ -0,0 +1,37 @@ +/* + * Mesa 3-D graphics library + * + * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + + +#ifndef EXECMEM_H +#define EXECMEM_H + + +extern void * +_mesa_exec_malloc(GLuint size); + +extern void +_mesa_exec_free(void *addr); + + +#endif /* EXECMEM_H */ diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h index ef7c378931e..a4964a34cca 100644 --- a/src/mesa/main/imports.h +++ b/src/mesa/main/imports.h @@ -318,13 +318,6 @@ extern void * _mesa_align_realloc(void *oldBuffer, size_t oldSize, size_t newSize, unsigned long alignment); -extern void * -_mesa_exec_malloc( GLuint size ); - -extern void -_mesa_exec_free( void *addr ); - - #ifdef HAVE___BUILTIN_POPCOUNT #define _mesa_bitcount(i) __builtin_popcount(i) #else diff --git a/src/mesa/tnl/t_vertex.c b/src/mesa/tnl/t_vertex.c index c3294b007b0..76ff97720ca 100644 --- a/src/mesa/tnl/t_vertex.c +++ b/src/mesa/tnl/t_vertex.c @@ -28,6 +28,7 @@ #include #include "main/glheader.h" #include "main/context.h" +#include "main/execmem.h" #include "swrast/s_chan.h" #include "t_context.h" #include "t_vertex.h" diff --git a/src/mesa/x86/rtasm/x86sse.c b/src/mesa/x86/rtasm/x86sse.c index c9f52a44dfb..ddb2ec37380 100644 --- a/src/mesa/x86/rtasm/x86sse.c +++ b/src/mesa/x86/rtasm/x86sse.c @@ -4,6 +4,7 @@ #include #include "main/imports.h" +#include "main/execmem.h" #include "x86sse.h" #define DISASSEM 0 -- 2.30.2