raytracing glsl compiles

Author: devshgraphicsprogramming

examples_tests/22.RaytracedAO/dirty_source/ExtraCrap.cpp

@@ -657,7 +657,7 @@ void Renderer::init(const SAssetBundle& meshes,
 					core::smart_refctd_ptr(m_raygenDSLayout),
 					nullptr
 				);
-				(std::ofstream("material_declarations.glsl") << initData.globalMeta->materialCompilerGLSL_declarations).close();
+				(std::ofstream("material_declarations.glsl") << "#define _NBL_EXT_MITSUBA_LOADER_VT_STORAGE_VIEW_COUNT " << initData.globalMeta->getVTStorageViewCount() << "\n" << initData.globalMeta->materialCompilerGLSL_declarations).close();
 				m_raygenPipeline = m_driver->createGPUComputePipeline(nullptr, core::smart_refctd_ptr(m_raygenPipelineLayout),gpuSpecializedShaderFromFile(m_assetManager,m_driver,"../raygen.comp"));
 
 				m_raygenDS = m_driver->createGPUDescriptorSet(core::smart_refctd_ptr(m_raygenDSLayout));

examples_tests/22.RaytracedAO/raygen.comp

@@ -17,6 +17,16 @@ layout(set = 2, binding = 5) uniform sampler2D uvCoords;
 
 
 #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()
 {
@@ -37,19 +47,6 @@ mat2x3 nbl_glsl_MC_getdPos(in vec3 p)
 {
 	return dPosdScreen;
 }
-
-nbl_glsl_instr_t nbl_glsl_MC_fetchInstr(in uint ix)
-{
-	return instr_buf.data[ix];
-}
-nbl_glsl_prefetch_instr_t nbl_glsl_MC_fetchPrefetchInstr(in uint ix)
-{
-	return prefetch_instr_buf.data[ix];
-}
-nbl_glsl_bsdf_data_t nbl_glsl_MC_fetchBSDFData(in uint ix)
-{
-	return bsdf_buf.data[ix];
-}
 #define _NBL_USER_PROVIDED_MATERIAL_COMPILER_GLSL_BACKEND_FUNCTIONS_
 #include <nbl/builtin/glsl/material_compiler/common.glsl>
 
@@ -256,7 +253,7 @@ void main()
 			}
 
 			//
-			nbl_glsl_MC_precomputed_t precomputed = nbl_glsl_precomputeData(frontfacing);
+			nbl_glsl_MC_precomputed_t precomputed = nbl_glsl_MC_precomputeData(frontfacing);
 
 			//
 			const vec3 emissive = vec3(0.0,1.0,0.0);

examples_tests/22.RaytracedAO/raytraceCommon.glsl

@@ -153,7 +153,9 @@ void storeAccumulation(in vec3 color, in ivec2 coord)
 	const uvec2 data = nbl_glsl_encodeRGB19E7(color);
 	imageStore(accumulation,coord,uvec4(data,0u,0u));
 }
-#endif
 
+//#include <nbl/builtin/glsl/ext/MitsubaLoader/material_compiler_compatibility.glsl/>
+
+#endif
 
 #endif