diff options
| -rw-r--r-- | gfx/gl/shaders/directionalLight.fs | 2 | ||||
| -rw-r--r-- | gfx/gl/shaders/materialCommon.glsl | 2 | ||||
| -rw-r--r-- | gfx/gl/shaders/materialInterface.glsl | 2 | ||||
| -rw-r--r-- | glsl.jam | 3 |
4 files changed, 6 insertions, 3 deletions
diff --git a/gfx/gl/shaders/directionalLight.fs b/gfx/gl/shaders/directionalLight.fs index cdf0389..7ee3452 100644 --- a/gfx/gl/shaders/directionalLight.fs +++ b/gfx/gl/shaders/directionalLight.fs @@ -48,7 +48,7 @@ isShaded(vec4 Position) return getShadow(positionInLightSpace, m, texelSize); } } - return 1; + return 1.0; } void diff --git a/gfx/gl/shaders/materialCommon.glsl b/gfx/gl/shaders/materialCommon.glsl index 3fe2237..4c2fbf8 100644 --- a/gfx/gl/shaders/materialCommon.glsl +++ b/gfx/gl/shaders/materialCommon.glsl @@ -13,7 +13,7 @@ map(uint mapmode, float value) discard; } } - return 0; + return 0.0; } vec2 diff --git a/gfx/gl/shaders/materialInterface.glsl b/gfx/gl/shaders/materialInterface.glsl index f2ca297..52eee80 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, .fs, in, out)) INOUT vec3 FragPos; INOUT vec2 TexCoords; @@ -32,7 +32,10 @@ type.set-scanner GL_FRAGMENT_SHADER : m4-scanner ; actions glsl.embed { + set -e m4 -I$(2:D) -DSOURCE=$(2) -DOUTPUT=$(1[3]) -DNAME=$(2:B) -DTYPE=$(2:S) -DGLTYPE=$(OPTIONS) $(2) > $(1[3]) + STAGE=$(OPTIONS:L) + glslangValidator -S ${STAGE:3:4} -DGL_MAX_GEOMETRY_OUTPUT_VERTICES=64 -l $(1[3]) clang-format -i $(1[3]) m4 -I$(2:D) -DSOURCE=$(1[3]) -DOUTPUT=$(1[3]) -DNAME=$(2:B) -DTYPE=$(2:S) -DGLTYPE=$(OPTIONS) lib/embed-glsl.h.m4 > $(1[2]) m4 -I$(2:D) -DSOURCE=$(1[3]) -DOUTPUT=$(1[3]) -DNAME=$(2:B) -DTYPE=$(2:S) -DGLTYPE=$(OPTIONS) lib/embed-glsl.cpp.m4 > $(1[1]) |