Move GPUMeshBatch command buffer back to MeshBatch (will be uploaded from cpu).

h3d/scene/GPUMeshBatch.hx

@@ -5,7 +5,6 @@ import h3d.scene.MeshBatch.MeshBatchPart;
 
 class GPUMeshBatch extends MeshBatch {
 
-	static var INDIRECT_DRAW_ARGUMENTS_FMT = hxd.BufferFormat.make([{ name : "", type : DVec4 }, { name : "", type : DFloat }]);
 	static var INSTANCE_OFFSETS_FMT = hxd.BufferFormat.make([{ name : "", type : DFloat }]);
 
 	var matInfos : h3d.Buffer;
@@ -54,6 +53,7 @@ class GPUMeshBatch extends MeshBatch {
 
 	function getLodCount() return gpuLodEnabled ? getPrimitive().lodCount() : 1;
 	override function updateHasPrimitiveOffset() meshBatchFlags.set(HasPrimitiveOffset);
+	override function useCommandBuffer() return true;
 
 	override function begin( emitCountTip = -1) {
 		if ( !gpuLodEnabled && !gpuCullingEnabled )
@@ -199,30 +199,6 @@ class GPUMeshBatch extends MeshBatch {
 		materialCount = 0;
 	}
 
-	override function onFlushBuffer(p : BatchData, index : Int, count : Int) {
-		var p = cast(p, GPUBatchData);
-		var alloc = hxd.impl.Allocator.get();
-
-		var commandCountAllocated = hxd.Math.imin( hxd.Math.nextPOT( count ), p.maxInstance );
-		if ( p.commandBuffers == null) {
-			p.commandBuffers = [];
-			p.countBuffers = [];
-		}
-		var buf = p.commandBuffers[index];
-		var cbuf = p.countBuffers[index];
-		if ( buf == null ) {
-			buf = alloc.allocBuffer( commandCountAllocated, INDIRECT_DRAW_ARGUMENTS_FMT, UniformReadWrite );
-			cbuf = alloc.allocBuffer( 1, hxd.BufferFormat.VEC4_DATA, UniformReadWrite );
-			p.commandBuffers[index] = buf;
-			p.countBuffers[index] = cbuf;
-		}
-		else if ( buf.vertices < commandCountAllocated ) {
-			alloc.disposeBuffer( buf );
-			buf = alloc.allocBuffer( commandCountAllocated, INDIRECT_DRAW_ARGUMENTS_FMT, UniformReadWrite );
-			p.commandBuffers[index] = buf;
-		}
-	}
-
 	override function onFlushPass(p : BatchData) {
 		var p = cast(p, GPUBatchData);
 		var prim = getPrimitive();
@@ -293,15 +269,6 @@ class GPUMeshBatch extends MeshBatch {
 		}
 	}
 
-	override function setPassCommand(p : BatchData, bufferIndex : Int) {
-		super.setPassCommand(p, bufferIndex);
-		var p = cast(p, GPUBatchData);
-		if ( p.commandBuffers != null && p.commandBuffers.length > 0 ) {
-			@:privateAccess instanced.commands.data = p.commandBuffers[bufferIndex].vbuf;
-			@:privateAccess instanced.commands.countBuffer = p.countBuffers[bufferIndex].vbuf;
-		}
-	}
-
 	inline function isCountBufferAllowed() {
 		#if hlsdl
 		return h3d.impl.GlDriver.hasMultiIndirectCount;
@@ -336,20 +303,10 @@ class GPUMeshBatch extends MeshBatch {
 
 class GPUBatchData extends BatchData {
 	public var computePass : h3d.mat.Pass;
-	public var commandBuffers : Array<h3d.Buffer>;
-	public var countBuffers : Array<h3d.Buffer>;
 
-	override function clean() {		
+	override function clean() {
 		super.clean();
 
-		var alloc = hxd.impl.Allocator.get();
-		if ( commandBuffers != null && commandBuffers.length > 0 ) {
-			for ( buf in commandBuffers )
-				alloc.disposeBuffer(buf);
-			commandBuffers.resize(0);
-			for ( buf in countBuffers )
-				alloc.disposeBuffer(buf);
-			countBuffers.resize(0);
-		}
+		computePass = null;
 	}
 }

h3d/scene/MeshBatch.hx

@@ -19,6 +19,7 @@ class MeshBatch extends MultiMaterial {
 	static var MAX_BUFFER_ELEMENTS = 4096;
 	static var MAX_STORAGE_BUFFER_ELEMENTS = 128 * 1024 * 1024 >> 2;
 	static var BATCH_START_FMT = hxd.BufferFormat.make([{ name : "Batch_Start", type : DFloat }]);
+	static var INDIRECT_DRAW_ARGUMENTS_FMT = hxd.BufferFormat.make([{ name : "", type : DVec4 }, { name : "", type : DFloat }]);
 
 	var instanced : h3d.prim.Instanced;
 	var dataPasses : BatchData;
@@ -94,6 +95,7 @@ class MeshBatch extends MultiMaterial {
 	function gpuUpdateEnabled() return meshBatchFlags.has(EnableGpuUpdate);
 	function getMaxElements() return storageBufferEnabled() ? MAX_STORAGE_BUFFER_ELEMENTS : MAX_BUFFER_ELEMENTS;
 	function hasPrimitiveOffset() return meshBatchFlags.has(HasPrimitiveOffset);
+	function useCommandBuffer() return false;
 
 	public function begin( emitCountTip = -1 ) : Int {
 		instanceCount = 0;
@@ -332,7 +334,26 @@ class MeshBatch extends MultiMaterial {
 					}
 				}
 
-				onFlushBuffer(p, index, count);
+				if ( useCommandBuffer() ) {
+					var commandCountAllocated = hxd.Math.imin( hxd.Math.nextPOT( count ), p.maxInstance );
+					if ( p.commandBuffers == null) {
+						p.commandBuffers = [];
+						p.countBuffers = [];
+					}
+					var buf = p.commandBuffers[index];
+					var cbuf = p.countBuffers[index];
+					if ( buf == null ) {
+						buf = alloc.allocBuffer( commandCountAllocated, INDIRECT_DRAW_ARGUMENTS_FMT, UniformReadWrite );
+						cbuf = alloc.allocBuffer( 1, hxd.BufferFormat.VEC4_DATA, UniformReadWrite );
+						p.commandBuffers[index] = buf;
+						p.countBuffers[index] = cbuf;
+					}
+					else if ( buf.vertices < commandCountAllocated ) {
+						alloc.disposeBuffer( buf );
+						buf = alloc.allocBuffer( commandCountAllocated, INDIRECT_DRAW_ARGUMENTS_FMT, UniformReadWrite );
+						p.commandBuffers[index] = buf;
+					}
+				}
 
 				start += count;
 				index++;
@@ -362,8 +383,6 @@ class MeshBatch extends MultiMaterial {
 		needUpload = false;
 	}
 
-	function onFlushBuffer(p : BatchData, index : Int, count : Int) {}
-
 	function onFlushPass(p : BatchData) {}
 
 	function syncData( batch : BatchData ) {
@@ -483,9 +502,14 @@ class MeshBatch extends MultiMaterial {
 				else
 					p.shader.Batch_Buffer = p.buffers[bufferIndex];
 
-				if( p.instanceBuffers == null )
-					setPassCommand(p, bufferIndex);
-				else
+				if( p.instanceBuffers == null ) {
+					var count = hxd.Math.imin( instanceCount - p.maxInstance * bufferIndex, p.maxInstance );
+					instanced.setCommand(p.matIndex, instanced.screenRatioToLod(curScreenRatio), count);
+					if ( p.commandBuffers != null && p.commandBuffers.length > 0 ) {
+						@:privateAccess instanced.commands.data = p.commandBuffers[bufferIndex].vbuf;
+						@:privateAccess instanced.commands.countBuffer = p.countBuffers[bufferIndex].vbuf;
+					}
+				} else
 					instanced.commands = p.instanceBuffers[bufferIndex];
 
 				break;
@@ -499,11 +523,6 @@ class MeshBatch extends MultiMaterial {
 		ctx.drawPass.index = prev;
 	}
 
-	function setPassCommand(p : BatchData, bufferIndex : Int) {
-		var count = hxd.Math.imin( instanceCount - p.maxInstance * bufferIndex, p.maxInstance );
-		instanced.setCommand(p.matIndex, instanced.screenRatioToLod(curScreenRatio), count);
-	}
-
 	override function calcScreenRatio(ctx:RenderContext) {
 		curScreenRatio = getPrimitive().getBounds().dimension() / ( 2.0 * hxd.Math.max(lodDistance, 0.0001) );
 	}
@@ -569,6 +588,8 @@ class BatchData {
 	public var shader : hxsl.BatchShader;
 	public var shaders : Array<hxsl.Shader>;
 	public var pass : h3d.mat.Pass;
+	public var commandBuffers : Array<h3d.Buffer>;
+	public var countBuffers : Array<h3d.Buffer>;
 	public var next : BatchData;
 
 	public function new() {
@@ -576,6 +597,14 @@ class BatchData {
 
 	public function clean() {
 		var alloc = hxd.impl.Allocator.get();
+		if ( commandBuffers != null && commandBuffers.length > 0 ) {
+			for ( buf in commandBuffers )
+				alloc.disposeBuffer(buf);
+			commandBuffers.resize(0);
+			for ( buf in countBuffers )
+				alloc.disposeBuffer(buf);
+			countBuffers.resize(0);
+		}
 
 		pass.removeShader(shader);
 		for( b in buffers )