Fixing descriptors a little
This commit is contained in:
@@ -39,6 +39,7 @@ MaterialInstance::MaterialInstance(uint64 id,
|
||||
OShaderParameter param;
|
||||
Serialization::load(buffer, param);
|
||||
parameters.add(std::move(param));
|
||||
buffer.rewind();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,7 +51,6 @@ MaterialInstance::~MaterialInstance()
|
||||
void MaterialInstance::updateDescriptor()
|
||||
{
|
||||
Gfx::PDescriptorLayout layout = baseMaterial->getMaterial()->getDescriptorLayout();
|
||||
layout->reset();
|
||||
descriptor = layout->allocateDescriptorSet();
|
||||
for (auto& param : parameters)
|
||||
{
|
||||
|
||||
@@ -79,7 +79,6 @@ std::string ShaderParameter::evaluate(Map<std::string, std::string>& varState) c
|
||||
void ShaderParameter::save(ArchiveBuffer& buffer) const
|
||||
{
|
||||
ShaderExpression::save(buffer);
|
||||
Serialization::save(buffer, key);
|
||||
Serialization::save(buffer, byteOffset);
|
||||
Serialization::save(buffer, binding);
|
||||
}
|
||||
@@ -87,7 +86,6 @@ void ShaderParameter::save(ArchiveBuffer& buffer) const
|
||||
void ShaderParameter::load(ArchiveBuffer& buffer)
|
||||
{
|
||||
ShaderExpression::load(buffer);
|
||||
Serialization::load(buffer, key);
|
||||
Serialization::load(buffer, byteOffset);
|
||||
Serialization::load(buffer, binding);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user