atdunbg/HelloVulkan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 解析式 PBR（Cook-Torrance GGX，metallic-roughness 工作流）

Browse Source 
- 修 void* 指针算术警告（Texture::InitFromDds）
- Material：slot2 语义切为 metallicRoughness（glTF 约定 G=粗糙度
  B=金属度）+ 新增材质因子参数 UBO（binding 4，per-slot ring，
  创建时写死，metallic/roughness 因子乘 MR 贴图）
- simple_shader.frag：Blinn-Phong → Cook-Torrance（GGX 分布 +
  Smith 几何 + Schlick Fresnel，k=(r+1)²/8 解析光源版）；金属不参与
  漫反射；环境光暂为常数（IBL 后续）
- Model：读 aiTextureType_UNKNOWN（glTF MR 落点）+ AI_MATKEY_
  METALLIC/ROUGHNESS_FACTOR（旧资产缺键退化为电介质 0/0.5）；
  材质缓存键含因子
- main.cpp：演示场景换回 backpack（旧资产走因子路径验证 PBR 全链路）
- 旧 specular 贴图不再使用（语义被 MR 取代）
This commit is contained in:
atdunbg
2026-09-23 18:01:14 +08:00
parent 2c4efc5165
commit 89bf4256e8
23 changed files with 449 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/src/Vulkan/DescriptorManager.cpp
+11 -11
View File
@@ -18,12 +18,12 @@ namespace Engine
DescriptorManager::~DescriptorManager()
{
for (auto pool : m_Pools) {
for (const auto pool : m_Pools) {
m_Device.GetDevice().destroyDescriptorPool(pool);
}
}
vk::DescriptorPool DescriptorManager::CreateChunk()
vk::DescriptorPool DescriptorManager::CreateChunk() const
{
std::array<vk::DescriptorPoolSize, 3> poolSizes = {
vk::DescriptorPoolSize(vk::DescriptorType::eUniformBuffer, kChunkSets),
@@ -39,7 +39,7 @@ namespace Engine
return m_Device.GetDevice().createDescriptorPool(poolInfo);
}
vk::DescriptorSetLayout DescriptorManager::CreateLayout(const std::vector<DescriptorBinding>& bindings)
vk::DescriptorSetLayout DescriptorManager::CreateLayout(const std::vector<DescriptorBinding>& bindings) const
{
std::vector<vk::DescriptorSetLayoutBinding> vkBindings;
for (auto& b : bindings)
@@ -80,8 +80,8 @@ namespace Engine
}
}
void DescriptorManager::UpdateUniformBuffer(vk::DescriptorSet set, u32 binding,
vk::Buffer buffer, u64 size)
void DescriptorManager::UpdateUniformBuffer(const vk::DescriptorSet set, const u32 binding,
const vk::Buffer buffer, const u64 size) const
{
vk::DescriptorBufferInfo bufferInfo;
bufferInfo.setBuffer(buffer).setOffset(0).setRange(size);
@@ -97,8 +97,8 @@ namespace Engine
m_Device.GetDevice().updateDescriptorSets(write, {});
}
void DescriptorManager::UpdateStorageBuffer(vk::DescriptorSet set, u32 binding,
vk::Buffer buffer, u64 size)
void DescriptorManager::UpdateStorageBuffer(const vk::DescriptorSet set, const u32 binding,
const vk::Buffer buffer, const u64 size) const
{
vk::DescriptorBufferInfo bufferInfo;
bufferInfo.setBuffer(buffer).setOffset(0).setRange(size);
@@ -114,8 +114,8 @@ namespace Engine
m_Device.GetDevice().updateDescriptorSets(write, {});
}
void DescriptorManager::UpdateTexture(vk::DescriptorSet set, u32 binding,
vk::Sampler sampler, vk::ImageView view)
void DescriptorManager::UpdateTexture(const vk::DescriptorSet set, const u32 binding,
const vk::Sampler sampler, const vk::ImageView view) const
{
vk::DescriptorImageInfo imageInfo;
imageInfo.setSampler(sampler)
@@ -134,7 +134,7 @@ namespace Engine
}
vk::PipelineLayout DescriptorManager::CreatePipelineLayout(vk::DescriptorSetLayout layout,
const u32 pushConstantSize)
const u32 pushConstantSize) const
{
vk::PipelineLayoutCreateInfo info;
info.setSetLayouts(layout);
@@ -154,7 +154,7 @@ namespace Engine
}
vk::PipelineLayout DescriptorManager::CreatePipelineLayout(const std::vector<vk::DescriptorSetLayout>& layouts,
u32 pushConstantSize)
const u32 pushConstantSize) const
{
vk::PipelineLayoutCreateInfo info;
info.setSetLayouts(layouts);