macOS Apple Silicon port + Vulkan/MoltenVK backend opt-in (WIP)

Outer-repo half of the macOS arm64 + Vulkan port. The PsyCross submodule
holds the new Vulkan backend itself (separate PR on its own
`vulkan-port` branch); this commit tracks that submodule head and
provides the build-system, game-side and macOS-portability fixes the
backend needs to actually link and run.

State of the port: builds clean on macOS arm64 with both renderers; on
Apple Silicon the OpenGL path also works but exhibits geometry
flicker / dropped primitives because of the GL-on-Metal compatibility
layer's relaxed sync, which motivated the Vulkan port. Driver 2 menu /
HUD / 3D world geometry render under Vulkan; remaining gaps are blend
modes, stencil, scissor, and a few PSX scratch-render paths
(GR_StoreFrameBuffer).

Build system:
- src_rebuild/premake5.lua: --renderer={opengl|vulkan} option, macOS
  Homebrew prefix detection, Vulkan headers + loader + MoltenVK +
  shaderc (statically linked for GLSL→SPIR-V at runtime), framework
  links (Metal / QuartzCore / IOSurface), and exclusion of OpenGL
  sources when Vulkan is selected.
- src_rebuild/premake5_psycross.lua: same wiring on the static-lib
  side; `removefiles` switches PsyX_render.cpp ↔ PsyX_render_vk.cpp.
- src_rebuild/premake_modules/usage/usage.lua: tolerate the modern
  premake5 `uses` field already existing as a core API (older custom
  registration would error out on premake5 >= beta8).

Game-side fixes (LP64 / arm64):
- src_rebuild/Game/driver2.h: `trap()` macro now uses
  `__builtin_trap()` instead of the x86-only `__asm__("int3")`.
- src_rebuild/Game/psyx_compat.h: OTTYPE = OT_TAG also on
  __aarch64__/__arm64__/_M_ARM64. Without this the OT array allocates
  8-byte slots while ClearOTagR/addPrim/DrawOTag treat the array as
  12-byte OT_TAG — silent corruption of every OT linked-list pointer.
- src_rebuild/Game/dr2locale.{c,h}: malloc.h guard for macOS;
  GET_GAME_TXT/GET_MISSION_TXT cast pointers via u_intptr first to
  avoid clang's "cast from pointer to smaller type loses information"
  error.
- src_rebuild/Game/C/civ_ai.c, dr2roads.c, draw.c, event.c, glaunch.c,
  mission.c, targets.c: same intptr_t-routed casts where the engine
  packed small integers into pointer-sized fields.
- src_rebuild/utils/{fs.{cpp,h}, targa.cpp, audio_source/snd_wav_cache.cpp,
  video_source/VideoPlayer.cpp}, src_rebuild/tools/font_tool/font_tool_main.cpp:
  malloc.h guards (macOS uses stdlib.h), `__unix__` guards extended
  to include `__APPLE__`, GL-only paths in VideoPlayer guarded so
  the Vulkan build doesn't drag GL symbols.

Misc:
- BUILD_MACOS.md: build instructions (deps, premake invocation, both
  renderer options).
- data/config.ini: NTSC defaults sized for the new window.
- .gitignore: keep the user's CD-ROM images (Driver2CD1/2.bin) out of
  the repo.

Author: ebellumat

.gitignore

@@ -40,3 +40,15 @@ src_rebuild/obj/*
 src_rebuild/project_*
 src_rebuild/*.make
 src_rebuild/Makefile
+
+# Driver 2 game data (CD images + extracted FMV/XA — too large for git)
+data/install/*.bin
+data/install/*.cue
+data/DRIVER2/FMV/
+data/DRIVER2/XA/
+data/REDRIVER2.log
+
+# Build outputs
+src_rebuild/bin/
+src_rebuild/obj/
+src_rebuild/project_gmake_*/

BUILD_MACOS.md

@@ -0,0 +1,139 @@
+# REDRIVER2 — Build para macOS Apple Silicon
+
+Port de build do REDRIVER2 para macOS arm64 (Apple Silicon — M1/M2/M3/M4).
+Também funciona em macs Intel (x86_64) com pequenas adaptações automáticas.
+
+## Pré-requisitos
+
+1. **Xcode Command Line Tools**
+
+   ```bash
+   xcode-select --install
+   ```
+
+2. **Homebrew** — https://brew.sh
+
+3. **Dependências via Homebrew**
+
+   ```bash
+   brew install premake sdl2 jpeg openal-soft
+   ```
+
+   No Apple Silicon, o brew instala em `/opt/homebrew`. Em macs Intel,
+   o caminho é `/usr/local`. O `premake5.lua` detecta automaticamente.
+
+## Build
+
+```bash
+git clone https://github.com/OpenDriver2/REDRIVER2.git
+cd REDRIVER2
+git submodule update --init --recursive
+cd src_rebuild
+
+# Gerar Makefiles
+premake5 gmake
+
+cd project_gmake_macosx
+
+# Apple Silicon (arm64)
+make config=release_arm64 -j$(sysctl -n hw.ncpu)
+
+# Intel (x86_64)
+make config=release_x64 -j$(sysctl -n hw.ncpu)
+```
+
+Configurações disponíveis: `debug_arm64`, `release_arm64`, `release_dev_arm64`
+(e equivalentes para `x64`).
+
+Binário final: `src_rebuild/bin/Release/REDRIVER2`.
+
+## Rodando o jogo
+
+O REDRIVER2 precisa dos arquivos de dados originais do Driver 2 (PSX) ao
+lado do executável. Veja o
+[wiki de instalação](https://github.com/OpenDriver2/REDRIVER2/wiki/Installation-instructions)
+para instruções de extração dos assets.
+
+## Variáveis de ambiente opcionais
+
+Caso queira apontar para instalações não-Homebrew das dependências:
+
+```bash
+export MAC_SDL2_DIR=/caminho/sdl2
+export MAC_OPENAL_DIR=/caminho/openal-soft
+export MAC_JPEG_DIR=/caminho/jpeg
+```
+
+## Modificações feitas para macOS arm64
+
+Resumo das mudanças em relação ao upstream:
+
+### Build system
+- `src_rebuild/premake5.lua` — filtro `system:macosx` com platforms
+  `x64` e `arm64`, includes/libdirs do Homebrew, links de
+  `OpenGL.framework`/`Cocoa.framework`/`SDL2`/`openal`/`jpeg`,
+  rpath para os dylibs do brew. Substituiu o módulo `usage` (incompatível
+  com premake5 ≥ beta8) por `dependson`+`links`+`includedirs`.
+- `src_rebuild/premake5_psycross.lua` — filtro `system:macosx` análogo.
+- `src_rebuild/premake_modules/usage/usage.lua` — guard para evitar
+  conflito com a API `uses` agora nativa do premake5.
+
+### Portabilidade arm64 / 64-bit
+- `src_rebuild/Game/driver2.h` — `trap()` agora usa `__builtin_trap()`
+  no lugar de `__asm__("int3")` (x86-only).
+- `src_rebuild/PsyCross/include/psx/libgpu.h` — `P_LEN = 3` também para
+  `__aarch64__`/`__arm64__`/`_M_ARM64`, igualando a configuração de 64-bit.
+- `src_rebuild/PsyCross/include/psx/types.h` — em LP64 (macOS arm64/x64,
+  Linux x64), `u_long` e `ulong` viram `uint32_t` para preservar a
+  semântica de 32-bit do PSX. Pré-define guards `_U_LONG`/`_U_INT`/
+  `_U_CHAR`/`_U_SHORT` no macOS para impedir o `<sys/types.h>` do sistema
+  de redefinir esses tipos como 64-bit.
+- `premake5.lua` adiciona `-include` forçado de `psx/types.h` no filtro
+  macOS para garantir que esses guards sejam setados antes de qualquer
+  header do sistema.
+
+### Headers macOS-específicos
+- Substituído `<malloc.h>` (não existe no macOS) por `<stdlib.h>`
+  com guard em:
+  - `src_rebuild/PsyCross/src/psx/LIBCD.C`
+  - `src_rebuild/utils/fs.cpp`
+  - `src_rebuild/utils/audio_source/snd_wav_cache.cpp`
+  - `src_rebuild/utils/targa.cpp`
+  - `src_rebuild/Game/dr2locale.c`
+  - `src_rebuild/tools/font_tool/font_tool_main.cpp`
+- `LIBCD.C` e `utils/fs.{cpp,h}` — guards `__unix__` ampliados para
+  incluir `__APPLE__` (macOS não define `__unix__`).
+
+### Casts pointer→int em LP64
+Pointers são 64-bit em arm64/x86_64; `(int)ptr` perde informação e
+o clang trata como erro. Usado `(int)(intptr_t)ptr` ou `(u_intptr)ptr`
+em:
+- `src_rebuild/Game/dr2locale.h` — macros `GET_GAME_TXT`/`GET_MISSION_TXT`
+- `src_rebuild/Game/C/civ_ai.c` — `Random2((int)straight)`
+- `src_rebuild/Game/C/dr2roads.c` — `(int)plane & 3`
+- `src_rebuild/Game/C/draw.c` — checagens de `primtab`/`primptr`
+- `src_rebuild/Game/C/event.c` — `FIXEDH((int)ev->node * RSIN(...))`
+- `src_rebuild/Game/C/glaunch.c` — `(int)param` em vários callbacks
+- `src_rebuild/Game/C/mission.c` — `(u_int)((char*)...)`
+
+### C++ stricter checks
+- `src_rebuild/PsyCross/src/psx/LIBETC.C` — cast de pointer para int via
+  `intptr_t` (`ResetCallback`/`VSyncCallback`).
+- `src_rebuild/PsyCross/src/psx/LIBGPU.C` — cast explícito `(DR_TPAGE*)opri`.
+- `src_rebuild/PsyCross/src/psx/LIBSPU.C` — include de `psx/libetc.h`
+  para `ResetCallback()`.
+
+### Função GTE faltante
+- `src_rebuild/Game/C/targets.c:327` — `RotTransPers()` é declarado mas
+  não definido no PsyCross. Substituído pela macro `gte_RotTransPers()`
+  com a quinta saída (`otz`) capturada localmente.
+
+## Status
+
+- ✅ Build limpo em arm64 (Apple Silicon)
+- ✅ Binário Mach-O 64-bit nativo (`file` confirma `arm64`)
+- ⚠️ OpenGL no macOS está oficialmente *deprecated* desde 10.14 mas o
+  driver legacy ainda funciona até OpenGL 4.1. O PsyCross usa GL 2.x,
+  então roda. Para uma migração futura, considerar Metal/MoltenVK.
+- ⚠️ Não foi rodado um playtest completo — o jogo precisa dos assets
+  originais do Driver 2 para inicializar.

data/config.ini

@@ -81,7 +81,7 @@ pad1device=-1				# player 1 controller device; -1 for automatic assignment
 pad2device=-1				# player 2 controller device; -1 for automatic assignment
 
 [render]
-windowWidth=1280
+windowWidth=960
 windowHeight=720
 fullscreen=0				# enable full screen mode; it takes screen resolution
 pgxpTextureMapping=1
@@ -97,7 +97,7 @@ fieldOfView=256				# 128..384, 256 is default
 disableChicagoBridges=0			# Experimental: also activate AI roads
 freeCamera=1				# Press F7 in game to enable
 fastLoadingScreens=1
-widescreenOverlays=1			# set 1 to see map, bars and stats aligned to screen corners
+widescreenOverlays=0			# set 1 to see map, bars and stats aligned to screen corners
 driver1music=0				# put Driver 1's MUSIC.BIN as D1MUSIC.BIN to DRIVER2\SOUND folder
 overrideContent=0			# this enables texture and car model modding
 userChases=RacingFreak,Snoopi,Olanov,Vortex,Fireboyd78

src_rebuild/Game/C/civ_ai.c

@@ -1083,7 +1083,7 @@ int CheckChangeLanes(DRIVER2_STRAIGHT* straight, DRIVER2_CURVE* curve, int distA
 			segLen = straight->length;
 		}
 
-		newLane = currentLane + (Random2((int)straight) >> 7 & 2U) + 0xff & 0xff;
+		newLane = currentLane + (Random2((int)(intptr_t)straight) >> 7 & 2U) + 0xff & 0xff;
 
 		if (tryToPark)
 		{

src_rebuild/Game/C/dr2roads.c

@@ -407,7 +407,7 @@ sdPlane* sdGetCell(VECTOR *pos)
 
 	plane = &planeData[*surface];
 
-	if (((int)plane & 3) == 0 && *(int *)plane != -1) 
+	if (((intptr_t)plane & 3) == 0 && *(int *)plane != -1)
 	{
 		if (plane->surface - 16U < 16)
 			plane = EventSurface(pos, plane);

src_rebuild/Game/C/draw.c

@@ -555,11 +555,11 @@ void DrawAllTheCars(int view)
 		for (i = 0; i < num_cars_to_draw; i++)
 		{
 			// Don't exceed draw buffers
-			if ((int)(current->primtab + (-3000 - (int)(current->primptr - PRIMTAB_SIZE))) < 5800)
+			if ((int)(intptr_t)(current->primtab + (-3000 - (int)(intptr_t)(current->primptr - PRIMTAB_SIZE))) < 5800)
 				return;
 
 			// make cars look uglier
-			if ((int)(current->primtab + (-3000 - (int)(current->primptr - PRIMTAB_SIZE)) - spacefree) < 5800)
+			if ((int)(intptr_t)(current->primtab + (-3000 - (int)(intptr_t)(current->primptr - PRIMTAB_SIZE)) - spacefree) < 5800)
 				gForceLowDetailCars = 1;
 
 			if (cars_to_draw[i]->controlType == CONTROL_TYPE_PLAYER)

src_rebuild/Game/C/event.c

@@ -2989,7 +2989,7 @@ void DrawEvents(int camera)
 
 										pos.vx = pos.vx - boatOffset.vx;
 										pos.vz = pos.vz - boatOffset.vz;
-										pos.vy = (pos.vy - boatOffset.vy) + FIXEDH((int)ev->node * RSIN(*ev->data));
+										pos.vy = (pos.vy - boatOffset.vy) + FIXEDH((int)(intptr_t)ev->node * RSIN(*ev->data));
 									}
 									else if (type == 0x400)
 									{

src_rebuild/Game/C/glaunch.c

@@ -288,14 +288,14 @@ void State_GameStart(void* param)
 
 void State_InitFrontEnd(void* param)
 {
-	if ((int)param == 2)
+	if ((int)(intptr_t)param == 2)
 	{
 		InitFrontend();
 		InitFrontendDisplay();
 	}
 	else
 	{
-		ReInitFrontend((int)param == 0);
+		ReInitFrontend((int)(intptr_t)param == 0);
 	}
 
 	SetState(STATE_FRONTEND);
@@ -304,7 +304,7 @@ void State_InitFrontEnd(void* param)
 // [D] [T]
 void State_FMVPlay(void* param)
 {
-	PlayFMV((int)param);
+	PlayFMV((int)(intptr_t)param);
 	SetState(STATE_INITFRONTEND, (void*)1);
 }
 
@@ -376,7 +376,7 @@ void State_MissionLadder(void* param)
 	MISSION_STEP* CurrentStep;
 	RENDER_ARGS RenderArgs;
 
-	newgame = (int)param;
+	newgame = (int)(intptr_t)param;
 	quit = 0;
 
 	RenderArgs.nRenders = 0;

src_rebuild/Game/C/mission.c

@@ -441,7 +441,7 @@ void LoadMission(int missionnum)
 	MissionStrings = (char*)(MissionScript + MissionLoadAddress->strings);
 
 	if (MissionLoadAddress->route && !NewLevel)
-		loadsize = (u_int)((char*)MissionStrings + ((char*)MissionLoadAddress->route - (char*)MissionLoadAddress));
+		loadsize = (u_int)(uintptr_t)((char*)MissionStrings + ((char*)MissionLoadAddress->route - (char*)MissionLoadAddress));
 	else
 		loadsize = length;
 

src_rebuild/Game/C/targets.c

@@ -324,7 +324,10 @@ void DrawStopZone(VECTOR *pPosition)
 		temp.vy = pVector->vy;
 		temp.vz = pVector->vz;
 
-		RotTransPers(&temp, pOut, &p, &flag);
+		{
+			long otz;
+			gte_RotTransPers(&temp, pOut, &p, &flag, &otz);
+		}
 
 		if (pOut == (long*)&pPoly->x0)
 			pOut = (long*)&pPoly->x1;