docs,ci: update mapi relocation

Acked-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36562>

.gitlab-ci/test-source-dep.yml

@@ -163,8 +163,8 @@
         - src/gbm/**/*
         - src/glx/**/*
         - src/loader/**/*
-        - src/mapi/**/*
         - src/mesa/*
+        - src/mesa/glapi/**/*
         - src/mesa/main/**/*
         - src/mesa/math/**/*
         - src/mesa/program/**/*

bin/khronos-update.py

@@ -115,7 +115,7 @@ SOURCES = [
         'api': 'gl',
         'inc_folder': 'GL',
         'sources': [
-            Source('src/mapi/glapi/registry/gl.xml', 'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/xml/gl.xml'),
+            Source('src/mesa/glapi/glapi/registry/gl.xml', 'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/xml/gl.xml'),
             Source('include/GL/glcorearb.h',         'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/api/GL/glcorearb.h'),
             Source('include/GL/glext.h',             'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/api/GL/glext.h'),
             Source('include/GL/glxext.h',            'https://github.com/KhronosGroup/OpenGL-Registry/raw/main/api/GL/glxext.h'),

docs/devinfo.rst

@@ -19,7 +19,7 @@ To add a new GL extension to Mesa you have to do at least the following.
            #endif
          
 
--  In the ``src/mapi/glapi/gen/`` directory, add the new extension
+-  In the ``src/mesa/glapi/glapi/gen/`` directory, add the new extension
    functions and enums to the ``gl_API.xml`` file. Then, a bunch of
    source files must be regenerated by executing the corresponding
    Python scripts.

docs/sourcetree.rst

@@ -46,15 +46,12 @@ each directory.
       -  **vulkan** - Anvil is a Vulkan implementation for Intel gen 7
          (Ivy Bridge) and newer
 
-   -  **mapi** - Mesa APIs
+   -  **mesa** - Main Mesa sources
 
       -  **glapi** - OpenGL API dispatch layer. This is where all the GL
          entrypoints like glClear, glBegin, etc. are generated, as well as
          the GL dispatch table. All GL function calls jump through the
          dispatch table to functions found in main/.
-
-   -  **mesa** - Main Mesa sources
-
       -  **main** - The core Mesa code (mainly state management)
       -  **math** - vertex array translation and transformation code
          (not used with Gallium)