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 <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/34002>

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
 

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 <GL/mesa_glinterop.h>
 

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"

src/gallium/frontends/glx/xlib/glx_usefont.c

@@ -34,7 +34,7 @@
 #include <stdio.h>
 #include <GL/glx.h>
 #include "main/errors.h"
-#include "main/dispatch.h"
+#include "dispatch.h"
 #include "mapi/glapi/glapi.h"
 
 

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

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;

src/glx/single2.c

@@ -16,7 +16,7 @@
 #include <xcb/xcb.h>
 #include <xcb/glx.h>
 #include <X11/Xlib-xcb.h>
-#include "mesa/main/dispatch.h"
+#include "dispatch.h"
 
 #if !defined(__GNUC__)
 #  define __builtin_expect(x, y) x

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

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

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'],

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"
 

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"
 

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"

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"
 
 

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

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

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,

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
 {

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

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

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(

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"
 

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"

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"

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"
 

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"

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"

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"