Okay, so we're re-doing the render pipeline...!

leenkx/Shaders/std/gbuffer.glsl

@@ -15,12 +15,10 @@ vec3 getNor(const vec2 enc) {
 
 vec3 getPosView(const vec3 viewRay, const float depth, const vec2 cameraProj) {
 	float linearDepth = cameraProj.y / (cameraProj.x - depth);
-	//float linearDepth = cameraProj.y / ((depth * 0.5 + 0.5) - cameraProj.x);
 	return viewRay * linearDepth;
 }
 
 vec3 getPos(const vec3 eye, const vec3 eyeLook, const vec3 viewRay, const float depth, const vec2 cameraProj) {
-	// eyeLook, viewRay should be normalized
 	float linearDepth = cameraProj.y / ((depth * 0.5 + 0.5) - cameraProj.x);
 	float viewZDist = dot(eyeLook, viewRay);
 	vec3 wposition = eye + viewRay * (linearDepth / viewZDist);
@@ -28,7 +26,6 @@ vec3 getPos(const vec3 eye, const vec3 eyeLook, const vec3 viewRay, const float
 }
 
 vec3 getPosNoEye(const vec3 eyeLook, const vec3 viewRay, const float depth, const vec2 cameraProj) {
-	// eyeLook, viewRay should be normalized
 	float linearDepth = cameraProj.y / ((depth * 0.5 + 0.5) - cameraProj.x);
 	float viewZDist = dot(eyeLook, viewRay);
 	vec3 wposition = viewRay * (linearDepth / viewZDist);
@@ -71,6 +68,7 @@ vec3 getPos2NoEye(const vec3 eye, const mat4 invVP, const float depth, const vec
 	return pos.xyz - eye;
 }
 
+// Updated to support separate roughness/metalness storage
 float packFloat(const float f1, const float f2) {
 	return floor(f1 * 100.0) + min(f2, 1.0 - 1.0 / 100.0);
 }
@@ -80,7 +78,6 @@ vec2 unpackFloat(const float f) {
 }
 
 float packFloat2(const float f1, const float f2) {
-	// Higher f1 = less precise f2
 	return floor(f1 * 255.0) + min(f2, 1.0 - 1.0 / 100.0);
 }
 
@@ -101,21 +98,16 @@ vec3 decodeRGBM(const vec4 rgbm) {
 	return rgbm.rgb * rgbm.a * maxRange;
 }
 
-vec2 signNotZero(vec2 v)
-{
+vec2 signNotZero(vec2 v) {
 	return vec2((v.x >= 0.0) ? +1.0 : -1.0, (v.y >= 0.0) ? +1.0 : -1.0);
 }
 
-vec2 encode_oct(vec3 v)
-{
-	// Project the sphere onto the octahedron, and then onto the xy plane
+vec2 encode_oct(vec3 v) {
 	vec2 p = v.xy * (1.0 / (abs(v.x) + abs(v.y) + abs(v.z)));
-	// Reflect the folds of the lower hemisphere over the diagonals
 	return (v.z <= 0.0) ? ((1.0 - abs(p.yx)) * signNotZero(p)) : p;
 }
 
-vec3 decode_oct(vec2 e)
-{
+vec3 decode_oct(vec2 e) {
 	vec3 v = vec3(e.xy, 1.0 - abs(e.x) - abs(e.y));
 	if (v.z < 0) v.xy = (1.0 - abs(v.yx)) * signNotZero(v.xy);
 	return normalize(v);
@@ -147,9 +139,6 @@ vec3 decNor(uint val) {
 	return normal;
 }
 
-/**
-	Packs a float in [0, 1] and an integer in [0..15] into a single 16 bit float value.
-**/
 float packFloatInt16(const float f, const uint i) {
 	const uint numBitFloat = 12;
 	const float maxValFloat = float((1 << numBitFloat) - 1);
@@ -165,9 +154,8 @@ void unpackFloatInt16(const float val, out float f, out uint i) {
 	const float maxValFloat = float((1 << numBitFloat) - 1);
 
 	const uint bitsValue = uint(val);
-
 	i = bitsValue >> numBitFloat;
 	f = (bitsValue & ~(0xF << numBitFloat)) / maxValFloat;
 }
 
-#endif
+#endif