From d00d26014584560d35d71a89d52a873ce126c1a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 4 Aug 2025 15:44:24 -0400 Subject: [PATCH] docs,ci: update mapi relocation Acked-by: Alyssa Rosenzweig Part-of: --- .gitlab-ci/test-source-dep.yml | 2 +- bin/khronos-update.py | 2 +- docs/devinfo.rst | 2 +- docs/sourcetree.rst | 5 +---- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index ea1392bd763..8a430433ed5 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.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/**/* diff --git a/bin/khronos-update.py b/bin/khronos-update.py index fe29921ad4a..445595d6400 100755 --- a/bin/khronos-update.py +++ b/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'), diff --git a/docs/devinfo.rst b/docs/devinfo.rst index 6a1eb35801a..34921c10ca4 100644 --- a/docs/devinfo.rst +++ b/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. diff --git a/docs/sourcetree.rst b/docs/sourcetree.rst index 58399f1757f..d395e700d86 100644 --- a/docs/sourcetree.rst +++ b/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)