refactor normal storage

Author: devshgraphicsprogramming

examples_tests/22.RaytracedAO/common.glsl

@@ -21,6 +21,8 @@
 	};
 	#define mat4 nbl::core::matrix4SIMD
 	#define mat4x3 nbl::core::matrix3x4SIMD
+#else
+#include <nbl/builtin/glsl/ext/MitsubaLoader/instance_data_descriptor.glsl>
 #endif
 
 #endif

examples_tests/22.RaytracedAO/fillVisBuffer.frag

@@ -7,18 +7,18 @@
 #include <nbl/builtin/glsl/utils/normal_encode.glsl>
 
 
-layout(location = 0) flat in uint ObjectID;
+layout(location = 0) flat in uint BackfacingBit_ObjectID;
 layout(location = 1) in vec3 Normal;
 layout(location = 2) in vec2 UV;
 
-layout(location = 0) out uvec2 frontFacing_Object_Triangle;
+layout(location = 0) out uvec2 frontFacing_Object_Triangle; // should it be called backfacing or frontfacing?
 layout(location = 1) out vec2 encodedNormal;
 layout(location = 2) out vec2 uv;
 
 void main()
 {		
-	frontFacing_Object_Triangle = uvec2(ObjectID^(gl_FrontFacing ? 0x0u:0x80000000u),gl_PrimitiveID);
-	// these will disappear once we finally have MeshPackerV2 and settle on a way to obtain barycentrics
+	frontFacing_Object_Triangle = uvec2(BackfacingBit_ObjectID^(gl_FrontFacing ? 0x0u:0x80000000u),gl_PrimitiveID);
+	// TODO: these will disappear once we finally have MeshPackerV2 and settle on a way to obtain barycentrics
 	encodedNormal = nbl_glsl_NormalEncode_signedSpherical(normalize(Normal));
 	uv = UV;
 }

examples_tests/22.RaytracedAO/fillVisBuffer.vert

@@ -1,11 +1,7 @@
 #version 430 core
 
 #include "drawCommon.glsl"
-layout(set=1, binding=0, std430, row_major) restrict readonly buffer PerInstanceStatic
-{
-    ObjectStaticData_t staticData[];
-};
-layout(set=1, binding=1, row_major) readonly restrict buffer PerInstancePerCamera
+layout(set=1, binding=0, row_major) readonly restrict buffer PerInstancePerCamera
 {
     DrawData_t data[];
 } instanceDataPerCamera;
@@ -14,7 +10,7 @@ layout(location = 0) in vec3 vPosition;
 layout(location = 2) in vec2 vUV;
 layout(location = 3) in vec3 vNormal;
 
-layout(location = 0) flat out uint ObjectID;
+layout(location = 0) flat out uint BackfacingBit_ObjectID;
 layout(location = 1) out vec3 Normal;
 layout(location = 2) out vec2 UV;
 
@@ -23,14 +19,11 @@ layout(location = 2) out vec2 UV;
 void main()
 {
     DrawData_t self = instanceDataPerCamera.data[gl_InstanceIndex];
-    ObjectID = self.objectID|(floatBitsToUint(self.detMVP)&0x80000000u); // use MSB to denote if face orientation should be flipped
+    BackfacingBit_ObjectID = self.backfacingBit_objectID;
 
     gl_Position = nbl_glsl_pseudoMul4x4with3x1(self.MVP,vPosition);
 
-    const vec3 localNormal = normalize(vNormal); //have to normalize twice because of normal quantization
-    Normal[0] = dot(staticData[self.objectID].normalMatrixRow0,localNormal);
-    Normal[1] = dot(staticData[self.objectID].normalMatrixRow1,localNormal);
-    Normal[2] = dot(staticData[self.objectID].normalMatrixRow2,localNormal);
+    Normal = normalize(vNormal);
 
     UV = vUV;
 }

examples_tests/22.RaytracedAO/raygen.comp

@@ -11,28 +11,18 @@ layout(set = 2, binding = 1) uniform usampler2D scramblebuf;
 // vis buffer
 layout(set = 2, binding = 2) uniform sampler2D depthbuf;
 layout(set = 2, binding = 3) uniform usampler2D frontFacing_Object_Triangle;
-//layout(set = 2, binding = 3) uniform sampler2D barycentricDerivatives;
 layout(set = 2, binding = 4) uniform sampler2D encodedNormal;
 layout(set = 2, binding = 5) uniform sampler2D uvCoords;
+//layout(set = 2, binding = 6) uniform sampler2D barycentricDerivatives; // in the future we shall compute them from triangle vertex positions
 
 
 #include "bin/material_declarations.glsl"
-
-/*
-// something to get our GLSL intellisense to "shut up"
-#ifndef _NBL_EXT_MITSUBA_LOADER_VT_STORAGE_VIEW_COUNT
-	#define _NBL_EXT_MITSUBA_LOADER_VT_STORAGE_VIEW_COUNT 4
-	#include <nbl/builtin/glsl/virtual_texturing/impl_functions.glsl>
-#endif
-*/
-#include <nbl/builtin/glsl/ext/MitsubaLoader/material_compiler_compatibility_impl.glsl>
-
 vec3 normalizedV;
 vec3 nbl_glsl_MC_getNormalizedWorldSpaceV()
 {
 	return normalizedV;
 }
-vec3 normalizedN;
+vec3 normalizedN; // TODO
 vec3 nbl_glsl_MC_getNormalizedWorldSpaceN()
 {
 	return normalizedN;
@@ -128,71 +118,6 @@ bool gen_sample_ray(out float maxT, out vec3 direction, out vec3 throughput, in
 	return true;
 }
 
-#ifdef TODO 
-// TODO: define lower and upper bound over `lightCDF`
-vec3 light_sample(out vec3 incoming, in uint sampleIx, in uint scramble, inout float maxT, inout bool alive, in vec3 position)
-{
-	uint lightIDSample = ugen_uniform_sample1(0u,sampleIx,scramble);
-	vec2 lightSurfaceSample = gen_uniform_sample2(2u,sampleIx,scramble);
-
-	uint lightID = upper_bound(lightIDSample,uint(lightCDF.length()-1));
-
-	SLight light = light[lightID];
-
-#define SHADOW_RAY_LEN 0.93
-	float factor; // 1.0/light_probability already baked into the light factor
-	switch (SLight_extractType(light)) 
-	{
-		case SLight_ET_ELLIPSOID:
-			lightSurfaceSample.x = lightSurfaceSample.x*2.0-1.0;
-			{
-				mat4x3 tform = light.transform;
-				float equator = lightSurfaceSample.y*2.0*kPI;
-				vec3 pointOnSurface = vec3(vec2(cos(equator),sin(equator))*sqrt(1.0-lightSurfaceSample.x*lightSurfaceSample.x),lightSurfaceSample.x);
-	
-				incoming = mat3(tform)*pointOnSurface+(tform[3]-position);
-				float incomingInvLen = inversesqrt(dot(incoming,incoming));
-				incoming *= incomingInvLen;
-
-				maxT = SHADOW_RAY_LEN/incomingInvLen;
-
-				factor = 4.0*kPI; // compensate for the domain of integration
-				// don't normalize, length of the normal times determinant is very handy for differential area after a 3x3 matrix transform
-				vec3 negLightNormal = light.transformCofactors*pointOnSurface;
-
-				factor *= max(dot(negLightNormal,incoming),0.0)*incomingInvLen*incomingInvLen;
-			}
-			break;
-		default: // SLight_ET_TRIANGLE:
-			{
-				vec3 pointOnSurface = transpose(light.transformCofactors)[0];
-				vec3 shortEdge = transpose(light.transformCofactors)[1];
-				vec3 longEdge = transpose(light.transformCofactors)[2];
-
-				lightSurfaceSample.x = sqrt(lightSurfaceSample.x);
-
-				pointOnSurface += (shortEdge*(1.0-lightSurfaceSample.y)+longEdge*lightSurfaceSample.y)*lightSurfaceSample.x;
-
-				vec3 negLightNormal = cross(shortEdge,longEdge);
-
-				incoming = pointOnSurface-position;
-				float incomingInvLen = inversesqrt(dot(incoming,incoming));
-				incoming *= incomingInvLen;
-
-				maxT = SHADOW_RAY_LEN/incomingInvLen;
-
-				factor = 0.5*max(dot(negLightNormal,incoming),0.0)*incomingInvLen*incomingInvLen;
-			}
-			break;
-	}
-
-	if (factor<FLT_MIN)
-		alive = false;
-
-	return light.factor*factor;
-}
-#endif
-
 void main()
 {
 	uvec2 outputLocation = gl_GlobalInvocationID.xy;
@@ -235,7 +160,7 @@ void main()
 				const vec2 NDC = vec2(outputLocation)*staticViewData.rcpPixelSize+staticViewData.rcpHalfPixelSize;
 
 				const vec3 V = mix(frustumCornersToCamera[1]*NDC.x+frustumCornersToCamera[0],frustumCornersToCamera[3]*NDC.x+frustumCornersToCamera[2],NDC.yyy); // could maybe compute this more precisely
-				worldPosition = pc.cummon.normalMatrixAndCameraPos[3]-V*linearizeZBufferVal(revdepth);
+				worldPosition = pc.cummon.cameraPosition-V*linearizeZBufferVal(revdepth);
 				normalizedV = normalize(V);
 			}
 
@@ -252,12 +177,15 @@ void main()
 				material = nbl_glsl_MC_material_data_t_getOriented(InstData.data[objectID].material,precomputed.frontface);
 
 				//
-				emissive = vec3(float(objectID),float(triangleID),0.0);//nbl_glsl_MC_oriented_material_t_getEmissive(material);
+				emissive = nbl_glsl_MC_oriented_material_t_getEmissive(material);
 			}
 
 			// normally we'd use MeshPackerV2's vertex attribute data for this, but now we read from temporary GBuffer
 			{
-				normalizedN = nbl_glsl_NormalDecode_signedSpherical(normalBuffer);
+				const vec3 normal = nbl_glsl_NormalDecode_signedSpherical(normalBuffer);
+				normalizedN.x = dot(InstData.data[objectID].normalMatrixRow0,normal);
+				normalizedN.y = dot(InstData.data[objectID].normalMatrixRow1,normal);
+				normalizedN.z = dot(InstData.data[objectID].normalMatrixRow2,normal);
 			}
 
 			//

examples_tests/22.RaytracedAO/raytraceCommon.glsl

@@ -95,7 +95,8 @@ struct StaticViewData_t
 struct RaytraceShaderCommonData_t
 {
 	mat4x3  frustumCornersToCamera;
-	mat4x3  normalMatrixAndCameraPos;
+	vec3	cameraPosition;
+	uint	padding;
 	float   depthLinearizationConstant;
 	uint    samplesComputedPerPixel;
 	uint    framesDispatched;
@@ -118,14 +119,6 @@ layout(set = 1, binding = 2, std430) restrict /*writeonly/readonly TODO dependin
 {
 	nbl_glsl_ext_RadeonRays_ray rays[];
 };
-// materials
-/*
-#include <nbl/builtin/glsl/material_compiler/common_invariant_declarations.glsl>
-layout(set = 1, binding = 3, std430) restrict readonly buffer Materials
-{
-	nbl_glsl_MC_MaterialData materials[];
-};
-*/
 // lights
 layout(set = 1, binding = 3, std430) restrict readonly buffer CumulativeLightPDF
 {
@@ -156,8 +149,6 @@ void storeAccumulation(in vec3 color, in ivec2 coord)
 	imageStore(accumulation,coord,uvec4(data,0u,0u));
 }
 
-//#include <nbl/builtin/glsl/ext/MitsubaLoader/material_compiler_compatibility.glsl/>
-
 #endif
 
 #endif