refactor the Mitsuba Loader's GLSL includes a little bit more

Author: devshgraphicsprogramming

include/nbl/builtin/glsl/ext/MitsubaLoader/instance_data_descriptor.glsl

@@ -0,0 +1,24 @@
+#ifndef _NBL_BUILTIN_GLSL_EXT_MITSUBA_LOADER_INSTANCE_DATA_DESCRIPTOR_INCLUDED_
+#define _NBL_BUILTIN_GLSL_EXT_MITSUBA_LOADER_INSTANCE_DATA_DESCRIPTOR_INCLUDED_
+
+
+#include <nbl/builtin/glsl/ext/MitsubaLoader/instance_data_struct.glsl>
+
+
+#ifndef _NBL_GLSL_EXT_MITSUBA_LOADER_INSTANCE_DATA_SSBO_
+#define _NBL_GLSL_EXT_MITSUBA_LOADER_INSTANCE_DATA_SSBO_
+
+    #ifndef _NBL_GLSL_EXT_MITSUBA_LOADER_INSTANCE_DATA_SET_
+    #define _NBL_GLSL_EXT_MITSUBA_LOADER_INSTANCE_DATA_SET_ 0
+    #endif
+    #ifndef _NBL_GLSL_EXT_MITSUBA_LOADER_INSTANCE_DATA_BINDING_
+    #define _NBL_GLSL_EXT_MITSUBA_LOADER_INSTANCE_DATA_BINDING_ 5
+    #endif
+
+layout(set = _NBL_GLSL_EXT_MITSUBA_LOADER_INSTANCE_DATA_SET_, binding = _NBL_GLSL_EXT_MITSUBA_LOADER_INSTANCE_DATA_BINDING_, row_major, std430) readonly restrict buffer InstDataBuffer {
+    nbl_glsl_ext_Mitsuba_Loader_instance_data_t data[];
+} InstData;
+#endif
+
+
+#endif

include/nbl/builtin/glsl/ext/MitsubaLoader/material_compiler_compatibility_impl.glsl

@@ -33,10 +33,7 @@ layout(set = 0, binding = 4, std430) restrict readonly buffer BSDF_BUF
 {
     nbl_glsl_MC_bsdf_data_t data[];
 } bsdf_buf;
-#include <nbl/builtin/glsl/ext/MitsubaLoader/instance_data_struct.glsl>
-layout(set = 0, binding = 5, row_major, std430) readonly restrict buffer InstDataBuffer {
-    nbl_glsl_ext_Mitsuba_Loader_instance_data_t data[];
-} InstData;
+#include <nbl/builtin/glsl/ext/MitsubaLoader/instance_data_descriptor.glsl>
 layout(set = 0, binding = 6, std430) restrict readonly buffer PREFETCH_INSTR_BUF
 {
     nbl_glsl_MC_prefetch_instr_t data[];

src/nbl/builtin/CMakeLists.txt

@@ -132,6 +132,7 @@ set(nbl_resources_to_embed
   "nbl/builtin/glsl/ext/RadeonRays/intersection.glsl"
   "nbl/builtin/glsl/ext/RadeonRays/ray.glsl"
   "nbl/builtin/glsl/ext/MitsubaLoader/instance_data_struct.glsl"
+  "nbl/builtin/glsl/ext/MitsubaLoader/instance_data_descriptor.glsl"
   "nbl/builtin/glsl/ext/MitsubaLoader/material_compiler_compatibility_impl.glsl"
 PARENT_SCOPE)