Remove Out suffix from frag inputs as they no longer make sense in vulkan glsl.

Reverted half-chanced FilterGaussian2d until ready to fully change it.

Author: bryanedds

Nu/Nu.Gaia/Assets/Default/EnvironmentFilter.frag

@@ -15,7 +15,7 @@ layout(set = 1, binding = 0) uniform textureCube cubeMap;
 
 layout(set = 2, binding = 0) uniform sampler samp;
 
-layout(location = 0) in vec3 positionOut;
+layout(location = 0) in vec3 position;
 
 layout(location = 0) out vec4 frag;
 
@@ -79,7 +79,7 @@ void main()
     // compute normal
     float roughness = environmentFilter.roughness;
     float resolution = environmentFilter.resolution;
-    vec3 normal = normalize(positionOut);
+    vec3 normal = normalize(position);
 
     // make the simplifying assumption that v equals r equals the normal
     vec3 r = normal;

Nu/Nu.Gaia/Assets/Default/FilterBox1d.frag

@@ -4,7 +4,7 @@ layout(set = 0, binding = 0) uniform texture2D inputTexture;
 
 layout(set = 1, binding = 0) uniform sampler inputSampler;
 
-layout(location = 0) in vec2 texCoordsOut;
+layout(location = 0) in vec2 texCoords;
 
 layout(location = 0) out float frag;
 
@@ -19,7 +19,7 @@ void main()
         {
             float y = float(j);
             vec2 offset = vec2(x, y) * texelSize;
-            result += texture(sampler2D(inputTexture, inputSampler), texCoordsOut + offset).r;
+            result += texture(sampler2D(inputTexture, inputSampler), texCoords + offset).r;
         }
     }
     frag = result / 25.0f;

Nu/Nu.Gaia/Assets/Default/FilterFxaa.frag

@@ -12,7 +12,7 @@ layout(set = 0, binding = 1) uniform texture2D inputTexture;
 
 layout(set = 1, binding = 0) uniform sampler inputSampler;
 
-layout(location = 0) in vec2 texCoordsOut;
+layout(location = 0) in vec2 texCoords;
 
 layout(location = 0) out vec4 frag;
 
@@ -27,11 +27,11 @@ void main()
 
     // compute luminosity values
     vec3 lum = vec3(0.299, 0.587, 0.114);
-    float lumTL = dot(lum, texture(sampler2D(inputTexture, inputSampler), vec2(-1.0, -1.0) * texelSize + texCoordsOut.xy).xyz);
-    float lumTR = dot(lum, texture(sampler2D(inputTexture, inputSampler), vec2(+1.0, -1.0) * texelSize + texCoordsOut.xy).xyz);
-    float lumBL = dot(lum, texture(sampler2D(inputTexture, inputSampler), vec2(-1.0, +1.0) * texelSize + texCoordsOut.xy).xyz);
-    float lumBR = dot(lum, texture(sampler2D(inputTexture, inputSampler), vec2(+1.0, +1.0) * texelSize + texCoordsOut.xy).xyz);
-    float lumCC = dot(lum, texture(sampler2D(inputTexture, inputSampler), texCoordsOut.xy).xyz);
+    float lumTL = dot(lum, texture(sampler2D(inputTexture, inputSampler), vec2(-1.0, -1.0) * texelSize + texCoords.xy).xyz);
+    float lumTR = dot(lum, texture(sampler2D(inputTexture, inputSampler), vec2(+1.0, -1.0) * texelSize + texCoords.xy).xyz);
+    float lumBL = dot(lum, texture(sampler2D(inputTexture, inputSampler), vec2(-1.0, +1.0) * texelSize + texCoords.xy).xyz);
+    float lumBR = dot(lum, texture(sampler2D(inputTexture, inputSampler), vec2(+1.0, +1.0) * texelSize + texCoords.xy).xyz);
+    float lumCC = dot(lum, texture(sampler2D(inputTexture, inputSampler), texCoords.xy).xyz);
 
     // compute blur direction
     vec2 dir;
@@ -43,13 +43,13 @@ void main()
 
     // sample the texture in two locations along the computed direction to create an initial blurred color
     vec3 result1 = 0.5 * (
-        texture(sampler2D(inputTexture, inputSampler), dir * vec2(1.0 / 3.0 - 0.5) + texCoordsOut.xy).xyz +
-        texture(sampler2D(inputTexture, inputSampler), dir * vec2(2.0 / 3.0 - 0.5) + texCoordsOut.xy).xyz);
+        texture(sampler2D(inputTexture, inputSampler), dir * vec2(1.0 / 3.0 - 0.5) + texCoords.xy).xyz +
+        texture(sampler2D(inputTexture, inputSampler), dir * vec2(2.0 / 3.0 - 0.5) + texCoords.xy).xyz);
 
     // sample the texture at additional points and blend them with the initial blur to refine the result
     vec3 result2 = result1 * 0.5 + 0.25 * (
-        texture(sampler2D(inputTexture, inputSampler), dir * vec2(0.0 / 3.0 - 0.5) + texCoordsOut.xy).xyz +
-        texture(sampler2D(inputTexture, inputSampler), dir * vec2(3.0 / 3.0 - 0.5) + texCoordsOut.xy).xyz);
+        texture(sampler2D(inputTexture, inputSampler), dir * vec2(0.0 / 3.0 - 0.5) + texCoords.xy).xyz +
+        texture(sampler2D(inputTexture, inputSampler), dir * vec2(3.0 / 3.0 - 0.5) + texCoords.xy).xyz);
 
     // compute the minimum and maximum luminosity of the surrounding texels to use for edge detection
     float lumMin = min(lumCC, min(min(lumTL, lumTR), min(lumBL, lumBR)));

Nu/Nu.Gaia/Assets/Default/FilterGammaCorrection.frag

@@ -6,13 +6,13 @@ layout(set = 0, binding = 0) uniform texture2D inputTexture;
 
 layout(set = 1, binding = 0) uniform sampler inputSampler;
 
-layout(location = 0) in vec2 texCoordsOut;
+layout(location = 0) in vec2 texCoords;
 
 layout(location = 0) out vec4 frag;
 
 void main()
 {
-    vec3 color = texture(sampler2D(inputTexture, inputSampler), texCoordsOut, 0).rgb;
+    vec3 color = texture(sampler2D(inputTexture, inputSampler), texCoords, 0).rgb;
     color = pow(color, vec3(1.0 / GAMMA));
     frag = vec4(color, 1.0);
 }

…aia/Assets/Default/FilterGaussian2d.frag …aia/Assets/Default/FilterGaussian2d.glslNu/Nu.Gaia/Assets/Default/FilterGaussian2d.frag renamed to Nu/Nu.Gaia/Assets/Default/FilterGaussian2d.glsl Nu/Nu.Gaia/Assets/Default/FilterGaussian2d.frag renamed to Nu/Nu.Gaia/Assets/Default/FilterGaussian2d.glsl

@@ -12,7 +12,7 @@ layout(set = 1, binding = 0) uniform texture2D esmTexture;
 
 layout(set = 2, binding = 0) uniform sampler filteredSampler;
 
-layout(location = 0) in vec2 texCoordsOut;
+layout(location = 0) in vec2 texCoords;
 
 layout(location = 0) out vec2 frag;
 
@@ -22,9 +22,9 @@ void main()
         gaussianEsm.scale *
         gaussianEsm.radius;
     frag =
-        texture(sampler2D(esmTexture, filteredSampler), texCoordsOut + vec2(-2.0) * scalar).xy * (1.0 / 16.0) +
-        texture(sampler2D(esmTexture, filteredSampler), texCoordsOut + vec2(-1.0) * scalar).xy * (4.0 / 16.0) +
-        texture(sampler2D(esmTexture, filteredSampler), texCoordsOut + vec2( 0.0) * scalar).xy * (6.0 / 16.0) +
-        texture(sampler2D(esmTexture, filteredSampler), texCoordsOut + vec2( 1.0) * scalar).xy * (4.0 / 16.0) +
-        texture(sampler2D(esmTexture, filteredSampler), texCoordsOut + vec2( 2.0) * scalar).xy * (1.0 / 16.0);
+        texture(sampler2D(esmTexture, filteredSampler), texCoords + vec2(-2.0) * scalar).xy * (1.0 / 16.0) +
+        texture(sampler2D(esmTexture, filteredSampler), texCoords + vec2(-1.0) * scalar).xy * (4.0 / 16.0) +
+        texture(sampler2D(esmTexture, filteredSampler), texCoords + vec2( 0.0) * scalar).xy * (6.0 / 16.0) +
+        texture(sampler2D(esmTexture, filteredSampler), texCoords + vec2( 1.0) * scalar).xy * (4.0 / 16.0) +
+        texture(sampler2D(esmTexture, filteredSampler), texCoords + vec2( 2.0) * scalar).xy * (1.0 / 16.0);
 }

Nu/Nu.Gaia/Assets/Default/FilterGaussian2d.vert

@@ -16,7 +16,7 @@ layout(set = 0, binding = 1) uniform texture2D inputTexture;
 
 layout(set = 1, binding = 0) uniform sampler inputSampler;
 
-layout(location = 0) in vec2 texCoordsOut;
+layout(location = 0) in vec2 texCoords;
 
 layout(location = 0) out vec4 frag;
 
@@ -216,7 +216,7 @@ vec3 applyKronosNeutralToneMap(vec3 color)
 void main()
 {
     // apply tone mapping
-    vec3 color = texture(sampler2D(inputTexture, inputSampler), texCoordsOut, 0).xyz;
+    vec3 color = texture(sampler2D(inputTexture, inputSampler), texCoords, 0).xyz;
     switch (toneMapping.toneMapType)
     {
         case 0: color = applyAgXToneMap(color * toneMapping.lightExposure, toneMapping.toneMapSlope, toneMapping.toneMapOffset, toneMapping.toneMapPower, toneMapping.toneMapSaturation); break;

Nu/Nu.Gaia/Assets/Default/FilterGaussianEsm.frag

@@ -7,14 +7,14 @@ layout(set = 1, binding = 0) uniform textureCube cubeMap;
 
 layout(set = 2, binding = 0) uniform sampler samp;
 
-layout(location = 0) in vec3 positionOut;
+layout(location = 0) in vec3 position;
 
 layout(location = 0) out vec4 frag;
 
 void main()
 {
     // compute normal
-    vec3 normal = normalize(positionOut);
+    vec3 normal = normalize(position);
 
     // calculate tangent space
     vec3 up = vec3(0.0, 1.0, 0.0);

Nu/Nu.Gaia/Assets/Default/FilterToneMapping.frag

@@ -29,7 +29,7 @@ layout(set = 0, binding = 4) uniform texture2D lightMappingTexture;
 
 layout(set = 1, binding = 0) uniform sampler colorSampler;
 
-layout(location = 0) in vec2 texCoordsOut;
+layout(location = 0) in vec2 texCoords;
 
 layout(location = 0) out vec4 frag;
 
@@ -44,14 +44,14 @@ vec4 depthToPosition(float depth, vec2 texCoords)
 void main()
 {
     // ensure fragment was written
-    float depth = texture(sampler2D(depthTexture, colorSampler), texCoordsOut).r;
+    float depth = texture(sampler2D(depthTexture, colorSampler), texCoords).r;
     if (depth == 0.0) discard;
 
     // recover position from depth
-    vec4 position = depthToPosition(depth, texCoordsOut);
+    vec4 position = depthToPosition(depth, texCoords);
 
     // retrieve light mapping data
-    vec4 lmData = texture(sampler2D(lightMappingTexture, colorSampler), texCoordsOut);
+    vec4 lmData = texture(sampler2D(lightMappingTexture, colorSampler), texCoords);
     int lm1 = int(lmData.r) - 1;
     int lm2 = int(lmData.g) - 1;
     float lmRatio = lmData.b;