[Mesa-dev] [PATCH 1/3] mesa: move _mesa_exec_malloc/free() prototypes to their own header

[Roland Scheidegger]

Am 09.10.2017 um 22:56 schrieb Brian Paul:
> Try to start removing things from the cluttered imports.h file.
> ---
>  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 +
>  5 files changed, 40 insertions(+), 7 deletions(-)
>  create mode 100644 src/mesa/main/execmem.h
> 
> diff --git a/src/mesa/main/execmem.c b/src/mesa/main/execmem.c
> index 3a13385..21c5de7 100644
> --- a/src/mesa/main/execmem.c
> +++ b/src/mesa/main/execmem.c
> @@ -33,6 +33,7 @@
>  
>  #include <stdio.h>
>  #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 0000000..bc51a8c
> --- /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.
Should probably update the year here, but either way

Reviewed-by: Roland Scheidegger <sroland at vmware.com>

> + *
> + * 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 ef7c378..a4964a3 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 c3294b0..76ff977 100644
> --- a/src/mesa/tnl/t_vertex.c
> +++ b/src/mesa/tnl/t_vertex.c
> @@ -28,6 +28,7 @@
>  #include <stdio.h>
>  #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 c9f52a4..ddb2ec3 100644
> --- a/src/mesa/x86/rtasm/x86sse.c
> +++ b/src/mesa/x86/rtasm/x86sse.c
> @@ -4,6 +4,7 @@
>  #include <stdio.h>
>  
>  #include "main/imports.h"
> +#include "main/execmem.h"
>  #include "x86sse.h"
>  
>  #define DISASSEM 0
>