From 9398ac5088a2111a9c07e991231c6280dbfeb6d9 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 10 Mar 2020 12:40:24 -0400 Subject: [PATCH] GL fixes --- core/src/mindustry/core/Renderer.java | 4 +--- core/src/mindustry/graphics/Pixelator.java | 3 --- gradle.properties | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java index e4f6765dbe..d01a484996 100644 --- a/core/src/mindustry/core/Renderer.java +++ b/core/src/mindustry/core/Renderer.java @@ -120,7 +120,7 @@ public class Renderer implements ApplicationListener{ } bloom = new Bloom(true); bloom.setClearColor(0f, 0f, 0f, 0f); - }catch(Exception e){ + }catch(Throwable e){ e.printStackTrace(); settings.put("bloom", false); settings.save(); @@ -339,10 +339,8 @@ public class Renderer implements ApplicationListener{ camera.height = h; camera.position.x = w / 2f + tilesize / 2f; camera.position.y = h / 2f + tilesize / 2f; - Draw.flush(); buffer.begin(); draw(); - Draw.flush(); buffer.end(); disableUI = false; camera.width = vpW; diff --git a/core/src/mindustry/graphics/Pixelator.java b/core/src/mindustry/graphics/Pixelator.java index 5d06d4991d..438839f44f 100644 --- a/core/src/mindustry/graphics/Pixelator.java +++ b/core/src/mindustry/graphics/Pixelator.java @@ -38,11 +38,8 @@ public class Pixelator implements Disposable{ buffer.resize(w, h); } - Draw.flush(); buffer.begin(); renderer.draw(); - - Draw.flush(); buffer.end(); Draw.blend(Blending.disabled); diff --git a/gradle.properties b/gradle.properties index 73345d9328..d6c5e02b63 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms256m -Xmx1024m -archash=f5b00862559f6cc2bbe3527cf452e6eb9c714c45 +archash=c67c4f5e41e941f74cf184d67b486545fb2dfb46