fix more shader compilation issues

Author: devshgraphicsprogramming

examples_tests/22.RaytracedAO/raygen.comp

@@ -352,7 +352,7 @@ void main()
 			{
 				throughput /= float(staticViewData.samplesPerPixelPerDispatch);
 
-				rays[realOutputID].origin = nbl_glsl_MC_WorldSpacePosition();/*+newray.direction*err?; TODO */
+				rays[realOutputID].origin = nbl_glsl_MC_getWorldSpacePosition();/*+newray.direction*err?; TODO */
 				rays[realOutputID].maxT = FLT_MAX;
 				rays[realOutputID].direction = direction;
 				rays[realOutputID].mask = -1;

examples_tests/22.RaytracedAO/raytraceCommon.glsl

@@ -137,15 +137,14 @@ layout(set = 1, binding = 5, std430, row_major) restrict readonly buffer LightRa
 vec3 fetchAccumulation(in ivec2 coord)
 {
     const uvec2 data = imageLoad(accumulation,coord).rg;
-	// for now until @Crisspl fixes rgb19e7 encode/decode
-    //return irr_glsl_decodeRGB19E7(data);
-	return vec3(unpackHalf2x16(data[0]),unpackHalf2x16(data[1])[0]);}
+	return nbl_glsl_decodeRGB19E7(data);
+}
+
 void storeAccumulation(in vec3 color, in ivec2 coord)
 {
-	// for now until @Crisspl fixes rgb19e7 encode/decode
-	//const uvec2 data = irr_glsl_encodeRGB19E7(color);
-	const uvec2 data = uvec2(packHalf2x16(color.rg),packHalf2x16(vec2(color.b,1.0)));
-	imageStore(accumulation,coord,uvec4(data,0u,0u));}
+	const uvec2 data = nbl_glsl_encodeRGB19E7(color);
+	imageStore(accumulation,coord,uvec4(data,0u,0u));
+}
 #endif
 
 

examples_tests/45.BRDFEvalTest/shader.frag

@@ -1,8 +1,8 @@
+#version 430 core
 // Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
 
-#version 430 core
 
 layout (location = 0) in vec3 Normal;
 layout (location = 1) in vec3 Pos;
@@ -34,7 +34,7 @@ void main()
     vec3 N = normalize(Normal);
     if (dot(N,Lnorm)>0.0)
     {
-        nbl_glsl_IsotropicViewSurfaceInteraction inter_ = nbl_glsl_calcFragmentShaderSurfaceInteraction(pc.campos, Pos, N);
+        nbl_glsl_IsotropicViewSurfaceInteraction inter_ = nbl_glsl_calcSurfaceInteraction(pc.campos, Pos, N, mat2x3(dFdx(Pos),dFdy(Pos)));
         nbl_glsl_AnisotropicViewSurfaceInteraction inter = nbl_glsl_calcAnisotropicInteraction(inter_);
 
         nbl_glsl_LightSample _sample = nbl_glsl_createLightSample(Lnorm,inter);

examples_tests/46.SamplingValidation/fullscreen.frag

@@ -34,7 +34,7 @@ void main()
     const float ay = pc.a.y;
     const mat2x3 ior = mat2x3(vec3(1.02,1.3,1.02), vec3(1.0,2.0,1.0));
     vec3 u = vec3(gl_FragCoord.xy/screenSz,0.0); // random sapling would be useful
-    nbl_glsl_IsotropicViewSurfaceInteraction inter_ = nbl_glsl_calcFragmentShaderSurfaceInteraction(vec3(1.0), vec3(0.0), vec3(0.0,0.0,1.0));
+    nbl_glsl_IsotropicViewSurfaceInteraction inter_ = nbl_glsl_calcSurfaceInteraction(vec3(1.0), vec3(0.0), vec3(0.0,0.0,1.0), mat2x3(0.0));
     nbl_glsl_AnisotropicViewSurfaceInteraction inter = nbl_glsl_calcAnisotropicInteraction(inter_, vec3(1.0, 0.0, 0.0), vec3(0.0, 1.0, 0.0));
     nbl_glsl_LightSample s;
     float pdf = 0.0;

include/nbl/builtin/glsl/bxdf/common.glsl

@@ -155,17 +155,6 @@ nbl_glsl_IsotropicViewSurfaceInteraction nbl_glsl_calcSurfaceInteraction(in vec3
     return nbl_glsl_calcSurfaceInteractionFromViewVector(V, _SurfacePos, _Normal, dpd_);
 }
 
-// only in the fragment shader we have access to implicit derivatives
-nbl_glsl_IsotropicViewSurfaceInteraction nbl_glsl_calcFragmentShaderSurfaceInteractionFromViewVector(in vec3 _View, in vec3 _SurfacePos, in vec3 _Normal)
-{
-    mat2x3 dpd = mat2x3(dFdx(_SurfacePos), dFdy(_SurfacePos));
-    return nbl_glsl_calcSurfaceInteractionFromViewVector(_View, _SurfacePos, _Normal, dpd);
-}
-nbl_glsl_IsotropicViewSurfaceInteraction nbl_glsl_calcFragmentShaderSurfaceInteraction(in vec3 _CamPos, in vec3 _SurfacePos, in vec3 _Normal)
-{
-    vec3 V = _CamPos - _SurfacePos;
-    return nbl_glsl_calcFragmentShaderSurfaceInteractionFromViewVector(V, _SurfacePos, _Normal);
-}
 nbl_glsl_AnisotropicViewSurfaceInteraction nbl_glsl_calcAnisotropicInteraction(in nbl_glsl_IsotropicViewSurfaceInteraction isotropic, in vec3 T, in vec3 B)
 {
     nbl_glsl_AnisotropicViewSurfaceInteraction inter;

include/nbl/builtin/glsl/ext/RadeonRays/ray.glsl

@@ -1,5 +1,5 @@
-#ifndef __NBL_EXT_RADEON_RAYS_RAY_INCLUDED__
-#define __NBL_EXT_RADEON_RAYS_RAY_INCLUDED__
+#ifndef _NBL_GLSL_EXT_RADEON_RAYS_RAY_INCLUDED_
+#define _NBL_GLSL_EXT_RADEON_RAYS_RAY_INCLUDED_
 
 struct nbl_glsl_ext_RadeonRays_ray
 {

include/nbl/builtin/shaders/loaders/mtl/fragment_impl.glsl

@@ -159,7 +159,7 @@ Spectrum nbl_bsdf_cos_eval(in nbl_glsl_LightSample _sample, in nbl_glsl_Isotropi
 
 vec3 nbl_computeLighting(out nbl_glsl_IsotropicViewSurfaceInteraction out_interaction, in mat2 dUV)
 {
-    nbl_glsl_IsotropicViewSurfaceInteraction interaction = nbl_glsl_calcFragmentShaderSurfaceInteraction(vec3(0.0), ViewPos, Normal);
+    nbl_glsl_IsotropicViewSurfaceInteraction interaction = nbl_glsl_calcSurfaceInteraction(vec3(0.0), ViewPos, Normal, mat2x3(dFdx(ViewPos),dFdy(ViewPos)));
 
 #ifndef _NO_UV
     if ((PC.params.extra&map_bump_MASK) == map_bump_MASK)

src/nbl/ext/MitsubaLoader/CMitsubaLoader.cpp

@@ -283,7 +283,7 @@ vec3 nbl_computeLighting(inout nbl_glsl_IsotropicViewSurfaceInteraction out_inte
 	
 	//nbl_glsl_BSDFIsotropicParams params;
 	//params.L = campos-WorldPos;
-	out_interaction = nbl_glsl_calcFragmentShaderSurfaceInteraction(campos, WorldPos, normalize(Normal));
+	out_interaction = nbl_glsl_calcSurfaceInteraction(campos, WorldPos, normalize(Normal), mat2x3(dFdx(WorldPos),dFdy(WorldPos)));
 
 	return nbl_bsdf_cos_eval(precomp, precomp.V, out_interaction, dUV)/dot(params.L,params.L) + emissive;
 }