Can no longer build godot and godot-nir-static from source together

[TCROC]

Tested versions

• introduced by pr: SCons: Add CPPEXTPATH for external includes #104893

System information

PopOS 22.04

Issue description

We use both godot and godot-nir-static repos as submodules within our project. After updating to godot 4.5 to see if it fixes some other bugs for us, we noticed that we can no longer compile godot against our godot-nir-static submodule. After bisecting, I narrowed down exactly which file is the culprit: https://github.com/godotengine/godot/pull/104893/files#diff-bb9fd10753b454a0f1381aa36772df32332f7279095791eede1928a4b29db9ed

Changing CPPEXTPATH back to CPPPATH path in this SCsub fixes it.

Steps to reproduce

Build godot and godot-nir-static from source. godot-nir-static can be found here: https://github.com/godotengine/godot-nir-static.

See that it errors with:

In file included from drivers/d3d12/rendering_device_driver_d3d12.cpp:42:
In file included from /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/compiler/spirv/nir_spirv.h:28:
In file included from /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/compiler/nir/nir.h:44:
In file included from /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/compiler/nir_types.h:36:
In file included from /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/compiler/glsl_types.h:42:
In file included from /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/util/glheader.h:72:
/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include/GLES3/gl3.h:383:15: error: expected ')'
  383 | typedef void (GL_APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
      |               ^
/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include/GLES3/gl3.h:40:33: note: expanded from macro 'GL_APIENTRYP'
Y* 40 | #define GL_APIENTRYP GL_APIENTRnode_dock.cpp
      |                                 ^
/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include/GLES3/gl3.h:383:14: note: to match this '('
  383 | typedef void (GL_APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
      |              ^
/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include/GLES3/gl3.h:384:15: error: expected ')'
  384 | typedef void (GL_APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
      |               ^
/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include/GLES3/gl3.h:40:33: note: expanded from macro 'GL_APIENTRYP'
   40 | #define GL_APIENTRYP GL_APIENTRY*
      |                                 ^
/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include/GLES3/gl3.h:384:14: note: to match this '('
  384 | typedef void (GL_APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
      |              ^
/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include/GLES3/gl3.h:384:15: error: typedef redefinition with different types ('void (GLuint, GLuint)' (aka 'void (unsigned int, unsigned int)') vs 'void (GLenum)' (aka 'void (unsigned int)'))
  384 | typedef void (GL_APIENTRYP PFNGLATTACHSHADERPROC) (GLuint program, GLuint shader);
      |               ^
/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include/GLES3/gl3.h:40:22: note: expanded from macro 'GL_APIENTRYP'
   40 | #define GL_APIENTRYP GL_APIENTRY*
      |                      ^
/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/util/glheader.h:59:21: note: expanded from macro 'GL_APIENTRY'
   59 | #define GL_APIENTRY GLAPIENTRY
      |                     ^
/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include/GLES3/gl3.h:383:15: note: previous definition is here
  383 | typedef void (GL_APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
      |               ^
/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include/GLES3/gl3.h:40:22: note: expanded from macro 'GL_APIENTRYP'
   40 | #define GL_APIENTRYP GL_APIENTRY*
      |                      ^
/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/util/glheader.h:59:21: note: expanded from macro 'GL_APIENTRY'
   59 | #define GL_APIENTRY GLAPIENTRY
      |                     ^

Then change CPPEXTPATH to CPPPATH and see that it compiles successfully.

Minimal reproduction project (MRP)

NA

[TCROC]

@Repiteo pinging since it appears it was you who put in the PR. Any ideas as to why this would be the case?

[akien-mga]

How do you build Godot and godot-nir-static exactly?

[TCROC]

I compile it in our fork with the following command:

scons module_mono_enabled=true precision=double compiledb=false use_llvm=true verbose=true -j 16 openxr=false use_mingw=true lto=thin extra_suffix=steam object_prefix=steam CC=/home/tcroc/dev/BlockyBallOT/submodules/godot-src/gitignore/wrapper-scripts/zig-cc.sh CXX=/home/tcroc/dev/BlockyBallOT/submodules/godot-src/gitignore/wrapper-scripts/zig-c++.sh LINK=/home/tcroc/dev/BlockyBallOT/submodules/godot-src/gitignore/wrapper-scripts/zig-c++.sh AS=/home/tcroc/dev/BlockyBallOT/submodules/godot-src/gitignore/wrapper-scripts/zig-c++.sh AR=/home/tcroc/dev/BlockyBallOT/submodules/godot-src/gitignore/wrapper-scripts/zig-ar.sh RANLIB=/home/tcroc/dev/BlockyBallOT/submodules/godot-src/gitignore/wrapper-scripts/zig-ranlib.sh RC=/home/tcroc/dev/BlockyBallOT/submodules/godot-src/gitignore/wrapper-scripts/zig-rc.sh d3d12=yes vulkan=no dxc_path=/home/tcroc/dev/BlockyBallOT/submodules/godot-src/gitignore/dxc/v1.8.2403.1/dxc mesa_libs=/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static platform_tools=false use_static_cpp=false use_windres=false validate_target_platform=false manual_build_res_file=true platform=windows debug_symbols=false import_env_vars=ZIG_GLOBAL_CACHE_DIR,ZIG_LOCAL_CACHE_DIR custom_modules=/home/tcroc/dev/BlockyBallOT/submodules/godotsteam

The important part of this command being:

mesa_libs=/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static

We have a few modifications in our fork that allows us more granular control over the compiler toolchain used. Here's the PRs for reference:

#101046
#101045
#101043
#101042
#100982

and this additional pr on our godot-nir-static fork:

godotengine/godot-nir-static#21

They are all very simple PRs. I just listed them out for the sake of clarity. I do not expect they have any impact on this error. But please correct me if I'm wrong.

The godot-nir-static repo is built from source as a submodule within our project. The directory structure after building looks like:

And the command we use to build it is:

scons platform=windows arch=x86_64 use_llvm=true platform_tools=false import_env_vars=ZIG_GLOBAL_CACHE_DIR,ZIG_LOCAL_CACHE_DIR use_mingw=true -j 16 CC=/home/tcroc/dev/BlockyBallOT/submodules/godot-src/gitignore/wrapper-scripts/zig-cc.sh CXX=/home/tcroc/dev/BlockyBallOT/submodules/godot-src/gitignore/wrapper-scripts/zig-c++.sh LINK=/home/tcroc/dev/BlockyBallOT/submodules/godot-src/gitignore/wrapper-scripts/zig-c++.sh AS=/home/tcroc/dev/BlockyBallOT/submodules/godot-src/gitignore/wrapper-scripts/zig-c++.sh AR=/home/tcroc/dev/BlockyBallOT/submodules/godot-src/gitignore/wrapper-scripts/zig-ar.sh RANLIB=/home/tcroc/dev/BlockyBallOT/submodules/godot-src/gitignore/wrapper-scripts/zig-ranlib.sh RC=/home/tcroc/dev/BlockyBallOT/submodules/godot-src/gitignore/wrapper-scripts/zig-rc.sh

[akien-mga]

I tested with a local build of godot-nir-static (with the default toolchain configuration, on Linux with mingw-gcc) and I can't reproduce the issue.

I get a bunch of warnings which are also a consequence of #104893 (I'll look into fixing those), but no issues with lacking the GL_APIENTRYP definition.

-Wmaybe-unitialized warnings in D3D12MA

In function 'void D3D12MA::Free(const ALLOCATION_CALLBACKS&, void*)',
    inlined from 'void D3D12MA::D3D12MA_DELETE(const ALLOCATION_CALLBACKS&, T*) [with T = VirtualBlockPimpl]' at thirdparty/d3d12ma/D3D12MemAlloc.cpp:237,
    inlined from 'void D3D12MA::D3D12MA_DELETE(const ALLOCATION_CALLBACKS&, T*) [with T = VirtualBlockPimpl]' at thirdparty/d3d12ma/D3D12MemAlloc.cpp:232,
    inlined from 'virtual D3D12MA::VirtualBlock::~VirtualBlock()' at thirdparty/d3d12ma/D3D12MemAlloc.cpp:10558,
    inlined from 'void D3D12MA::D3D12MA_DELETE(const ALLOCATION_CALLBACKS&, T*) [with T = VirtualBlock]' at thirdparty/d3d12ma/D3D12MemAlloc.cpp:236,
    inlined from 'virtual void D3D12MA::VirtualBlock::ReleaseThis()' at thirdparty/d3d12ma/D3D12MemAlloc.cpp:10546:
thirdparty/d3d12ma/D3D12MemAlloc.cpp:214: warning: '*(const D3D12MA::ALLOCATION_CALLBACKS*)this_3(D)->m_Pimpl.D3D12MA::ALLOCATION_CALLBACKS::pFree' may be used uninitialized [-Wmaybe-uninitialized]
  214 |     (*allocs.pFree)(memory, allocs.pPrivateData);
thirdparty/d3d12ma/D3D12MemAlloc.cpp:214: warning: '*(const D3D12MA::ALLOCATION_CALLBACKS*)this_3(D)->m_Pimpl.D3D12MA::ALLOCATION_CALLBACKS::pPrivateData' may be used uninitialized [-Wmaybe-uninitialized]
In function 'void D3D12MA::Free(const ALLOCATION_CALLBACKS&, void*)',
    inlined from 'void D3D12MA::D3D12MA_DELETE(const ALLOCATION_CALLBACKS&, T*) [with T = VirtualBlockPimpl]' at thirdparty/d3d12ma/D3D12MemAlloc.cpp:237,
    inlined from 'void D3D12MA::D3D12MA_DELETE(const ALLOCATION_CALLBACKS&, T*) [with T = VirtualBlockPimpl]' at thirdparty/d3d12ma/D3D12MemAlloc.cpp:232,
    inlined from 'D3D12MA::VirtualBlock::~VirtualBlock()' at thirdparty/d3d12ma/D3D12MemAlloc.cpp:10558:
thirdparty/d3d12ma/D3D12MemAlloc.cpp:214: warning: '*(const D3D12MA::ALLOCATION_CALLBACKS*)this_4(D)->m_Pimpl.D3D12MA::ALLOCATION_CALLBACKS::pFree' may be used uninitialized [-Wmaybe-uninitialized]
  214 |     (*allocs.pFree)(memory, allocs.pPrivateData);
thirdparty/d3d12ma/D3D12MemAlloc.cpp:214: warning: '*(const D3D12MA::ALLOCATION_CALLBACKS*)this_4(D)->m_Pimpl.D3D12MA::ALLOCATION_CALLBACKS::pPrivateData' may be used uninitialized [-Wmaybe-uninitialized]
In function 'void D3D12MA::Free(const ALLOCATION_CALLBACKS&, void*)',
    inlined from 'void D3D12MA::D3D12MA_DELETE(const ALLOCATION_CALLBACKS&, T*) [with T = VirtualBlockPimpl]' at thirdparty/d3d12ma/D3D12MemAlloc.cpp:237,
    inlined from 'void D3D12MA::D3D12MA_DELETE(const ALLOCATION_CALLBACKS&, T*) [with T = VirtualBlockPimpl]' at thirdparty/d3d12ma/D3D12MemAlloc.cpp:232,
    inlined from 'virtual D3D12MA::VirtualBlock::~VirtualBlock()' at thirdparty/d3d12ma/D3D12MemAlloc.cpp:10558,
    inlined from 'virtual D3D12MA::VirtualBlock::~VirtualBlock()' at thirdparty/d3d12ma/D3D12MemAlloc.cpp:10559:
thirdparty/d3d12ma/D3D12MemAlloc.cpp:214: warning: '*(const D3D12MA::ALLOCATION_CALLBACKS*)this_2(D)->m_Pimpl.D3D12MA::ALLOCATION_CALLBACKS::pFree' may be used uninitialized [-Wmaybe-uninitialized]
  214 |     (*allocs.pFree)(memory, allocs.pPrivateData);
thirdparty/d3d12ma/D3D12MemAlloc.cpp:214: warning: '*(const D3D12MA::ALLOCATION_CALLBACKS*)this_2(D)->m_Pimpl.D3D12MA::ALLOCATION_CALLBACKS::pPrivateData' may be used uninitialized [-Wmaybe-uninitialized]

Edit: Warnings silenced in #106398.

Can you share what's the verbose command line used to compile drivers/d3d12/rendering_device_driver_d3d12.cpp?

[TCROC]

Here is the command that is generated with CPPEXTPATH which doesn't work: ❌

/home/tcroc/dev/BlockyBallOT/submodules/godot-src/gitignore/wrapper-scripts/zig-c++.sh -o bin/obj/drivers/d3d12/steamrendering_device_driver_d3d12.windows.editor.double.x86_64.llvm.steam.o -c -std=gnu++17 -fno-exceptions -ffp-contract=off -flto=thin -O2 -Wall -DTOOLS_ENABLED -DDEBUG_ENABLED -DNDEBUG -DENGINE_UPDATE_CHECK_ENABLED -DNO_EDITOR_SPLASH -DREAL_T_IS_DOUBLE -DWINDOWS_ENABLED -DWASAPI_ENABLED -DWINMIDI_ENABLED -DWINVER=0x0602 -D_WIN32_WINNT=0x0602 -DACCESSKIT_DYNAMIC -DACCESSKIT_ENABLED -DD3D12_ENABLED -DRD_ENABLED -DGLES3_ENABLED -DMINGW_ENABLED -DMINGW_HAS_SECURE_API=1 -DMINIZIP_ENABLED -DBROTLI_ENABLED -DTHREADS_ENABLED -DCLIPPER2_ENABLED -DZSTD_STATIC_LINKING_ONLY -DWINDOWS_NO_FUTEX -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DPACKAGE_VERSION=\"23.1.9\" -DPACKAGE_BUGREPORT=\"https://gitlab.freedesktop.org/mesa/mesa/-/issues\" -DPIPE_SUBSYSTEM_WINDOWS_USER -D_Static_assert=static_assert -DHAVE_STRUCT_TIMESPEC -Ithirdparty/accesskit/include -Iplatform/windows -I. -I/home/tcroc/dev/BlockyBallOT/submodules/godotsteam -I/home/tcroc/dev/BlockyBallOT/submodules -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/bin -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include/GL -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include/GLES -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include/GLES2 -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include/GLES3 -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include/KHR -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/c11/impl -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/compiler -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/compiler/glsl -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/compiler/nir -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/compiler/nir/__pycache__ -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/compiler/spirv -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/gallium -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/gallium/include -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/gallium/include/pipe -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/mesa -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/mesa/main -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/mesa/program -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/microsoft -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/microsoft/compiler -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/microsoft/spirv_to_dxil -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/util -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/util/format -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/util/format/__pycache__ -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/util/sha1 -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/vulkan -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/vulkan/runtime -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/vulkan/util -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/generated/src -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/generated/src/compiler -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/generated/src/compiler/nir -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/generated/src/compiler/nir -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/generated/src/compiler/nir -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/generated/src/compiler/nir -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/generated/src/compiler/spirv -isystem /home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/generated/src/util/format -isystem thirdparty/directx_headers/include/dxguids -isystem thirdparty/directx_headers/include/directx -isystem thirdparty/zstd -isystem thirdparty/zlib -isystem thirdparty/clipper2/include -isystem thirdparty/brotli/include -isystem thirdparty/angle/include -isystem thirdparty/d3d12ma drivers/d3d12/rendering_device_driver_d3d12.cpp

And this is the command generated with CPPPATH which works: ✅

/home/tcroc/dev/BlockyBallOT/submodules/godot-src/gitignore/wrapper-scripts/zig-c++.sh -o bin/obj/drivers/d3d12/steamrendering_device_driver_d3d12.windows.editor.double.x86_64.llvm.steam.o -c -std=gnu++17 -fno-exceptions -ffp-contract=off -flto=thin -O2 -Wall -DTOOLS_ENABLED -DDEBUG_ENABLED -DNDEBUG -DENGINE_UPDATE_CHECK_ENABLED -DNO_EDITOR_SPLASH -DREAL_T_IS_DOUBLE -DWINDOWS_ENABLED -DWASAPI_ENABLED -DWINMIDI_ENABLED -DWINVER=0x0602 -D_WIN32_WINNT=0x0602 -DACCESSKIT_DYNAMIC -DACCESSKIT_ENABLED -DD3D12_ENABLED -DRD_ENABLED -DGLES3_ENABLED -DMINGW_ENABLED -DMINGW_HAS_SECURE_API=1 -DMINIZIP_ENABLED -DBROTLI_ENABLED -DTHREADS_ENABLED -DCLIPPER2_ENABLED -DZSTD_STATIC_LINKING_ONLY -DWINDOWS_NO_FUTEX -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DPACKAGE_VERSION=\"23.1.9\" -DPACKAGE_BUGREPORT=\"https://gitlab.freedesktop.org/mesa/mesa/-/issues\" -DPIPE_SUBSYSTEM_WINDOWS_USER -D_Static_assert=static_assert -DHAVE_STRUCT_TIMESPEC -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/bin -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include/GL -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include/GLES -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include/GLES2 -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include/GLES3 -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/include/KHR -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/c11/impl -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/compiler -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/compiler/glsl -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/compiler/nir -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/compiler/nir/__pycache__ -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/compiler/spirv -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/gallium -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/gallium/include -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/gallium/include/pipe -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/mesa -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/mesa/main -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/mesa/program -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/microsoft -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/microsoft/compiler -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/microsoft/spirv_to_dxil -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/util -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/util/format -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/util/format/__pycache__ -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/util/sha1 -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/vulkan -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/vulkan/runtime -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/src/vulkan/util -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/generated/src -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/generated/src/compiler -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/generated/src/compiler/nir -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/generated/src/compiler/nir -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/generated/src/compiler/nir -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/generated/src/compiler/nir -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/generated/src/compiler/spirv -I/home/tcroc/dev/BlockyBallOT/submodules/godot-nir-static/godot-mesa/generated/src/util/format -Ithirdparty/accesskit/include -Iplatform/windows -I. -I/home/tcroc/dev/BlockyBallOT/submodules/godotsteam -I/home/tcroc/dev/BlockyBallOT/submodules -isystem thirdparty/directx_headers/include/dxguids -isystem thirdparty/directx_headers/include/directx -isystem thirdparty/zstd -isystem thirdparty/zlib -isystem thirdparty/clipper2/include -isystem thirdparty/brotli/include -isystem thirdparty/angle/include -isystem thirdparty/d3d12ma drivers/d3d12/rendering_device_driver_d3d12.cpp

The difference is it appears that the one that doesn't work uses -isystem and the one that works uses -I when supplying the includes:

[akien-mga]

So the issue is probably an include order bug which already existed, but worked by chance before.

-isystem differs from -I in that those paths will be included after regular -I include paths. So there might now be another header that takes precedence (or no longer does) and defines something that conflicts with OpenGL's definitions for GL_APIENTRY. Most likely culprit is our beloved windows.h...

That's paired with the very hacky buildsystem we have for Mesa NIR, which globs everything, from its own admission:

# We have to blacklist some because we are bindly adding every Mesa directory
# to the include path and in some cases that causes the wrong header to be included.

I can't reproduce the error myself so I'm not sure how to debug further, but the whole setup is very brittle. We can revert that one to CPPPATH but it's bound to break again when a cosmic ray looks at our Python logic sideways.