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 <sroland@vmware.com>
This commit is contained in:
Brian Paul 2017-10-05 13:30:32 -06:00
parent d670dd6b65
commit 3c5664b78d
6 changed files with 41 additions and 7 deletions

View file

@ -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 \

View file

@ -33,6 +33,7 @@
#include <stdio.h>
#include "imports.h"
#include "execmem.h"

37
src/mesa/main/execmem.h Normal file
View file

@ -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 */

View file

@ -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

View file

@ -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"

View file

@ -4,6 +4,7 @@
#include <stdio.h>
#include "main/imports.h"
#include "main/execmem.h"
#include "x86sse.h"
#define DISASSEM 0