Fix Static shader batch fails after delete then upload

Closes #257
polyforest · Feb 19, 2020 · 672a621 · 672a621
1 parent 4c227e8
commit 672a621
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/acornui-core/src/commonMain/kotlin/com/acornui/component/drawing/StaticMesh.kt b/acornui-core/src/commonMain/kotlin/com/acornui/component/drawing/StaticMesh.kt
@@ -16,7 +16,6 @@
 
 package com.acornui.component.drawing
 
-import com.acornui.collection.forEach2
 import com.acornui.component.*
 import com.acornui.di.Context
 import com.acornui.di.ContextImpl
@@ -224,7 +223,7 @@ class StaticMesh(
 				textures.forEach {
 					it.refInc()
 				}
-				oldTextures.forEach2 {
+				oldTextures.forEach {
 					it.refDec()
 				}
 				oldTextures.clear()

diff --git a/acornui-core/src/commonMain/kotlin/com/acornui/gl/core/ShaderBatchImpl.kt b/acornui-core/src/commonMain/kotlin/com/acornui/gl/core/ShaderBatchImpl.kt
@@ -48,6 +48,10 @@ open class ShaderBatchImpl(
 	 */
 	constructor(gl: CachedGl20, isDynamic: Boolean = true) : this(gl.wrapped, isDynamic)
 
+	init {
+		require(gl !is CachedGl20) { "ShaderBatchImpl requires either the unwrapped Gl20 instance or use the CachedGl20 constructor" }
+	}
+
 	override val vertexAttributes: VertexAttributes = standardVertexAttributes
 
 	/**
@@ -178,15 +182,19 @@ open class ShaderBatchImpl(
 		flush()
 		gl.bindBuffer(Gl20.ARRAY_BUFFER, vertexComponentsBuffer)
 		gl.bindBuffer(Gl20.ELEMENT_ARRAY_BUFFER, indicesBuffer)
+		indices.mark()
 		indices.flip()
 		gl.bufferData(Gl20.ELEMENT_ARRAY_BUFFER, indices.limit shl 1, usage) // Allocate
 		gl.bufferDatasv(Gl20.ELEMENT_ARRAY_BUFFER, indices, usage) // Upload
+		indices.reset()
 
+		vertexComponents.mark()
 		vertexComponents.flip()
 		gl.bufferData(Gl20.ARRAY_BUFFER, vertexComponents.limit shl 2, usage) // Allocate
 		gl.bufferDatafv(Gl20.ARRAY_BUFFER, vertexComponents, usage) // Upload
 		gl.bindBuffer(Gl20.ARRAY_BUFFER, null)
 		gl.bindBuffer(Gl20.ELEMENT_ARRAY_BUFFER, null)
+		vertexComponents.reset()
 	}
 
 	/**