Merge branch '1.20.1/dev' into 1.21.1/dev

Author: Jozufozu

common/src/backend/java/dev/engine_room/flywheel/backend/engine/DrawManager.java

@@ -185,6 +185,12 @@ public void delete() {
 
 	public abstract void triggerFallback();
 
+	public abstract MeshPool meshPool();
+
+	public Map<InstancerKey<?>, N> instancers() {
+		return instancers;
+	}
+
 	protected record UninitializedInstancer<N, I extends Instance>(InstancerKey<I> key, N instancer) {
 	}
 }

common/src/backend/java/dev/engine_room/flywheel/backend/engine/EngineImpl.java

@@ -130,6 +130,10 @@ public LightStorage lightStorage() {
 		return lightStorage;
 	}
 
+	public DrawManager<? extends AbstractInstancer<?>> drawManager() {
+		return drawManager;
+	}
+
 	private class VisualizationContextImpl implements VisualizationContext {
 		private final InstancerProviderImpl instancerProvider;
 

common/src/backend/java/dev/engine_room/flywheel/backend/engine/MeshPool.java

@@ -137,6 +137,10 @@ public void delete() {
 		meshList.clear();
 	}
 
+	public List<PooledMesh> pooledMeshes() {
+		return meshList;
+	}
+
 	public class PooledMesh extends ReferenceCounted {
 		public static final int INVALID_BASE_VERTEX = -1;
 

common/src/backend/java/dev/engine_room/flywheel/backend/engine/indirect/IndirectDrawManager.java

@@ -288,4 +288,9 @@ public void triggerFallback() {
 		IndirectPrograms.kill();
 		Minecraft.getInstance().levelRenderer.allChanged();
 	}
+
+	@Override
+	public MeshPool meshPool() {
+		return meshPool;
+	}
 }

common/src/backend/java/dev/engine_room/flywheel/backend/engine/instancing/InstancedDrawManager.java

@@ -160,7 +160,7 @@ private void submitDraws() {
 
 			uploadMaterialUniform(program, material);
 
-			program.setUInt("_flw_vertexOffset", drawCall.mesh()
+			program.setUInt("_flw_baseVertex", drawCall.mesh()
 					.baseVertex());
 
 			MaterialRenderState.setup(material);
@@ -184,7 +184,7 @@ private void submitOitDraws(PipelineCompiler.OitMode mode) {
 
 			uploadMaterialUniform(program, material);
 
-			program.setUInt("_flw_vertexOffset", drawCall.mesh()
+			program.setUInt("_flw_baseVertex", drawCall.mesh()
 					.baseVertex());
 
 			MaterialRenderState.setupOit(material);
@@ -304,6 +304,11 @@ public void triggerFallback() {
 		Minecraft.getInstance().levelRenderer.allChanged();
 	}
 
+	@Override
+	public MeshPool meshPool() {
+		return meshPool;
+	}
+
 	public static void uploadMaterialUniform(GlProgram program, Material material) {
 		int packedFogAndCutout = MaterialEncoder.packUberShader(material);
 		int packedMaterialProperties = MaterialEncoder.packProperties(material);

common/src/backend/resources/assets/flywheel/flywheel/internal/api_impl.vert

@@ -13,4 +13,4 @@ out float flw_distance;
 
 FlwMaterial flw_material;
 
-#define flw_vertexId gl_VertexID
+uint flw_vertexId;

common/src/backend/resources/assets/flywheel/flywheel/internal/common.vert

@@ -75,7 +75,9 @@ mat3 _flw_normalMatrix;
 flat out uvec2 _flw_ids;
 #endif
 
-void _flw_main(in FlwInstance instance, in uint stableInstanceID, in uint modelID) {
+void _flw_main(in FlwInstance instance, in uint stableInstanceID, in uint baseVertex) {
+    flw_vertexId = gl_VertexID - baseVertex;
+
     _flw_layoutVertex();
     flw_instanceVertex(instance);
     flw_materialVertex();
@@ -96,6 +98,6 @@ void _flw_main(in FlwInstance instance, in uint stableInstanceID, in uint modelI
     gl_Position = flw_viewProjection * flw_vertexPos;
 
     #ifdef _FLW_DEBUG
-    _flw_ids = uvec2(stableInstanceID, modelID);
+    _flw_ids = uvec2(stableInstanceID, baseVertex);
     #endif
 }

common/src/backend/resources/assets/flywheel/flywheel/internal/instancing/main.vert

@@ -10,7 +10,7 @@ uniform mat4 _flw_modelMatrixUniform;
 uniform mat3 _flw_normalMatrixUniform;
 #endif
 
-uniform uint _flw_vertexOffset;
+uniform uint _flw_baseVertex;
 
 void main() {
     _flw_unpackMaterialProperties(_flw_packedMaterial.y, flw_material);
@@ -22,5 +22,5 @@ void main() {
     _flw_normalMatrix = _flw_normalMatrixUniform;
     #endif
 
-    _flw_main(instance, uint(gl_InstanceID), _flw_vertexOffset);
+    _flw_main(instance, uint(gl_InstanceID), _flw_baseVertex);
 }

common/src/main/java/dev/engine_room/flywheel/impl/FlwDebugInfo.java

@@ -5,10 +5,15 @@
 import org.jetbrains.annotations.Nullable;
 
 import dev.engine_room.flywheel.api.visualization.VisualizationManager;
+import dev.engine_room.flywheel.backend.engine.AbstractInstancer;
+import dev.engine_room.flywheel.backend.engine.DrawManager;
 import dev.engine_room.flywheel.backend.gl.GlCompat;
 import dev.engine_room.flywheel.impl.visualization.VisualizationManagerImpl;
 import dev.engine_room.flywheel.lib.memory.FlwMemoryTracker;
 import dev.engine_room.flywheel.lib.util.StringUtil;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntComparators;
+import it.unimi.dsi.fastutil.ints.IntList;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.Vec3i;
@@ -32,10 +37,15 @@ public static StringBuilder appendLine(StringBuilder dst, String str) {
 	}
 
 	/**
-	 * Append a header to the given StringBuilder, preceded by two new lines for separation.
+	 * Append a header to the given StringBuilder.
 	 */
 	public static void appendHeader(StringBuilder dst, String str) {
-		dst.append("\n\n## ");
+		dst.append("\n## ");
+		dst.append(str);
+	}
+
+	public static void appendHeader2(StringBuilder dst, String str) {
+		dst.append("\n### ");
 		dst.append(str);
 	}
 
@@ -92,7 +102,93 @@ private static void addBackendDebugInfo(@Nullable VisualizationManagerImpl manag
 		var lut = engineImpl.lightStorage()
 				.createLut();
 
-		appendLine(out, "Light LUT Size: ").append(lut.size() * Integer.BYTES);
+		appendLine(out, "Light LUT Size: ").append(lut.size() * Integer.BYTES)
+				.append(" bytes");
+
+		DrawManager<? extends AbstractInstancer<?>> drawManager = engineImpl.drawManager();
+		addMeshDebugInfo(out, drawManager);
+		addInstancerDebugInfo(out, drawManager);
+	}
+
+	private static void addInstancerDebugInfo(StringBuilder out, DrawManager<? extends AbstractInstancer<?>> drawManager) {
+		appendHeader2(out, "Instancers");
+
+		var instancers = drawManager.instancers();
+
+		appendLine(out, "Count: ").append(instancers.size());
+
+		{
+			IntList meshCountsToSort = new IntArrayList();
+			for (var instancerKey : instancers.keySet()) {
+				meshCountsToSort.add(instancerKey.model()
+						.meshes()
+						.size());
+			}
+			appendPercentiles(out, "Mesh Count Percentiles", meshCountsToSort);
+		}
+
+		{
+			int totalInstanceCount = 0;
+			IntList instanceCountsToSort = new IntArrayList();
+			for (var instancer : instancers.values()) {
+				var instanceCount = instancer.instanceCount();
+				totalInstanceCount += instanceCount;
+				instanceCountsToSort.add(instanceCount);
+			}
+			appendLine(out, "Total Instance Count: ").append(totalInstanceCount);
+			appendPercentiles(out, "Instance Count Percentiles", instanceCountsToSort);
+		}
+	}
+
+	private static void addMeshDebugInfo(StringBuilder out, DrawManager<? extends AbstractInstancer<?>> drawManager) {
+		var meshPool = drawManager.meshPool()
+				.pooledMeshes();
+
+		appendHeader2(out, "Meshes");
+
+		var numMeshes = meshPool.size();
+
+		appendLine(out, "Count: ").append(numMeshes);
+
+		{
+			int totalVertices = 0;
+			IntList vertexCountsToSort = new IntArrayList();
+			for (var pooledMesh : meshPool) {
+				int vertexCount = pooledMesh.vertexCount();
+
+				vertexCountsToSort.add(vertexCount);
+				totalVertices += vertexCount;
+			}
+
+			appendLine(out, "Total Vertex Count: ").append(totalVertices);
+			appendPercentiles(out, "Vertex Count Percentiles", vertexCountsToSort);
+		}
+	}
+
+	private static void appendPercentiles(StringBuilder out, String prefix, IntList unsortedCounts) {
+		var size = unsortedCounts.size();
+
+		if (size == 0) {
+			// Append
+			appendLine(out, "Empty dataset, no percentiles.");
+			return;
+		}
+
+		unsortedCounts.sort(IntComparators.NATURAL_COMPARATOR);
+
+		int p10Index = Math.min(size / 10, size - 1);
+		int p50Index = Math.min(size / 2, size - 1);
+		int p90Index = Math.min(size * 9 / 10, size - 1);
+
+		appendLine(out, prefix).append(":\n   ")
+				.append("P10: ")
+				.append(unsortedCounts.getInt(p10Index))
+				.append(", P50: ")
+				.append(unsortedCounts.getInt(p50Index))
+				.append(", P90: ")
+				.append(unsortedCounts.getInt(p90Index))
+				.append(", Max: ")
+				.append(unsortedCounts.getInt(size - 1));
 	}
 
 	private static void addVisualizationManagerDebugInfo(@Nullable VisualizationManagerImpl manager, StringBuilder out) {
@@ -137,8 +233,10 @@ private static void addSystemDebugInfo(StringBuilder out) {
 				.append(" (")
 				.append(System.getProperty("os.arch"))
 				.append(")");
-		appendLine(out, "Flw CPU Memory: ").append(FlwMemoryTracker.getCpuMemory());
-		appendLine(out, "Flw GPU Memory: ").append(FlwMemoryTracker.getGpuMemory());
+		appendLine(out, "Flw CPU Memory: ").append(FlwMemoryTracker.getCpuMemory())
+				.append(" bytes");
+		appendLine(out, "Flw GPU Memory: ").append(FlwMemoryTracker.getGpuMemory())
+				.append(" bytes");
 	}
 
 	private static void addOpenGLDebugInfo(StringBuilder out) {

docs/flywheel/api/snippets/vertex.glsl

@@ -8,6 +8,9 @@ ivec2 flw_vertexOverlay;
 vec2 flw_vertexLight;
 vec3 flw_vertexNormal;
 
+// The index of the current vertex in the mesh that is being drawn.
+/*const*/ uint flw_vertexId;
+
 /*const*/ FlwMaterial flw_material;
 
 // To be implemented by the instance shader.