Skip to content

Prevent material double free then crash #597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 19, 2025
Merged

Prevent material double free then crash #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions sceneview/src/main/java/io/github/sceneview/loaders/MaterialLoader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,14 +301,18 @@ class MaterialLoader(
}

fun destroyMaterial(material: Material) {
engine.safeDestroyMaterialInstance(material.defaultInstance)
engine.safeDestroyMaterial(material)
materials -= material
if (material in materials) {
engine.safeDestroyMaterialInstance(material.defaultInstance)
engine.safeDestroyMaterial(material)
materials -= material
}
}

fun destroyMaterialInstance(materialInstance: MaterialInstance) {
engine.safeDestroyMaterialInstance(materialInstance)
materialInstances -= materialInstance
if (materialInstance in materialInstances) {
engine.safeDestroyMaterialInstance(materialInstance)
materialInstances -= materialInstance
}
}

fun destroy() {
Expand All @@ -319,4 +323,4 @@ class MaterialLoader(
materials.toList().forEach { destroyMaterial(it) }
materials.clear()
}
}
}
24 changes: 15 additions & 9 deletions sceneview/src/main/java/io/github/sceneview/node/ViewNode2.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ import io.github.sceneview.safeDestroyTexture
class ViewNode2(
engine: Engine,
val windowManager: WindowManager,
materialLoader: MaterialLoader,
private val materialLoader: MaterialLoader,
view: View,
unlit: Boolean = false,
invertFrontFaceWinding: Boolean = false,
Expand Down Expand Up @@ -102,13 +102,18 @@ class ViewNode2(
setExternalStream(engine, stream)
}

init {
materialInstance = materialLoader.createViewInstance(
viewTexture = texture,
unlit = unlit,
invertFrontFaceWinding = invertFrontFaceWinding
)
override var materialInstance: MaterialInstance = materialLoader.createViewInstance(viewTexture = texture,
unlit = unlit,
invertFrontFaceWinding = invertFrontFaceWinding
).also {
setMaterialInstanceAt(0, it)
}
set(value) {
val old = field
materialLoader.destroyMaterialInstance(old)
field = value
setMaterialInstanceAt(0, value)
}

constructor(
engine: Engine,
Expand Down Expand Up @@ -293,7 +298,7 @@ class ViewNode2(

windowManager.removeView(layout)

engine.safeDestroyMaterialInstance(materialInstance)
materialLoader.destroyMaterialInstance(materialInstance)
engine.safeDestroyTexture(texture)
engine.safeDestroyStream(stream)

Expand Down Expand Up @@ -426,5 +431,6 @@ class ViewNode2(


private fun Context.findActivity(): ComponentActivity? {
return generateSequence(this) { (it as? ContextWrapper)?.baseContext }.filterIsInstance<ComponentActivity>().firstOrNull()
return generateSequence(this) { (it as? ContextWrapper)?.baseContext }.filterIsInstance<ComponentActivity>()
.firstOrNull()
}