From 98ad0bfc6c9eef518e989b82aa22331f80b05755 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sun, 29 Nov 2020 16:42:01 +0900 Subject: [PATCH] see commit below --- assets/4096_bayer.frag | 2 +- assets/4096_bayer_skyboxfill.frag | 2 +- assets/aaaxmul.frag | 2 +- assets/blendGlow.frag | 2 +- assets/crt.frag | 2 +- assets/hicolour.frag | 2 +- assets/loadingCircle.frag | 2 +- assets/passthrurgb.frag | 2 +- assets/raytracelight.frag | 2 +- assets/rgbxmul.frag | 2 +- assets/skyboxfill.frag | 2 +- assets/tiling.frag | 2 +- src/net/torvald/terrarum/AppLoader.java | 2 +- src/net/torvald/terrarum/ui/UIHandler.kt | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/assets/4096_bayer.frag b/assets/4096_bayer.frag index 3c57f2f2a..72a655769 100644 --- a/assets/4096_bayer.frag +++ b/assets/4096_bayer.frag @@ -1,4 +1,4 @@ -#version 130 +#version 120 #ifdef GL_ES precision mediump float; #endif diff --git a/assets/4096_bayer_skyboxfill.frag b/assets/4096_bayer_skyboxfill.frag index 7296c8118..7828849f5 100644 --- a/assets/4096_bayer_skyboxfill.frag +++ b/assets/4096_bayer_skyboxfill.frag @@ -1,4 +1,4 @@ -#version 130 +#version 120 #ifdef GL_ES precision mediump float; #endif diff --git a/assets/aaaxmul.frag b/assets/aaaxmul.frag index 29971fa77..b19cf7fa5 100644 --- a/assets/aaaxmul.frag +++ b/assets/aaaxmul.frag @@ -1,4 +1,4 @@ -#version 130 +#version 120 #ifdef GL_ES precision mediump float; #endif diff --git a/assets/blendGlow.frag b/assets/blendGlow.frag index d53aa148d..31a3499f9 100644 --- a/assets/blendGlow.frag +++ b/assets/blendGlow.frag @@ -1,4 +1,4 @@ -#version 130 +#version 120 #ifdef GL_ES precision mediump float; #endif diff --git a/assets/crt.frag b/assets/crt.frag index 75f1b56dc..ff51988ae 100644 --- a/assets/crt.frag +++ b/assets/crt.frag @@ -1,4 +1,4 @@ -#version 130 +#version 120 #ifdef GL_ES precision mediump float; #endif diff --git a/assets/hicolour.frag b/assets/hicolour.frag index c64485eaa..49a673f06 100644 --- a/assets/hicolour.frag +++ b/assets/hicolour.frag @@ -1,4 +1,4 @@ -#version 130 +#version 120 #ifdef GL_ES precision mediump float; #endif diff --git a/assets/loadingCircle.frag b/assets/loadingCircle.frag index 0f27e28b2..ead29d661 100644 --- a/assets/loadingCircle.frag +++ b/assets/loadingCircle.frag @@ -1,4 +1,4 @@ -#version 130 +#version 120 #ifdef GL_ES precision mediump float; #endif diff --git a/assets/passthrurgb.frag b/assets/passthrurgb.frag index 57918c361..fd119cf4c 100644 --- a/assets/passthrurgb.frag +++ b/assets/passthrurgb.frag @@ -1,4 +1,4 @@ -#version 130 +#version 120 #ifdef GL_ES precision mediump float; #endif diff --git a/assets/raytracelight.frag b/assets/raytracelight.frag index 3b7cf0069..fcf21433f 100644 --- a/assets/raytracelight.frag +++ b/assets/raytracelight.frag @@ -1,4 +1,4 @@ -#version 130 +#version 120 #ifdef GL_ES precision mediump float; #endif diff --git a/assets/rgbxmul.frag b/assets/rgbxmul.frag index 9bda4166a..0776232df 100644 --- a/assets/rgbxmul.frag +++ b/assets/rgbxmul.frag @@ -1,4 +1,4 @@ -#version 130 +#version 120 #ifdef GL_ES precision mediump float; #endif diff --git a/assets/skyboxfill.frag b/assets/skyboxfill.frag index 7665d2ef1..c2c42e534 100644 --- a/assets/skyboxfill.frag +++ b/assets/skyboxfill.frag @@ -1,4 +1,4 @@ -#version 130 +#version 120 #ifdef GL_ES precision mediump float; #endif diff --git a/assets/tiling.frag b/assets/tiling.frag index d59f3d253..b71bba952 100644 --- a/assets/tiling.frag +++ b/assets/tiling.frag @@ -2,7 +2,7 @@ */ -#version 130 +#version 120 #ifdef GL_ES precision mediump float; #endif diff --git a/src/net/torvald/terrarum/AppLoader.java b/src/net/torvald/terrarum/AppLoader.java index 98a8ef024..701b59491 100644 --- a/src/net/torvald/terrarum/AppLoader.java +++ b/src/net/torvald/terrarum/AppLoader.java @@ -315,7 +315,7 @@ public class AppLoader implements ApplicationListener { ShaderProgram.pedantic = false; LwjglApplicationConfiguration appConfig = new LwjglApplicationConfiguration(); - appConfig.useGL30 = false; // utilising some GL trickeries, need this to be TRUE + appConfig.useGL30 = false; // https://stackoverflow.com/questions/46753218/libgdx-should-i-use-gl30 appConfig.vSyncEnabled = getConfigBoolean("usevsync"); appConfig.resizable = false;//true; appConfig.width = getConfigInt("screenwidth"); diff --git a/src/net/torvald/terrarum/ui/UIHandler.kt b/src/net/torvald/terrarum/ui/UIHandler.kt index 8b31e0e68..8c84d5754 100644 --- a/src/net/torvald/terrarum/ui/UIHandler.kt +++ b/src/net/torvald/terrarum/ui/UIHandler.kt @@ -34,7 +34,7 @@ class UIHandler(//var UI: UICanvas, companion object { private val SHADER_PROG_FRAG = """ -#version 130 +#version 120 #ifdef GL_ES precision mediump float; #endif