From 1c0e562b6a08e98b94c21da521f13437fa5d1767 Mon Sep 17 00:00:00 2001 From: Jozufozu Date: Fri, 28 Feb 2025 22:00:14 -0800 Subject: [PATCH] Trust fall - Trigger a fallback if any exception is caught during rendering --- .../dev/engine_room/flywheel/backend/engine/EngineImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/EngineImpl.java b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/EngineImpl.java index f0381eecc..3f2a4cdb3 100644 --- a/common/src/backend/java/dev/engine_room/flywheel/backend/engine/EngineImpl.java +++ b/common/src/backend/java/dev/engine_room/flywheel/backend/engine/EngineImpl.java @@ -15,7 +15,6 @@ import dev.engine_room.flywheel.api.task.Plan; import dev.engine_room.flywheel.api.visualization.VisualEmbedding; import dev.engine_room.flywheel.api.visualization.VisualizationContext; import dev.engine_room.flywheel.backend.FlwBackend; -import dev.engine_room.flywheel.backend.compile.core.ShaderException; import dev.engine_room.flywheel.backend.engine.embed.EmbeddedEnvironment; import dev.engine_room.flywheel.backend.engine.embed.Environment; import dev.engine_room.flywheel.backend.engine.embed.EnvironmentStorage; @@ -96,7 +95,7 @@ public class EngineImpl implements Engine { Uniforms.update(context); environmentStorage.flush(); drawManager.render(lightStorage, environmentStorage); - } catch (ShaderException e) { + } catch (Exception e) { FlwBackend.LOGGER.error("Falling back", e); triggerFallback(); } @@ -106,7 +105,7 @@ public class EngineImpl implements Engine { public void renderCrumbling(RenderContext context, List crumblingBlocks) { try (var state = GlStateTracker.getRestoreState()) { drawManager.renderCrumbling(crumblingBlocks); - } catch (ShaderException e) { + } catch (Exception e) { FlwBackend.LOGGER.error("Falling back", e); triggerFallback(); }