diff options
Diffstat (limited to 'gfx/gl/shaders')
| -rw-r--r-- | gfx/gl/shaders/commonShadowPoint.geom (renamed from gfx/gl/shaders/commonShadowPoint.gs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/directionalLight.frag (renamed from gfx/gl/shaders/directionalLight.fs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/dynamicPoint.vert (renamed from gfx/gl/shaders/dynamicPoint.vs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/dynamicPointInst.vert (renamed from gfx/gl/shaders/dynamicPointInst.vs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/fixedPoint.vert (renamed from gfx/gl/shaders/fixedPoint.vs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/landmass.frag (renamed from gfx/gl/shaders/landmass.fs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/landmass.vert (renamed from gfx/gl/shaders/landmass.vs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/lighting.frag (renamed from gfx/gl/shaders/lighting.fs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/lighting.vert (renamed from gfx/gl/shaders/lighting.vs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/material.frag (renamed from gfx/gl/shaders/material.fs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/materialInterface.glsl | 2 | ||||
| -rw-r--r-- | gfx/gl/shaders/network.frag (renamed from gfx/gl/shaders/network.fs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/networkCommon.glsl | 2 | ||||
| -rw-r--r-- | gfx/gl/shaders/networkCurve.geom (renamed from gfx/gl/shaders/networkCurve.gs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/networkCurve.tesc (renamed from gfx/gl/shaders/networkCurve.tcs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/networkCurve.tese (renamed from gfx/gl/shaders/networkCurve.tes) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/networkCurve.vert (renamed from gfx/gl/shaders/networkCurve.vs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/networkStraight.geom (renamed from gfx/gl/shaders/networkStraight.gs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/networkStraight.vert (renamed from gfx/gl/shaders/networkStraight.vs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/pointLight.frag (renamed from gfx/gl/shaders/pointLight.fs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/pointLight.geom (renamed from gfx/gl/shaders/pointLight.gs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/pointLight.vert (renamed from gfx/gl/shaders/pointLight.vs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/shadowDynamicPoint.vert (renamed from gfx/gl/shaders/shadowDynamicPoint.vs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/shadowDynamicPointInst.vert (renamed from gfx/gl/shaders/shadowDynamicPointInst.vs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/shadowDynamicPointInstWithTextures.frag (renamed from gfx/gl/shaders/shadowDynamicPointInstWithTextures.fs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/shadowDynamicPointInstWithTextures.geom | 3 | ||||
| -rw-r--r-- | gfx/gl/shaders/shadowDynamicPointInstWithTextures.gs | 3 | ||||
| -rw-r--r-- | gfx/gl/shaders/shadowDynamicPointInstWithTextures.vert (renamed from gfx/gl/shaders/shadowDynamicPointInstWithTextures.vs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/shadowDynamicPointStencil.frag (renamed from gfx/gl/shaders/shadowDynamicPointStencil.fs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/shadowDynamicPointStencil.geom (renamed from gfx/gl/shaders/shadowDynamicPointStencil.gs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/shadowDynamicPointStencil.vert (renamed from gfx/gl/shaders/shadowDynamicPointStencil.vs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/shadowLandmass.vert (renamed from gfx/gl/shaders/shadowLandmass.vs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/shadowStencil.frag (renamed from gfx/gl/shaders/shadowStencil.fs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/shadowStencil.geom (renamed from gfx/gl/shaders/shadowStencil.gs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/shadowStencil.vert (renamed from gfx/gl/shaders/shadowStencil.vs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/spotLight.frag (renamed from gfx/gl/shaders/spotLight.fs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/spotLight.geom (renamed from gfx/gl/shaders/spotLight.gs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/spotLight.vert (renamed from gfx/gl/shaders/spotLight.vs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/water.frag (renamed from gfx/gl/shaders/water.fs) | 0 | ||||
| -rw-r--r-- | gfx/gl/shaders/water.vert (renamed from gfx/gl/shaders/water.vs) | 0 |
40 files changed, 5 insertions, 5 deletions
diff --git a/gfx/gl/shaders/commonShadowPoint.gs b/gfx/gl/shaders/commonShadowPoint.geom index a515d97..a515d97 100644 --- a/gfx/gl/shaders/commonShadowPoint.gs +++ b/gfx/gl/shaders/commonShadowPoint.geom diff --git a/gfx/gl/shaders/directionalLight.fs b/gfx/gl/shaders/directionalLight.frag index e5ebfb0..e5ebfb0 100644 --- a/gfx/gl/shaders/directionalLight.fs +++ b/gfx/gl/shaders/directionalLight.frag diff --git a/gfx/gl/shaders/dynamicPoint.vs b/gfx/gl/shaders/dynamicPoint.vert index cd5fc26..cd5fc26 100644 --- a/gfx/gl/shaders/dynamicPoint.vs +++ b/gfx/gl/shaders/dynamicPoint.vert diff --git a/gfx/gl/shaders/dynamicPointInst.vs b/gfx/gl/shaders/dynamicPointInst.vert index 46fead9..46fead9 100644 --- a/gfx/gl/shaders/dynamicPointInst.vs +++ b/gfx/gl/shaders/dynamicPointInst.vert diff --git a/gfx/gl/shaders/fixedPoint.vs b/gfx/gl/shaders/fixedPoint.vert index 9201251..9201251 100644 --- a/gfx/gl/shaders/fixedPoint.vs +++ b/gfx/gl/shaders/fixedPoint.vert diff --git a/gfx/gl/shaders/landmass.fs b/gfx/gl/shaders/landmass.frag index b5c7fa1..b5c7fa1 100644 --- a/gfx/gl/shaders/landmass.fs +++ b/gfx/gl/shaders/landmass.frag diff --git a/gfx/gl/shaders/landmass.vs b/gfx/gl/shaders/landmass.vert index 91fc7f8..91fc7f8 100644 --- a/gfx/gl/shaders/landmass.vs +++ b/gfx/gl/shaders/landmass.vert diff --git a/gfx/gl/shaders/lighting.fs b/gfx/gl/shaders/lighting.frag index b5c6c8b..b5c6c8b 100644 --- a/gfx/gl/shaders/lighting.fs +++ b/gfx/gl/shaders/lighting.frag diff --git a/gfx/gl/shaders/lighting.vs b/gfx/gl/shaders/lighting.vert index 1046379..1046379 100644 --- a/gfx/gl/shaders/lighting.vs +++ b/gfx/gl/shaders/lighting.vert diff --git a/gfx/gl/shaders/material.fs b/gfx/gl/shaders/material.frag index 18a3169..18a3169 100644 --- a/gfx/gl/shaders/material.fs +++ b/gfx/gl/shaders/material.frag diff --git a/gfx/gl/shaders/materialInterface.glsl b/gfx/gl/shaders/materialInterface.glsl index 52eee80..bf78290 100644 --- a/gfx/gl/shaders/materialInterface.glsl +++ b/gfx/gl/shaders/materialInterface.glsl @@ -1,6 +1,6 @@ include(`materialDetail.glsl') -define(INOUT, ifelse(TYPE, .fs, in, out)) +define(INOUT, ifelse(TYPE, .frag, in, out)) INOUT vec3 FragPos; INOUT vec2 TexCoords; diff --git a/gfx/gl/shaders/network.fs b/gfx/gl/shaders/network.frag index 2f291ea..2f291ea 100644 --- a/gfx/gl/shaders/network.fs +++ b/gfx/gl/shaders/network.frag diff --git a/gfx/gl/shaders/networkCommon.glsl b/gfx/gl/shaders/networkCommon.glsl index 8b58e51..4ff24e8 100644 --- a/gfx/gl/shaders/networkCommon.glsl +++ b/gfx/gl/shaders/networkCommon.glsl @@ -18,7 +18,7 @@ segDist(const ivec3 a, const ivec3 b) } ifelse( - TYPE, .gs, + TYPE, .geom, // Begin: Geometry shader only function void doVertex(const ivec3 end, const uint v, const float texY, const mat2 rot) { ivec3 vpos = end + ivec3(rot * profile[v].xy, profile[v].z); diff --git a/gfx/gl/shaders/networkCurve.gs b/gfx/gl/shaders/networkCurve.geom index 1002fd4..1002fd4 100644 --- a/gfx/gl/shaders/networkCurve.gs +++ b/gfx/gl/shaders/networkCurve.geom diff --git a/gfx/gl/shaders/networkCurve.tcs b/gfx/gl/shaders/networkCurve.tesc index 4221e64..4221e64 100644 --- a/gfx/gl/shaders/networkCurve.tcs +++ b/gfx/gl/shaders/networkCurve.tesc diff --git a/gfx/gl/shaders/networkCurve.tes b/gfx/gl/shaders/networkCurve.tese index a02503c..a02503c 100644 --- a/gfx/gl/shaders/networkCurve.tes +++ b/gfx/gl/shaders/networkCurve.tese diff --git a/gfx/gl/shaders/networkCurve.vs b/gfx/gl/shaders/networkCurve.vert index 9cf149b..9cf149b 100644 --- a/gfx/gl/shaders/networkCurve.vs +++ b/gfx/gl/shaders/networkCurve.vert diff --git a/gfx/gl/shaders/networkStraight.gs b/gfx/gl/shaders/networkStraight.geom index 6abcecb..6abcecb 100644 --- a/gfx/gl/shaders/networkStraight.gs +++ b/gfx/gl/shaders/networkStraight.geom diff --git a/gfx/gl/shaders/networkStraight.vs b/gfx/gl/shaders/networkStraight.vert index 2834613..2834613 100644 --- a/gfx/gl/shaders/networkStraight.vs +++ b/gfx/gl/shaders/networkStraight.vert diff --git a/gfx/gl/shaders/pointLight.fs b/gfx/gl/shaders/pointLight.frag index bb2c453..bb2c453 100644 --- a/gfx/gl/shaders/pointLight.fs +++ b/gfx/gl/shaders/pointLight.frag diff --git a/gfx/gl/shaders/pointLight.gs b/gfx/gl/shaders/pointLight.geom index 1ee7e06..1ee7e06 100644 --- a/gfx/gl/shaders/pointLight.gs +++ b/gfx/gl/shaders/pointLight.geom diff --git a/gfx/gl/shaders/pointLight.vs b/gfx/gl/shaders/pointLight.vert index 2fd5418..2fd5418 100644 --- a/gfx/gl/shaders/pointLight.vs +++ b/gfx/gl/shaders/pointLight.vert diff --git a/gfx/gl/shaders/shadowDynamicPoint.vs b/gfx/gl/shaders/shadowDynamicPoint.vert index 907378e..907378e 100644 --- a/gfx/gl/shaders/shadowDynamicPoint.vs +++ b/gfx/gl/shaders/shadowDynamicPoint.vert diff --git a/gfx/gl/shaders/shadowDynamicPointInst.vs b/gfx/gl/shaders/shadowDynamicPointInst.vert index da4a76f..da4a76f 100644 --- a/gfx/gl/shaders/shadowDynamicPointInst.vs +++ b/gfx/gl/shaders/shadowDynamicPointInst.vert diff --git a/gfx/gl/shaders/shadowDynamicPointInstWithTextures.fs b/gfx/gl/shaders/shadowDynamicPointInstWithTextures.frag index cad9d9d..cad9d9d 100644 --- a/gfx/gl/shaders/shadowDynamicPointInstWithTextures.fs +++ b/gfx/gl/shaders/shadowDynamicPointInstWithTextures.frag diff --git a/gfx/gl/shaders/shadowDynamicPointInstWithTextures.geom b/gfx/gl/shaders/shadowDynamicPointInstWithTextures.geom new file mode 100644 index 0000000..3aaf9a8 --- /dev/null +++ b/gfx/gl/shaders/shadowDynamicPointInstWithTextures.geom @@ -0,0 +1,3 @@ +define(`TEXTURES', 1) + +include(`commonShadowPoint.geom') diff --git a/gfx/gl/shaders/shadowDynamicPointInstWithTextures.gs b/gfx/gl/shaders/shadowDynamicPointInstWithTextures.gs deleted file mode 100644 index e6e213e..0000000 --- a/gfx/gl/shaders/shadowDynamicPointInstWithTextures.gs +++ /dev/null @@ -1,3 +0,0 @@ -define(`TEXTURES', 1) - -include(`commonShadowPoint.gs') diff --git a/gfx/gl/shaders/shadowDynamicPointInstWithTextures.vs b/gfx/gl/shaders/shadowDynamicPointInstWithTextures.vert index 41a47b0..41a47b0 100644 --- a/gfx/gl/shaders/shadowDynamicPointInstWithTextures.vs +++ b/gfx/gl/shaders/shadowDynamicPointInstWithTextures.vert diff --git a/gfx/gl/shaders/shadowDynamicPointStencil.fs b/gfx/gl/shaders/shadowDynamicPointStencil.frag index d6b8a0e..d6b8a0e 100644 --- a/gfx/gl/shaders/shadowDynamicPointStencil.fs +++ b/gfx/gl/shaders/shadowDynamicPointStencil.frag diff --git a/gfx/gl/shaders/shadowDynamicPointStencil.gs b/gfx/gl/shaders/shadowDynamicPointStencil.geom index df8be8d..df8be8d 100644 --- a/gfx/gl/shaders/shadowDynamicPointStencil.gs +++ b/gfx/gl/shaders/shadowDynamicPointStencil.geom diff --git a/gfx/gl/shaders/shadowDynamicPointStencil.vs b/gfx/gl/shaders/shadowDynamicPointStencil.vert index b750b3e..b750b3e 100644 --- a/gfx/gl/shaders/shadowDynamicPointStencil.vs +++ b/gfx/gl/shaders/shadowDynamicPointStencil.vert diff --git a/gfx/gl/shaders/shadowLandmass.vs b/gfx/gl/shaders/shadowLandmass.vert index cf68fe5..cf68fe5 100644 --- a/gfx/gl/shaders/shadowLandmass.vs +++ b/gfx/gl/shaders/shadowLandmass.vert diff --git a/gfx/gl/shaders/shadowStencil.fs b/gfx/gl/shaders/shadowStencil.frag index 3269f69..3269f69 100644 --- a/gfx/gl/shaders/shadowStencil.fs +++ b/gfx/gl/shaders/shadowStencil.frag diff --git a/gfx/gl/shaders/shadowStencil.gs b/gfx/gl/shaders/shadowStencil.geom index 53a4c19..53a4c19 100644 --- a/gfx/gl/shaders/shadowStencil.gs +++ b/gfx/gl/shaders/shadowStencil.geom diff --git a/gfx/gl/shaders/shadowStencil.vs b/gfx/gl/shaders/shadowStencil.vert index e6286e6..e6286e6 100644 --- a/gfx/gl/shaders/shadowStencil.vs +++ b/gfx/gl/shaders/shadowStencil.vert diff --git a/gfx/gl/shaders/spotLight.fs b/gfx/gl/shaders/spotLight.frag index 1305dbd..1305dbd 100644 --- a/gfx/gl/shaders/spotLight.fs +++ b/gfx/gl/shaders/spotLight.frag diff --git a/gfx/gl/shaders/spotLight.gs b/gfx/gl/shaders/spotLight.geom index fec191e..fec191e 100644 --- a/gfx/gl/shaders/spotLight.gs +++ b/gfx/gl/shaders/spotLight.geom diff --git a/gfx/gl/shaders/spotLight.vs b/gfx/gl/shaders/spotLight.vert index 36d2ee5..36d2ee5 100644 --- a/gfx/gl/shaders/spotLight.vs +++ b/gfx/gl/shaders/spotLight.vert diff --git a/gfx/gl/shaders/water.fs b/gfx/gl/shaders/water.frag index a09e754..a09e754 100644 --- a/gfx/gl/shaders/water.fs +++ b/gfx/gl/shaders/water.frag diff --git a/gfx/gl/shaders/water.vs b/gfx/gl/shaders/water.vert index 60e4fb8..60e4fb8 100644 --- a/gfx/gl/shaders/water.vs +++ b/gfx/gl/shaders/water.vert |
