Provisional light culling

src/Engine/Material/MaterialAsset.cpp

@@ -32,7 +32,7 @@ void MaterialAsset::endFrame()
 void MaterialAsset::updateDescriptorData() 
 {
     layout->reset();
-    descriptorSet = layout->allocatedDescriptorSet();
+    descriptorSet = layout->allocateDescriptorSet();
     BulkResourceData uniformUpdate;
     uniformUpdate.size = uniformDataSize;
     uniformUpdate.data = uniformData;

src/Engine/Material/ShaderExpression.cpp

@@ -70,4 +70,19 @@ SamplerParameter::~SamplerParameter()
 void SamplerParameter::updateDescriptorSet(Gfx::PDescriptorSet descriptorSet, uint8*) 
 {
     descriptorSet->updateSampler(binding, data);
+}
+
+CombinedTextureParameter::CombinedTextureParameter(std::string name, uint32 byteOffset, uint32 binding) 
+    : ShaderParameter(name, byteOffset, binding)
+{
+}
+
+CombinedTextureParameter::~CombinedTextureParameter() 
+{
+    
+}
+
+void CombinedTextureParameter::updateDescriptorSet(Gfx::PDescriptorSet descriptorSet, uint8* dst) 
+{
+    descriptorSet->updateTexture(binding, data->getTexture(), sampler);
 }

src/Engine/Material/ShaderExpression.h

@@ -60,5 +60,13 @@ struct SamplerParameter : public ShaderParameter
     virtual void updateDescriptorSet(Gfx::PDescriptorSet descriptorSet, uint8* dst) override;
 };
 DEFINE_REF(SamplerParameter)
-
+struct CombinedTextureParameter : public ShaderParameter
+{
+    PTextureAsset data;
+    Gfx::PSamplerState sampler;
+    CombinedTextureParameter(std::string name, uint32 byteOffset, uint32 binding);
+    virtual ~CombinedTextureParameter();
+    virtual void updateDescriptorSet(Gfx::PDescriptorSet descriptorSet, uint8* dst) override;
+};
+DEFINE_REF(CombinedTextureParameter)
 } // namespace Seele