From 5603d3e42ce67cb20fe34806564452fababfcb37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 29 Nov 2021 16:16:51 -0500 Subject: [PATCH] mesa: remove api_exec.h and move its contents into context.h Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/mapi/glapi/gen/api_exec_init.py | 2 +- src/mapi/glapi/gen/gl_marshal.py | 2 +- src/mesa/main/api_exec.h | 52 ----------------------------- src/mesa/main/context.c | 1 - src/mesa/main/context.h | 12 +++++++ src/mesa/main/es1_conversion.c | 2 +- src/mesa/meson.build | 1 - src/mesa/state_tracker/st_context.c | 1 - 8 files changed, 15 insertions(+), 58 deletions(-) delete mode 100644 src/mesa/main/api_exec.h diff --git a/src/mapi/glapi/gen/api_exec_init.py b/src/mapi/glapi/gen/api_exec_init.py index c27ebcd523e..e736dc741df 100644 --- a/src/mapi/glapi/gen/api_exec_init.py +++ b/src/mapi/glapi/gen/api_exec_init.py @@ -47,7 +47,7 @@ header = """/** #include "main/accum.h" -#include "main/api_exec.h" +#include "main/context.h" #include "main/arbprogram.h" #include "main/atifragshader.h" #include "main/attrib.h" diff --git a/src/mapi/glapi/gen/gl_marshal.py b/src/mapi/glapi/gen/gl_marshal.py index 72f62a61df6..8705b4ea2bb 100644 --- a/src/mapi/glapi/gen/gl_marshal.py +++ b/src/mapi/glapi/gen/gl_marshal.py @@ -28,7 +28,7 @@ import marshal_XML import sys header = """ -#include "api_exec.h" +#include "context.h" #include "glthread_marshal.h" #include "bufferobj.h" #include "dispatch.h" diff --git a/src/mesa/main/api_exec.h b/src/mesa/main/api_exec.h deleted file mode 100644 index f55f56bda4a..00000000000 --- a/src/mesa/main/api_exec.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Mesa 3-D graphics library - * - * Copyright (C) 1999-2008 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 API_EXEC_H -#define API_EXEC_H - -#ifdef __cplusplus -extern "C" { -#endif - -struct _glapi_table; -struct gl_context; - -extern struct _glapi_table * -_mesa_alloc_dispatch_table(void); - -extern void -_mesa_initialize_exec_table(struct gl_context *ctx); - -extern void -_mesa_initialize_dispatch_tables(struct gl_context *ctx); - -extern struct _glapi_table * -_mesa_new_nop_table(unsigned numEntries); - -#ifdef __cplusplus -} // extern "C" -#endif - -#endif diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 40472f3f851..1058fb7ae72 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -79,7 +79,6 @@ #include "glheader.h" #include "accum.h" -#include "api_exec.h" #include "arrayobj.h" #include "attrib.h" #include "bbox.h" diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h index 2b8799fd9c5..0933427f05b 100644 --- a/src/mesa/main/context.h +++ b/src/mesa/main/context.h @@ -99,6 +99,18 @@ _mesa_initialize_context( struct gl_context *ctx, struct gl_context *share_list, const struct dd_function_table *driverFunctions); +extern struct _glapi_table * +_mesa_alloc_dispatch_table(void); + +extern void +_mesa_initialize_exec_table(struct gl_context *ctx); + +extern void +_mesa_initialize_dispatch_tables(struct gl_context *ctx); + +extern struct _glapi_table * +_mesa_new_nop_table(unsigned numEntries); + extern void _mesa_free_context_data(struct gl_context *ctx, bool destroy_debug_output); diff --git a/src/mesa/main/es1_conversion.c b/src/mesa/main/es1_conversion.c index b8f26e08c88..5acbed10347 100644 --- a/src/mesa/main/es1_conversion.c +++ b/src/mesa/main/es1_conversion.c @@ -1,7 +1,7 @@ #include -#include "api_exec.h" +#include "context.h" #include "blend.h" #include "clear.h" #include "clip.h" diff --git a/src/mesa/meson.build b/src/mesa/meson.build index 1dfcec30de1..06f32cedd65 100644 --- a/src/mesa/meson.build +++ b/src/mesa/meson.build @@ -27,7 +27,6 @@ files_libmesa = files( 'main/accum.h', 'main/api_arrayelt.c', 'main/api_arrayelt.h', - 'main/api_exec.h', 'main/arbprogram.c', 'main/arbprogram.h', 'main/arrayobj.c', diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index 13df12f313e..cb173507acf 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -27,7 +27,6 @@ #include "main/accum.h" -#include "main/api_exec.h" #include "main/context.h" #include "main/debug_output.h" #include "main/glthread.h"