From 574c1a70d65e4af54bd79dc8414192e4d32eafb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 10 Mar 2025 23:17:28 -0400 Subject: [PATCH] mesa: move dispatch.h and marshal_generated.h generation to glapi/gen This is where most files are generated. It's a prerequisite for a future change. Reviewed-by: Adam Jackson Part-of: --- src/egl/drivers/dri2/egl_dri2.c | 2 +- src/egl/drivers/wgl/egl_wgl.c | 2 +- src/gallium/frontends/glx/xlib/glx_api.c | 2 +- src/gallium/frontends/glx/xlib/glx_usefont.c | 2 +- src/glx/dri2_glx.c | 2 +- src/glx/drisw_glx.c | 2 +- src/glx/single2.c | 2 +- src/glx/xfont.c | 2 +- src/mapi/glapi/gen/api_exec_init.py | 2 +- src/mapi/glapi/gen/meson.build | 20 ++++++++++++++++++++ src/mesa/main/api_arrayelt.c | 2 +- src/mesa/main/context.c | 2 +- src/mesa/main/dlist.c | 2 +- src/mesa/main/eval.c | 2 +- src/mesa/main/glthread_bufferobj.c | 2 +- src/mesa/main/glthread_draw.c | 2 +- src/mesa/main/glthread_get.c | 2 +- src/mesa/main/glthread_list.c | 2 +- src/mesa/main/glthread_pixels.c | 2 +- src/mesa/main/glthread_varray.c | 2 +- src/mesa/main/meson.build | 20 -------------------- src/mesa/main/robustness.c | 2 +- src/mesa/main/varray.c | 2 +- src/mesa/vbo/vbo_exec_api.c | 2 +- src/mesa/vbo/vbo_exec_eval.c | 2 +- src/mesa/vbo/vbo_noop.c | 2 +- src/mesa/vbo/vbo_save_api.c | 2 +- src/mesa/vbo/vbo_save_loopback.c | 2 +- 28 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 23823fc86d6..23da76c6230 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -75,7 +75,7 @@ #include "egl_dri2.h" #include "egldefines.h" #include "mapi/glapi/glapi.h" -#include "mesa/main/dispatch.h" +#include "dispatch.h" #define NUM_ATTRIBS 16 diff --git a/src/egl/drivers/wgl/egl_wgl.c b/src/egl/drivers/wgl/egl_wgl.c index a97abe156f9..7f6ab9e52bc 100644 --- a/src/egl/drivers/wgl/egl_wgl.c +++ b/src/egl/drivers/wgl/egl_wgl.c @@ -47,7 +47,7 @@ #include "util/u_call_once.h" #include "mapi/glapi/glapi.h" -#include "mesa/main/dispatch.h" +#include "dispatch.h" #include diff --git a/src/gallium/frontends/glx/xlib/glx_api.c b/src/gallium/frontends/glx/xlib/glx_api.c index 1985b896d85..bb661031913 100644 --- a/src/gallium/frontends/glx/xlib/glx_api.c +++ b/src/gallium/frontends/glx/xlib/glx_api.c @@ -41,7 +41,7 @@ #include "xm_api.h" #include "main/errors.h" #include "main/config.h" -#include "main/dispatch.h" +#include "dispatch.h" #include "mapi/glapi/glapi.h" #include "util/compiler.h" #include "util/u_math.h" diff --git a/src/gallium/frontends/glx/xlib/glx_usefont.c b/src/gallium/frontends/glx/xlib/glx_usefont.c index d73ae6fd71a..ddf9aeea43b 100644 --- a/src/gallium/frontends/glx/xlib/glx_usefont.c +++ b/src/gallium/frontends/glx/xlib/glx_usefont.c @@ -34,7 +34,7 @@ #include #include #include "main/errors.h" -#include "main/dispatch.h" +#include "dispatch.h" #include "mapi/glapi/glapi.h" diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index e8545edb976..487d9389e72 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -52,7 +52,7 @@ #include "loader_dri_helper.h" #include "dri_util.h" #include "mapi/glapi/glapi.h" -#include "mesa/main/dispatch.h" +#include "dispatch.h" #undef DRI2_MINOR #define DRI2_MINOR 1 diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c index d17314652df..debe9219730 100644 --- a/src/glx/drisw_glx.c +++ b/src/glx/drisw_glx.c @@ -44,7 +44,7 @@ #include "loader_dri_helper.h" #include "dri_util.h" #include "mapi/glapi/glapi.h" -#include "mesa/main/dispatch.h" +#include "dispatch.h" static int xshm_error = 0; static int xshm_opcode = -1; diff --git a/src/glx/single2.c b/src/glx/single2.c index 69cd3d159a0..4c504c27095 100644 --- a/src/glx/single2.c +++ b/src/glx/single2.c @@ -16,7 +16,7 @@ #include #include #include -#include "mesa/main/dispatch.h" +#include "dispatch.h" #if !defined(__GNUC__) # define __builtin_expect(x, y) x diff --git a/src/glx/xfont.c b/src/glx/xfont.c index f1ca7bba032..d503d409db7 100644 --- a/src/glx/xfont.c +++ b/src/glx/xfont.c @@ -37,7 +37,7 @@ #include "glxclient.h" #include "mapi/glapi/glapi.h" -#include "mesa/main/dispatch.h" +#include "dispatch.h" /* Implementation. */ diff --git a/src/mapi/glapi/gen/api_exec_init.py b/src/mapi/glapi/gen/api_exec_init.py index a5e9698443a..3372cf37eb0 100644 --- a/src/mapi/glapi/gen/api_exec_init.py +++ b/src/mapi/glapi/gen/api_exec_init.py @@ -49,7 +49,7 @@ header = r"""/** #include "api_exec_decl.h" #include "glapi/glapi.h" #include "main/context.h" -#include "main/dispatch.h" +#include "dispatch.h" /** diff --git a/src/mapi/glapi/gen/meson.build b/src/mapi/glapi/gen/meson.build index 74e9ed3f79b..d605bd70fad 100644 --- a/src/mapi/glapi/gen/meson.build +++ b/src/mapi/glapi/gen/meson.build @@ -81,6 +81,26 @@ main_api_hw_select_init_h = custom_target( capture : true, ) +main_dispatch_h = custom_target( + 'dispatch.h', + input : ['gl_table.py', 'gl_and_es_API.xml'], + output : 'dispatch.h', + command : [prog_python, '@INPUT0@', '-f', '@INPUT1@', '-m', 'dispatch'], + depend_files : glapi_xml_py_deps, + capture : true, +) + +idep_dispatch_h = declare_dependency(sources : [main_dispatch_h]) + +main_marshal_generated_h = custom_target( + 'marshal_generated.h', + input : ['marshal_generated_h.py', 'gl_and_es_API.xml'], + output : 'marshal_generated.h', + command : [prog_python, '@INPUT0@', '@INPUT1@', sizeof_pointer], + depend_files : glapi_xml_py_deps, + capture : true, +) + main_unmarshal_table_c = custom_target( 'unmarshal_table.c', input : ['unmarshal_table_c.py', 'gl_and_es_API.xml'], diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c index 805e13d0ecb..b5cfb94b0f4 100644 --- a/src/mesa/main/api_arrayelt.c +++ b/src/mesa/main/api_arrayelt.c @@ -42,7 +42,7 @@ #include "macros.h" #include "mtypes.h" -#include "main/dispatch.h" +#include "dispatch.h" #include "varray.h" #include "api_exec_decl.h" diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index b4cdda3f4f1..f329f4da4e7 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -138,7 +138,7 @@ #include "texturebindless.h" #include "program/program.h" #include "math/m_matrix.h" -#include "main/dispatch.h" /* for _gloffset_COUNT */ +#include "dispatch.h" /* for _gloffset_COUNT */ #include "macros.h" #include "git_sha1.h" diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index d120866171a..7169d725a24 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -45,7 +45,7 @@ #include "varray.h" #include "glthread_marshal.h" -#include "main/dispatch.h" +#include "dispatch.h" #include "vbo/vbo_save.h" #include "util/u_inlines.h" diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c index 320e35bd6e9..a37e10b024b 100644 --- a/src/mesa/main/eval.c +++ b/src/mesa/main/eval.c @@ -42,7 +42,7 @@ #include "eval.h" #include "macros.h" #include "mtypes.h" -#include "main/dispatch.h" +#include "dispatch.h" #include "api_exec_decl.h" diff --git a/src/mesa/main/glthread_bufferobj.c b/src/mesa/main/glthread_bufferobj.c index 499a480a339..cb5a0eef552 100644 --- a/src/mesa/main/glthread_bufferobj.c +++ b/src/mesa/main/glthread_bufferobj.c @@ -22,7 +22,7 @@ */ #include "main/glthread_marshal.h" -#include "main/dispatch.h" +#include "dispatch.h" #include "main/bufferobj.h" /** diff --git a/src/mesa/main/glthread_draw.c b/src/mesa/main/glthread_draw.c index dc8dd6ccb2c..95d7a6b3c9f 100644 --- a/src/mesa/main/glthread_draw.c +++ b/src/mesa/main/glthread_draw.c @@ -31,7 +31,7 @@ #include "api_exec_decl.h" #include "main/glthread_marshal.h" -#include "main/dispatch.h" +#include "dispatch.h" #include "main/varray.h" static inline unsigned diff --git a/src/mesa/main/glthread_get.c b/src/mesa/main/glthread_get.c index 51beaedc21a..fc14e3f4e14 100644 --- a/src/mesa/main/glthread_get.c +++ b/src/mesa/main/glthread_get.c @@ -22,7 +22,7 @@ */ #include "main/glthread_marshal.h" -#include "main/dispatch.h" +#include "dispatch.h" uint32_t _mesa_unmarshal_GetIntegerv(struct gl_context *ctx, diff --git a/src/mesa/main/glthread_list.c b/src/mesa/main/glthread_list.c index 46d8ee46079..ae369ad84c3 100644 --- a/src/mesa/main/glthread_list.c +++ b/src/mesa/main/glthread_list.c @@ -24,7 +24,7 @@ #include "c99_alloca.h" #include "main/glthread_marshal.h" -#include "main/dispatch.h" +#include "dispatch.h" struct marshal_cmd_CallList { diff --git a/src/mesa/main/glthread_pixels.c b/src/mesa/main/glthread_pixels.c index 5f4836b1cdb..a3eb956c97f 100644 --- a/src/mesa/main/glthread_pixels.c +++ b/src/mesa/main/glthread_pixels.c @@ -5,7 +5,7 @@ */ #include "main/glthread_marshal.h" -#include "main/dispatch.h" +#include "dispatch.h" #include "main/image.h" #define MAX_BITMAP_BYTE_SIZE 4096 diff --git a/src/mesa/main/glthread_varray.c b/src/mesa/main/glthread_varray.c index 61ccfd202b1..d747d6eaa6c 100644 --- a/src/mesa/main/glthread_varray.c +++ b/src/mesa/main/glthread_varray.c @@ -30,7 +30,7 @@ #include "main/glformats.h" #include "main/mtypes.h" #include "main/hash.h" -#include "main/dispatch.h" +#include "dispatch.h" #include "main/varray.h" static unsigned diff --git a/src/mesa/main/meson.build b/src/mesa/main/meson.build index fdddc4df3c4..1731c468857 100644 --- a/src/mesa/main/meson.build +++ b/src/mesa/main/meson.build @@ -1,26 +1,6 @@ # Copyright © 2017 Intel Corporation # SPDX-License-Identifier: MIT -main_dispatch_h = custom_target( - 'dispatch.h', - input : ['../../mapi/glapi/gen/gl_table.py', '../../mapi/glapi/gen/gl_and_es_API.xml'], - output : 'dispatch.h', - command : [prog_python, '@INPUT0@', '-f', '@INPUT1@', '-m', 'dispatch'], - depend_files : glapi_xml_py_deps, - capture : true, -) - -idep_dispatch_h = declare_dependency(sources : [main_dispatch_h]) - -main_marshal_generated_h = custom_target( - 'marshal_generated.h', - input : ['../../mapi/glapi/gen/marshal_generated_h.py', '../../mapi/glapi/gen/gl_and_es_API.xml'], - output : 'marshal_generated.h', - command : [prog_python, '@INPUT0@', '@INPUT1@', sizeof_pointer], - depend_files : glapi_xml_py_deps, - capture : true, -) - if _shader_replacement != '' # shader replacement shader_replacement_h = custom_target( diff --git a/src/mesa/main/robustness.c b/src/mesa/main/robustness.c index 5df4b5f298d..2b998448f53 100644 --- a/src/mesa/main/robustness.c +++ b/src/mesa/main/robustness.c @@ -27,7 +27,7 @@ #include "get.h" #include "mtypes.h" #include "macros.h" -#include "main/dispatch.h" /* for _gloffset_COUNT */ +#include "dispatch.h" /* for _gloffset_COUNT */ #include "api_exec_decl.h" #include "glthread_marshal.h" diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c index 8bf277937dc..d64c2610d81 100644 --- a/src/mesa/main/varray.c +++ b/src/mesa/main/varray.c @@ -41,7 +41,7 @@ #include "varray.h" #include "arrayobj.h" #include "get.h" -#include "main/dispatch.h" +#include "dispatch.h" #include "api_exec_decl.h" #include "state_tracker/st_atom.h" diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index 8141a666610..100d2f71d3e 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -40,7 +40,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/light.h" #include "main/api_arrayelt.h" #include "main/draw_validate.h" -#include "main/dispatch.h" +#include "dispatch.h" #include "util/bitscan.h" #include "util/u_memory.h" #include "api_exec_decl.h" diff --git a/src/mesa/vbo/vbo_exec_eval.c b/src/mesa/vbo/vbo_exec_eval.c index 076f0cb6e17..1bada200322 100644 --- a/src/mesa/vbo/vbo_exec_eval.c +++ b/src/mesa/vbo/vbo_exec_eval.c @@ -29,7 +29,7 @@ #include "main/context.h" #include "main/macros.h" #include "math/m_eval.h" -#include "main/dispatch.h" +#include "dispatch.h" #include "vbo_exec.h" #include "vbo_private.h" diff --git a/src/mesa/vbo/vbo_noop.c b/src/mesa/vbo/vbo_noop.c index 3637b649c4e..8d3cb4b3275 100644 --- a/src/mesa/vbo/vbo_noop.c +++ b/src/mesa/vbo/vbo_noop.c @@ -34,7 +34,7 @@ #include "util/glheader.h" #include "main/context.h" -#include "main/dispatch.h" +#include "dispatch.h" #include "main/dlist.h" #include "main/eval.h" #include "vbo_attrib.h" diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c index 583f79e09dd..525bd199bda 100644 --- a/src/mesa/vbo/vbo_save_api.c +++ b/src/mesa/vbo/vbo_save_api.c @@ -110,7 +110,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #include "main/macros.h" #include "main/draw_validate.h" #include "main/api_arrayelt.h" -#include "main/dispatch.h" +#include "dispatch.h" #include "main/state.h" #include "main/varray.h" #include "util/bitscan.h" diff --git a/src/mesa/vbo/vbo_save_loopback.c b/src/mesa/vbo/vbo_save_loopback.c index a2076c2ce80..db7312503ec 100644 --- a/src/mesa/vbo/vbo_save_loopback.c +++ b/src/mesa/vbo/vbo_save_loopback.c @@ -30,7 +30,7 @@ #include "util/glheader.h" #include "main/enums.h" #include "main/mesa_private.h" -#include "main/dispatch.h" +#include "dispatch.h" #include "glapi/glapi.h" #include "vbo_private.h"