Fixed descriptors

Author: Przemog1

examples_tests/41.VisibilityBuffer/main.cpp

@@ -138,7 +138,7 @@ layout(location = 4) flat in uint drawID;
 #endif
 #define _NBL_FRAG_SET3_BINDINGS_DEFINED_
 
-struct VTData
+struct MaterialParams
 {
     vec3 Ka;
     vec3 Kd;
@@ -155,23 +155,33 @@ struct VTData
     float Ni;
     uint extra; //flags copied from MTL metadata
 };
-#define _NBL_FRAG_MATERIAL_PARAMETERS_STRUCT_DEFINED_
-#define nbl_glsl_MaterialParametersStruct VTData
 
-layout(set = 2, binding = 1, std430) readonly buffer VTDataBuffer
+layout(set = 2, binding = 1, std430) readonly buffer MaterialBuffer
 {
-    VTData vtData[];
-} vtDataBuffer;
+    MaterialParams materialData[];
+};
 
 layout (push_constant) uniform Block 
 {
     uint dataBufferOffset;
 } pc;
 #define _NBL_FRAG_PUSH_CONSTANTS_DEFINED_
 
-VTData nbl_glsl_getMaterialParameters()
+#include <nbl/builtin/glsl/loader/mtl/common.glsl>
+nbl_glsl_MTLMaterialParameters nbl_glsl_getMaterialParameters() // this function is for MTL's shader only
 {
-    return vtDataBuffer.vtData[drawID + pc.dataBufferOffset];
+    MaterialParams params = materialData[drawID+pc.dataBufferOffset];
+
+    nbl_glsl_MTLMaterialParameters mtl_params;
+    mtl_params.Ka = params.Ka;
+    mtl_params.Kd = params.Kd;
+    mtl_params.Ks = params.Ks;
+    mtl_params.Ke = params.Ke;
+    mtl_params.Ns = params.Ns;
+    mtl_params.d = params.d;
+    mtl_params.Ni = params.Ni;
+    mtl_params.extra = params.extra;
+    return mtl_params;
 }
 #define _NBL_FRAG_GET_MATERIAL_PARAMETERS_FUNCTION_DEFINED_
 
@@ -200,17 +210,17 @@ VTData nbl_glsl_getMaterialParameters()
 
 
 #ifndef _NO_UV
-    vec4 nbl_sample_Ka(in vec2 uv, in mat2 dUV)   { return nbl_glsl_vTextureGrad(nbl_glsl_getMaterialParameters().map_Ka_data, uv, dUV); }
+    vec4 nbl_sample_Ka(in vec2 uv, in mat2 dUV)   { return nbl_glsl_vTextureGrad(materialData[drawID+pc.dataBufferOffset].map_Ka_data, uv, dUV); }
 
-    vec4 nbl_sample_Kd(in vec2 uv, in mat2 dUV)   { return nbl_glsl_vTextureGrad(nbl_glsl_getMaterialParameters().map_Kd_data, uv, dUV); }
+    vec4 nbl_sample_Kd(in vec2 uv, in mat2 dUV)   { return nbl_glsl_vTextureGrad(materialData[drawID+pc.dataBufferOffset].map_Kd_data, uv, dUV); }
 
-    vec4 nbl_sample_Ks(in vec2 uv, in mat2 dUV)   { return nbl_glsl_vTextureGrad(nbl_glsl_getMaterialParameters().map_Ks_data, uv, dUV); }
+    vec4 nbl_sample_Ks(in vec2 uv, in mat2 dUV)   { return nbl_glsl_vTextureGrad(materialData[drawID+pc.dataBufferOffset].map_Ks_data, uv, dUV); }
 
-    vec4 nbl_sample_Ns(in vec2 uv, in mat2 dUV)   { return nbl_glsl_vTextureGrad(nbl_glsl_getMaterialParameters().map_Ns_data, uv, dUV); }
+    vec4 nbl_sample_Ns(in vec2 uv, in mat2 dUV)   { return nbl_glsl_vTextureGrad(materialData[drawID+pc.dataBufferOffset].map_Ns_data, uv, dUV); }
 
-    vec4 nbl_sample_d(in vec2 uv, in mat2 dUV)    { return nbl_glsl_vTextureGrad(nbl_glsl_getMaterialParameters().map_d_data, uv, dUV); }
+    vec4 nbl_sample_d(in vec2 uv, in mat2 dUV)    { return nbl_glsl_vTextureGrad(materialData[drawID+pc.dataBufferOffset].map_d_data, uv, dUV); }
 
-    vec4 nbl_sample_bump(in vec2 uv, in mat2 dUV) { return nbl_glsl_vTextureGrad(nbl_glsl_getMaterialParameters().map_bump_data, uv, dUV); }
+    vec4 nbl_sample_bump(in vec2 uv, in mat2 dUV) { return nbl_glsl_vTextureGrad(materialData[drawID+pc.dataBufferOffset].map_bump_data, uv, dUV); }
 #endif
 #define _NBL_TEXTURE_SAMPLE_FUNCTIONS_DEFINED_
 )";
@@ -655,7 +665,7 @@ void createPipeline(IVideoDriver* driver, ICPUSpecializedShader* vs, ICPUSpecial
         b2[1].stageFlags = asset::ISpecializedShader::ESS_FRAGMENT;
         b2[1].type = asset::EDT_STORAGE_BUFFER;
 
-        ds2Layout = driver->createGPUDescriptorSetLayout(b2, b2 + 1);
+        ds2Layout = driver->createGPUDescriptorSetLayout(b2, b2 + 2);
     }
 
     SPushConstantRange pcRange;
@@ -761,10 +771,12 @@ void createPipeline(IVideoDriver* driver, ICPUSpecializedShader* vs, ICPUSpecial
 
         info2[1].buffer.offset = 0u;
         info2[1].buffer.size = drawData.vtDataSSBO->getSize();
-        info2[1].desc = drawData.vtDataSSBO;
+        info2[1].desc = drawData.vtDataSSBO; // TODO: rename vtData to materialData
 
         w2[0].info = &info2[0];
         w2[1].info = &info2[1];
+
+        driver->updateDescriptorSets(2u,w2,0u,nullptr);
     }
 
     IGPUSpecializedShader* shaders[2] = { gpuShaders->operator[](0).get(), gpuShaders->operator[](1).get() };

include/nbl/builtin/shader/loader/mtl/fragment_impl.glsl

@@ -28,25 +28,20 @@ layout (location = 0) out vec4 OutColor;
 
 #include <nbl/builtin/glsl/bxdf/common.glsl> // change to bxdf/common.glsl
 
-#ifndef _NBL_FRAG_MATERIAL_PARAMETERS_STRUCT_DEFINED_
-#define _NBL_FRAG_MATERIAL_PARAMETERS_STRUCT_DEFINED_
-
 #include <nbl/builtin/glsl/loader/mtl/common.glsl>
-#define nbl_glsl_MaterialParametersStruct nbl_glsl_MTLMaterialParameters
-#endif //_NBL_FRAG_MATERIAL_PARAMETERS_STRUCT_DEFINED_
 
 #ifndef _NBL_FRAG_PUSH_CONSTANTS_DEFINED_
 #define _NBL_FRAG_PUSH_CONSTANTS_DEFINED_
 
 layout (push_constant) uniform Block {
-    nbl_glsl_MaterialParametersStruct params;
+    nbl_glsl_MTLMaterialParameters params;
 } PC;
 #endif //_NBL_FRAG_PUSH_CONSTANTS_DEFINED_
 
 #ifndef _NBL_FRAG_GET_MATERIAL_PARAMETERS_FUNCTION_DEFINED_
 #define _NBL_FRAG_GET_MATERIAL_PARAMETERS_FUNCTION_DEFINED_
 
-nbl_glsl_MaterialParametersStruct nbl_glsl_getMaterialParameters()
+nbl_glsl_MTLMaterialParameters nbl_glsl_getMaterialParameters()
 {
     return PC.params;
 }
@@ -99,7 +94,7 @@ vec4 nbl_sample_bump(in vec2 uv, in mat2 dUV) { return texture(map_bump, uv); }
 // params can be either BSDFIsotropicParams or BSDFAnisotropicParams 
 Spectrum nbl_bsdf_cos_eval(in nbl_glsl_LightSample _sample, in nbl_glsl_IsotropicViewSurfaceInteraction inter, in mat2 dUV)
 {
-    nbl_glsl_MaterialParametersStruct mtParams = nbl_glsl_getMaterialParameters();
+    nbl_glsl_MTLMaterialParameters mtParams = nbl_glsl_getMaterialParameters();
 
     vec3 Kd;
 #ifndef _NO_UV
@@ -176,7 +171,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_calcSurfaceInteraction(vec3(0.0), ViewPos, Normal, mat2x3(dFdx(ViewPos),dFdy(ViewPos)));
-    nbl_glsl_MaterialParametersStruct mtParams = nbl_glsl_getMaterialParameters();
+    nbl_glsl_MTLMaterialParameters mtParams = nbl_glsl_getMaterialParameters();
 
 #ifndef _NO_UV
     if ((mtParams.extra&map_bump_MASK) == map_bump_MASK)
@@ -239,7 +234,7 @@ void main()
 #else
     mat2 dUV = mat2(vec2(0,0),vec2(0,0));    
 #endif
-    nbl_glsl_MaterialParametersStruct mtParams = nbl_glsl_getMaterialParameters();
+    nbl_glsl_MTLMaterialParameters mtParams = nbl_glsl_getMaterialParameters();
     nbl_glsl_IsotropicViewSurfaceInteraction interaction;
     vec3 color = nbl_computeLighting(interaction, dUV);