Keep renderer self-tests within platform stack and capability limits

Author: themuffinator

docs/dev/release-completion.md

@@ -1,6 +1,7 @@
 # openQ4 Release Completion List
 
-- [ ] Release CI exposed existing Apple GL 2.1 startup errors from unsupported texture swizzles, multisample textures, eager SMAA shader validation and GPU timestamp queries. Resource creation and direct texture binding now check the context's advertised capabilities, SMAA checks its backend before material compilation, and GPU timing distinguishes EXT elapsed queries from ARB/core timestamp support. The production timestamp capability regression passes on Windows and Linux. Awaiting the hosted macOS runtime rerun.
+- [x] Release CI exposed existing Apple GL 2.1 startup errors from unsupported texture swizzles, multisample textures, eager SMAA shader validation and GPU timestamp queries. Resource creation and direct texture binding now check the context's advertised capabilities, SMAA checks its backend before material compilation, and GPU timing distinguishes EXT elapsed queries from ARB/core timestamp support. The production timestamp capability regression passes on Windows and Linux; hosted macOS now has zero GL/shader/framebuffer errors and passes the default-renderer safety test.
+- [ ] Modern-renderer diagnostics exposed oversized simultaneous draw/submit/PBR fixtures on the macOS stack and unsupported-feature assumptions. The large fixtures now use heap storage, while unavailable PBR and clustered-light GPU paths produce explicit skip markers. Awaiting the complete hosted runtime matrix.
 
 - [x] The 0.13.0 integration pass wires the new source contracts into local and CI validation, includes syntax checks for gameplay drivers, synchronizes the shared memory-file header, and pins both repositories' CI inputs. Windows build/staging, 12 native tests, all 54 competitive contracts and OpenGL/Vulkan chat gameplay checks pass. Stock `q4dm1` still logs missing AAS sizes, the optional `mp_buying_givecash` sound and non-precached declarations during these no-bot chat checks; those content diagnostics remain outside this release-tooling change.
 

docs/dev/releases/v0.13.0.md

@@ -78,6 +78,7 @@
 - Fixed the manual macOS release audit so the exact bundled OpenAL Soft `@rpath` dependency is accepted only after its architecture, dependencies, signature, and install name pass validation.
 - Fixed publication of previously staged draft releases so validated downloads can go live and trigger their Discord announcement.
 - Prevented legacy OpenGL contexts from attempting unsupported SMAA shaders, texture swizzles, multisample textures, direct texture binding and GPU timestamp queries, retaining the available rendering paths.
+- Made renderer self-tests safer on macOS and explicit about optional features unavailable on the current OpenGL context.
 - Fixed SDL swap-interval updates after temporary context detachment, Linux save paths containing legitimate repeated dots, and case-insensitive package path collisions.
 - Restored `dmap` handling of `func_group` geometry, initialized geometry-tool surface allocation, and accepted generated AAS 1.08 face settings.
 - Added contributing and community-conduct documentation and packaged the relevant project guidance with releases.

src/renderer/ModernClusteredLighting.cpp

@@ -4172,6 +4172,10 @@ bool RendererClusterGrid_RunSelfTest( void ) {
 	if ( !R_ModernClusteredLighting_RunProbeRecordSelfTest() ) {
 		return false;
 	}
+	if ( !rg_clusteredLightingAvailable ) {
+		common->Printf( "RendererClusterGrid self-test skipped: modern clustered lighting unavailable\n" );
+		return true;
+	}
 	if ( !r_rendererModernExecutor.GetBool() && r_rendererClusterDebug.GetInteger() <= 0 ) {
 		common->Printf( "RendererClusterGrid self-test passed (disabled)\n" );
 		return true;

src/renderer/ModernGLExecutor.cpp

@@ -11124,7 +11124,7 @@ bool RendererGBuffer_RunSelfTest( void ) {
 bool RendererPBRVisible_RunSelfTest( void ) {
 	const modernGLShaderLibraryStats_t &shaderStats = R_ModernGLShaderLibrary_Stats();
 	if ( !shaderStats.available ) {
-		common->Printf( "RendererPBRVisible self-test passed (shader library unavailable)\n" );
+		common->Printf( "RendererPBRVisible self-test skipped: modern shader library unavailable\n" );
 		return true;
 	}
 	const modernGLShaderProgramInfo_t *opaqueProgram = R_ModernGLShaderLibrary_FindProgram( MODERN_GL_SHADER_GBUFFER_OPAQUE, shaderStats.highestGLSLVersion );
@@ -11152,7 +11152,10 @@ bool RendererPBRVisible_RunSelfTest( void ) {
 	r_rendererModernOpaque.SetBool( true );
 	r_rendererForwardPlus.SetBool( false );
 
-	idScenePacketFrame packetFrame;
+	// Packet, draw and submit arenas exceed the macOS main-thread stack when
+	// the two PBR fixtures are alive together. Keep their storage on the heap.
+	idAutoPtr<idScenePacketFrame> packetFrameStorage( new idScenePacketFrame );
+	idScenePacketFrame &packetFrame = *packetFrameStorage;
 	idRenderGraph graph;
 	rendererModernGLSelfTestSurfaceScene_t scene;
 	const idMaterial *pbrMaterial = scene.InitPBROpaqueMaterial( "RendererPBRVisible" );
@@ -11174,9 +11177,11 @@ bool RendererPBRVisible_RunSelfTest( void ) {
 	}
 	r_rendererModernQuality.SetBool( true );
 
-	idModernGLDrawPlan drawPlan;
+	idAutoPtr<idModernGLDrawPlan> drawPlanStorage( new idModernGLDrawPlan );
+	idModernGLDrawPlan &drawPlan = *drawPlanStorage;
 	drawPlan.Build( packetFrame, graph );
-	idModernGLSubmitPlan submitPlan;
+	idAutoPtr<idModernGLSubmitPlan> submitPlanStorage( new idModernGLSubmitPlan );
+	idModernGLSubmitPlan &submitPlan = *submitPlanStorage;
 	submitPlan.Build( drawPlan );
 	const int expectedDraws = packetFrame.NumDrawPackets();
 	if ( drawPlan.Stats().materialDraws != expectedDraws || submitPlan.Stats().materialReadyDraws != expectedDraws || submitPlan.NumCommands() != expectedDraws ) {
@@ -11208,7 +11213,8 @@ bool RendererPBRVisible_RunSelfTest( void ) {
 	// two per-light interaction packets for each surface and prove that the
 	// stable ambient packet is the sole ordered surface owner.
 	r_rendererForwardPlus.SetBool( true );
-	idScenePacketFrame clusteredFrame;
+	idAutoPtr<idScenePacketFrame> clusteredFrameStorage( new idScenePacketFrame );
+	idScenePacketFrame &clusteredFrame = *clusteredFrameStorage;
 	if ( !clusteredFrame.AddScene( &scene.worldView, true )
 			|| !clusteredFrame.AddPass( RENDER_PASS_ARB2_INTERACTION, true ) ) {
 		common->Printf( "RendererPBRVisible self-test failed: clustered interaction frame setup\n" );
@@ -11252,9 +11258,11 @@ bool RendererPBRVisible_RunSelfTest( void ) {
 	idRenderGraph clusteredGraph;
 	R_RenderGraph_BuildFromScenePackets( clusteredFrame, clusteredGraph );
 	R_MaterialResourceTable_PrepareFrame( clusteredFrame );
-	idModernGLDrawPlan clusteredDrawPlan;
+	idAutoPtr<idModernGLDrawPlan> clusteredDrawPlanStorage( new idModernGLDrawPlan );
+	idModernGLDrawPlan &clusteredDrawPlan = *clusteredDrawPlanStorage;
 	clusteredDrawPlan.Build( clusteredFrame, clusteredGraph );
-	idModernGLSubmitPlan clusteredSubmitPlan;
+	idAutoPtr<idModernGLSubmitPlan> clusteredSubmitPlanStorage( new idModernGLSubmitPlan );
+	idModernGLSubmitPlan &clusteredSubmitPlan = *clusteredSubmitPlanStorage;
 	clusteredSubmitPlan.Build( clusteredDrawPlan );
 	const modernGLDrawPlanStats_t &clusteredStats = clusteredDrawPlan.Stats();
 	if ( clusteredStats.sourceDrawPackets != 6

src/renderer/ModernGLSubmitPlan.cpp

@@ -1139,17 +1139,18 @@ bool RendererModernGLSubmitPlan_RunSelfTest( void ) {
 		return true;
 	}
 
-	// This fixture keeps four fixed-capacity packet arenas alive at once. Keep
-	// them off the finite render-thread stack; sealed geometry contracts make
-	// the arenas deliberately substantial even though each fixture uses only a
-	// handful of records.
+	// Four packet, draw and submit arenas remain alive together. All three
+	// arena types must stay off the finite render-thread stack, even though
+	// each fixture uses only a handful of records.
 	idAutoPtr<idScenePacketFrame> packetFrame( new idScenePacketFrame );
 	idRenderGraph graph;
-	idModernGLDrawPlan drawPlan;
+	idAutoPtr<idModernGLDrawPlan> drawPlanStorage( new idModernGLDrawPlan );
+	idModernGLDrawPlan &drawPlan = *drawPlanStorage;
 	R_ModernGLSubmitPlan_BuildSelfTestDrawPlan( true, true, TAG_USED, false,
 		drawPlan, *packetFrame, graph );
 
-	idModernGLSubmitPlan submitPlan;
+	idAutoPtr<idModernGLSubmitPlan> submitPlanStorage( new idModernGLSubmitPlan );
+	idModernGLSubmitPlan &submitPlan = *submitPlanStorage;
 	submitPlan.Build( drawPlan );
 	const modernGLSubmitPlanStats_t &readyStats = submitPlan.Stats();
 	const bool expectedDepthEligible = tr.defaultMaterial != NULL
@@ -1207,13 +1208,15 @@ bool RendererModernGLSubmitPlan_RunSelfTest( void ) {
 		}
 	}
 
-	idModernGLDrawPlan missingCacheDrawPlan;
+	idAutoPtr<idModernGLDrawPlan> missingCacheDrawPlanStorage( new idModernGLDrawPlan );
+	idModernGLDrawPlan &missingCacheDrawPlan = *missingCacheDrawPlanStorage;
 	idAutoPtr<idScenePacketFrame> missingCachePacketFrame(
 		new idScenePacketFrame );
 	idRenderGraph missingCacheGraph;
 	R_ModernGLSubmitPlan_BuildSelfTestDrawPlan( false, false, TAG_FREE, false,
 		missingCacheDrawPlan, *missingCachePacketFrame, missingCacheGraph );
-	idModernGLSubmitPlan missingCacheSubmitPlan;
+	idAutoPtr<idModernGLSubmitPlan> missingCacheSubmitPlanStorage( new idModernGLSubmitPlan );
+	idModernGLSubmitPlan &missingCacheSubmitPlan = *missingCacheSubmitPlanStorage;
 	missingCacheSubmitPlan.Build( missingCacheDrawPlan );
 	const modernGLDrawPlanStats_t &missingDrawStats = missingCacheDrawPlan.Stats();
 	const modernGLSubmitPlanStats_t &fallbackStats = missingCacheSubmitPlan.Stats();
@@ -1229,13 +1232,15 @@ bool RendererModernGLSubmitPlan_RunSelfTest( void ) {
 		return false;
 	}
 
-	idModernGLDrawPlan tempIndexDrawPlan;
+	idAutoPtr<idModernGLDrawPlan> tempIndexDrawPlanStorage( new idModernGLDrawPlan );
+	idModernGLDrawPlan &tempIndexDrawPlan = *tempIndexDrawPlanStorage;
 	idAutoPtr<idScenePacketFrame> tempIndexPacketFrame(
 		new idScenePacketFrame );
 	idRenderGraph tempIndexGraph;
 	R_ModernGLSubmitPlan_BuildSelfTestDrawPlan( true, true, TAG_TEMP, false,
 		tempIndexDrawPlan, *tempIndexPacketFrame, tempIndexGraph );
-	idModernGLSubmitPlan tempIndexSubmitPlan;
+	idAutoPtr<idModernGLSubmitPlan> tempIndexSubmitPlanStorage( new idModernGLSubmitPlan );
+	idModernGLSubmitPlan &tempIndexSubmitPlan = *tempIndexSubmitPlanStorage;
 	tempIndexSubmitPlan.Build( tempIndexDrawPlan );
 	const modernGLSubmitPlanStats_t &tempIndexStats = tempIndexSubmitPlan.Stats();
 	if ( tempIndexStats.sourcePlanDraws != expectedReadyDraws || tempIndexStats.readyDraws != expectedReadyDraws || tempIndexStats.fallbackDraws != 0 || tempIndexStats.indexCacheReadyDraws != expectedReadyDraws || tempIndexStats.indexUploadDraws != 0 ) {
@@ -1247,13 +1252,15 @@ bool RendererModernGLSubmitPlan_RunSelfTest( void ) {
 		return false;
 	}
 
-	idModernGLDrawPlan uploadIndexDrawPlan;
+	idAutoPtr<idModernGLDrawPlan> uploadIndexDrawPlanStorage( new idModernGLDrawPlan );
+	idModernGLDrawPlan &uploadIndexDrawPlan = *uploadIndexDrawPlanStorage;
 	idAutoPtr<idScenePacketFrame> uploadIndexPacketFrame(
 		new idScenePacketFrame );
 	idRenderGraph uploadIndexGraph;
 	R_ModernGLSubmitPlan_BuildSelfTestDrawPlan( true, false, TAG_FREE, true,
 		uploadIndexDrawPlan, *uploadIndexPacketFrame, uploadIndexGraph );
-	idModernGLSubmitPlan uploadIndexSubmitPlan;
+	idAutoPtr<idModernGLSubmitPlan> uploadIndexSubmitPlanStorage( new idModernGLSubmitPlan );
+	idModernGLSubmitPlan &uploadIndexSubmitPlan = *uploadIndexSubmitPlanStorage;
 	uploadIndexSubmitPlan.Build( uploadIndexDrawPlan );
 	const modernGLSubmitPlanStats_t &uploadStats = uploadIndexSubmitPlan.Stats();
 	if ( uploadStats.sourcePlanDraws != expectedReadyDraws || uploadStats.readyDraws != expectedReadyDraws || uploadStats.fallbackDraws != 0 || uploadStats.indexUploadDraws != expectedReadyDraws || uploadStats.indexCacheReadyDraws != 0 ) {

tools/tests/renderer_classic_deform_domain.py

@@ -404,6 +404,16 @@ def validate_frontend_packet_provenance() -> None:
         "idScenePacketFrame packetFrame;",
         "render-thread stack packet fixture",
     )
+    for arena in ("idModernGLDrawPlan", "idModernGLSubmitPlan"):
+        require_count(submit_plan, f"idAutoPtr<{arena}>", 4, "heap-backed draw/submit fixtures")
+
+    pbr_test = braced_body(
+        read("src/renderer/ModernGLExecutor.cpp"),
+        "bool RendererPBRVisible_RunSelfTest(",
+        "PBR fixture stack budget",
+    )
+    for arena in ("idScenePacketFrame", "idModernGLDrawPlan", "idModernGLSubmitPlan"):
+        require_count(pbr_test, f"idAutoPtr<{arena}>", 2, "heap-backed simultaneous PBR fixtures")
 
 
 def validate_shared_domain_admission() -> None:

tools/tests/renderer_validation_matrix.py

@@ -34,6 +34,8 @@
 # silently ignores any "+command" beyond this limit, which would drop "+quit"
 # and leave the case running until the timeout.
 ENGINE_MAX_STARTUP_COMMANDS = 64
+PBR_UNAVAILABLE_MARKER = "RendererPBRVisible self-test skipped: modern shader library unavailable"
+CLUSTER_UNAVAILABLE_MARKER = "RendererClusterGrid self-test skipped: modern clustered lighting unavailable"
 
 SELFTEST_CHECKS = [
     ["RendererModule self-test passed"],
@@ -739,10 +741,10 @@ def build_safe_cases(tiers: tuple[str, ...]) -> list[dict[str, Any]]:
                 "+gfxInfo",
             ],
             "checks": [
-                ["RendererPBRVisible self-test passed"],
-                ["gbuffer=1"],
-                ["deferred=1"],
-                ["forward=1"],
+                ["RendererPBRVisible self-test passed", PBR_UNAVAILABLE_MARKER],
+                ["gbuffer=1", PBR_UNAVAILABLE_MARKER],
+                ["deferred=1", PBR_UNAVAILABLE_MARKER],
+                ["forward=1", PBR_UNAVAILABLE_MARKER],
                 ["Selected renderer tier:"],
                 ["GL context request:"],
             ],
@@ -781,14 +783,14 @@ def build_safe_cases(tiers: tuple[str, ...]) -> list[dict[str, Any]]:
                 "+gfxInfo",
             ],
             "checks": [
-                ["RendererClusterGrid self-test passed"],
-                ["lights=6"],
-                ["shadowDesc="],
-                ["shadowBuffer=1"],
-                ["uploadedShadow="],
-                ["overflow="],
-                ["ubo=1"],
-                ["overlay=1"],
+                ["RendererClusterGrid self-test passed", CLUSTER_UNAVAILABLE_MARKER],
+                ["lights=6", CLUSTER_UNAVAILABLE_MARKER],
+                ["shadowDesc=", CLUSTER_UNAVAILABLE_MARKER],
+                ["shadowBuffer=1", CLUSTER_UNAVAILABLE_MARKER],
+                ["uploadedShadow=", CLUSTER_UNAVAILABLE_MARKER],
+                ["overflow=", CLUSTER_UNAVAILABLE_MARKER],
+                ["ubo=1", CLUSTER_UNAVAILABLE_MARKER],
+                ["overlay=1", CLUSTER_UNAVAILABLE_MARKER],
                 ["Modern clustered lighting:"],
                 ["Selected renderer tier:"],
                 ["GL context request:"],