From ba3615a8e14f5c1066a3a7b560490fde57a62a54 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Fri, 11 Feb 2022 17:59:21 +0900 Subject: [PATCH] shader version shenanigan --- src/net/torvald/terrarum/ui/UIHandler.kt | 2 +- src/shaders/4096_bayer.frag | 2 +- src/shaders/4096_bayer_aaa1.frag | 2 +- src/shaders/4096_bayer_rgb1.frag | 2 +- src/shaders/4096_bayer_skyboxfill.frag | 2 +- src/shaders/aaaxmul.frag | 2 +- src/shaders/alphadither.frag | 2 +- src/shaders/blendGlow.frag | 2 +- src/shaders/blur_dither.frag | 2 +- src/shaders/boxdown.frag | 2 +- src/shaders/boxup.frag | 2 +- src/shaders/crt.frag | 2 +- src/shaders/diff.frag | 3 +-- src/shaders/hicolour.frag | 2 +- src/shaders/kawasedown.frag | 2 +- src/shaders/kawaseup.frag | 2 +- src/shaders/loadingCircle.frag | 2 +- src/shaders/passthrurgb.frag | 2 +- src/shaders/rgbxmul.frag | 2 +- src/shaders/skyboxfill.frag | 2 +- src/shaders/tiling.frag | 3 +-- src/shaders/tiling_dither.frag | 3 +-- 22 files changed, 22 insertions(+), 25 deletions(-) diff --git a/src/net/torvald/terrarum/ui/UIHandler.kt b/src/net/torvald/terrarum/ui/UIHandler.kt index 6f15c35e7..fc333e3bf 100644 --- a/src/net/torvald/terrarum/ui/UIHandler.kt +++ b/src/net/torvald/terrarum/ui/UIHandler.kt @@ -36,7 +36,7 @@ class UIHandler(//var UI: UICanvas, companion object { private val SHADER_PROG_FRAG = """ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif diff --git a/src/shaders/4096_bayer.frag b/src/shaders/4096_bayer.frag index 956d6ae79..2cdbb25e0 100644 --- a/src/shaders/4096_bayer.frag +++ b/src/shaders/4096_bayer.frag @@ -3,7 +3,7 @@ * http://momentsingraphics.de/BlueNoise.html */ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif diff --git a/src/shaders/4096_bayer_aaa1.frag b/src/shaders/4096_bayer_aaa1.frag index 63f90a49b..2946235bc 100644 --- a/src/shaders/4096_bayer_aaa1.frag +++ b/src/shaders/4096_bayer_aaa1.frag @@ -3,7 +3,7 @@ * http://momentsingraphics.de/BlueNoise.html */ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif diff --git a/src/shaders/4096_bayer_rgb1.frag b/src/shaders/4096_bayer_rgb1.frag index 2aa8a1b6f..409f24258 100644 --- a/src/shaders/4096_bayer_rgb1.frag +++ b/src/shaders/4096_bayer_rgb1.frag @@ -3,7 +3,7 @@ * http://momentsingraphics.de/BlueNoise.html */ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif diff --git a/src/shaders/4096_bayer_skyboxfill.frag b/src/shaders/4096_bayer_skyboxfill.frag index 2762c5c8a..9653a92ef 100644 --- a/src/shaders/4096_bayer_skyboxfill.frag +++ b/src/shaders/4096_bayer_skyboxfill.frag @@ -1,4 +1,4 @@ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif diff --git a/src/shaders/aaaxmul.frag b/src/shaders/aaaxmul.frag index b19cf7fa5..29971fa77 100644 --- a/src/shaders/aaaxmul.frag +++ b/src/shaders/aaaxmul.frag @@ -1,4 +1,4 @@ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif diff --git a/src/shaders/alphadither.frag b/src/shaders/alphadither.frag index e4080020e..77f893d15 100644 --- a/src/shaders/alphadither.frag +++ b/src/shaders/alphadither.frag @@ -1,4 +1,4 @@ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif diff --git a/src/shaders/blendGlow.frag b/src/shaders/blendGlow.frag index 31a3499f9..d53aa148d 100644 --- a/src/shaders/blendGlow.frag +++ b/src/shaders/blendGlow.frag @@ -1,4 +1,4 @@ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif diff --git a/src/shaders/blur_dither.frag b/src/shaders/blur_dither.frag index b2c14a13e..eb2cb5475 100644 --- a/src/shaders/blur_dither.frag +++ b/src/shaders/blur_dither.frag @@ -2,7 +2,7 @@ * Blue Noise texture created by Christoph Peters, released under CC0 * http://momentsingraphics.de/BlueNoise.html */ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif diff --git a/src/shaders/boxdown.frag b/src/shaders/boxdown.frag index 6d1e1b777..e8e7a87b2 100644 --- a/src/shaders/boxdown.frag +++ b/src/shaders/boxdown.frag @@ -1,4 +1,4 @@ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif diff --git a/src/shaders/boxup.frag b/src/shaders/boxup.frag index 6d1e1b777..e8e7a87b2 100644 --- a/src/shaders/boxup.frag +++ b/src/shaders/boxup.frag @@ -1,4 +1,4 @@ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif diff --git a/src/shaders/crt.frag b/src/shaders/crt.frag index ff51988ae..75f1b56dc 100644 --- a/src/shaders/crt.frag +++ b/src/shaders/crt.frag @@ -1,4 +1,4 @@ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif diff --git a/src/shaders/diff.frag b/src/shaders/diff.frag index 8ec5c0004..b14fa041c 100644 --- a/src/shaders/diff.frag +++ b/src/shaders/diff.frag @@ -1,8 +1,7 @@ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif -#extension GL_EXT_gpu_shader4 : enable varying vec4 v_color; diff --git a/src/shaders/hicolour.frag b/src/shaders/hicolour.frag index f28ccbaec..d1eaa040f 100644 --- a/src/shaders/hicolour.frag +++ b/src/shaders/hicolour.frag @@ -1,4 +1,4 @@ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif diff --git a/src/shaders/kawasedown.frag b/src/shaders/kawasedown.frag index 23a3eecf5..2586a6cb8 100644 --- a/src/shaders/kawasedown.frag +++ b/src/shaders/kawasedown.frag @@ -1,4 +1,4 @@ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif diff --git a/src/shaders/kawaseup.frag b/src/shaders/kawaseup.frag index 77adb610d..51731b2b4 100644 --- a/src/shaders/kawaseup.frag +++ b/src/shaders/kawaseup.frag @@ -1,4 +1,4 @@ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif diff --git a/src/shaders/loadingCircle.frag b/src/shaders/loadingCircle.frag index ead29d661..0f27e28b2 100644 --- a/src/shaders/loadingCircle.frag +++ b/src/shaders/loadingCircle.frag @@ -1,4 +1,4 @@ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif diff --git a/src/shaders/passthrurgb.frag b/src/shaders/passthrurgb.frag index fd119cf4c..57918c361 100644 --- a/src/shaders/passthrurgb.frag +++ b/src/shaders/passthrurgb.frag @@ -1,4 +1,4 @@ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif diff --git a/src/shaders/rgbxmul.frag b/src/shaders/rgbxmul.frag index 0776232df..9bda4166a 100644 --- a/src/shaders/rgbxmul.frag +++ b/src/shaders/rgbxmul.frag @@ -1,4 +1,4 @@ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif diff --git a/src/shaders/skyboxfill.frag b/src/shaders/skyboxfill.frag index c2c42e534..7665d2ef1 100644 --- a/src/shaders/skyboxfill.frag +++ b/src/shaders/skyboxfill.frag @@ -1,4 +1,4 @@ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif diff --git a/src/shaders/tiling.frag b/src/shaders/tiling.frag index b12f02bbd..709797392 100644 --- a/src/shaders/tiling.frag +++ b/src/shaders/tiling.frag @@ -2,11 +2,10 @@ */ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif -#extension GL_EXT_gpu_shader4 : enable //layout(origin_upper_left) in vec4 gl_FragCoord; // commented; requires #version 150 or later // gl_FragCoord is origin to bottom-left diff --git a/src/shaders/tiling_dither.frag b/src/shaders/tiling_dither.frag index 5fc101a59..bcfb28627 100644 --- a/src/shaders/tiling_dither.frag +++ b/src/shaders/tiling_dither.frag @@ -2,11 +2,10 @@ */ -#version 120 +#version 130 #ifdef GL_ES precision mediump float; #endif -#extension GL_EXT_gpu_shader4 : enable varying vec4 v_color; varying vec2 v_texCoords;