celisej567/Nuake-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bindless textures now working

Browse Source
This commit is contained in:
antopilo
2025-01-08 20:01:24 -05:00
parent f0325e1ce9
commit 49f9f3bbe0
3 changed files with 85 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Nuake/src/Rendering/Textures/Material.h
View File

@@ -61,6 +61,11 @@ namespace Nuake
}
public:
UUID AlbedoImage;
UUID AOImage;
UUID MetalnessImage;
UUID RoughnessImage;
UUID NormalImage;
Ref<Texture> m_Albedo;
Ref<Texture> m_AO;
Ref<Texture> m_Metalness;
@@ -227,28 +232,72 @@ namespace Nuake
if (j.contains("Normal"))
{
const std::string absolutePath = FileSystem::RelativeToAbsolute(j["Normal"]["Path"]);
const auto& texturePath = j["Normal"]["Path"];
const std::string absolutePath = FileSystem::RelativeToAbsolute(texturePath);
if (FileSystem::FileExists(texturePath))
{
GPUResources& resources = GPUResources::Get();
Ref<VulkanImage> image = CreateRef<VulkanImage>(absolutePath);
if (resources.AddTexture(image))
{
NormalImage = image->GetID();
}
}
Ref<Texture> normalTexture = TextureManager::Get()->GetTexture(absolutePath);
SetMetalness(normalTexture);
}
if (j.contains("AO"))
{
const std::string absolutePath = FileSystem::RelativeToAbsolute(j["AO"]["Path"]);
const auto& texturePath = j["AO"]["Path"];
const std::string absolutePath = FileSystem::RelativeToAbsolute(texturePath);
if (FileSystem::FileExists(texturePath))
{
GPUResources& resources = GPUResources::Get();
Ref<VulkanImage> image = CreateRef<VulkanImage>(absolutePath);
if (resources.AddTexture(image))
{
AOImage = image->GetID();
}
}
Ref<Texture> aoTexture = TextureManager::Get()->GetTexture(absolutePath);
SetAO(aoTexture);
}
if (j.contains("Metalness"))
{
const std::string absolutePath = FileSystem::RelativeToAbsolute(j["Metalness"]["Path"]);
const auto& texturePath = j["Metalness"]["Path"];
const std::string absolutePath = FileSystem::RelativeToAbsolute(texturePath);
if (FileSystem::FileExists(texturePath))
{
GPUResources& resources = GPUResources::Get();
Ref<VulkanImage> image = CreateRef<VulkanImage>(absolutePath);
if (resources.AddTexture(image))
{
MetalnessImage = image->GetID();
}
}
Ref<Texture> metalTexture = TextureManager::Get()->GetTexture(absolutePath);
SetMetalness(metalTexture);
}
if (j.contains("Roughness"))
{
const std::string absolutePath = FileSystem::RelativeToAbsolute(j["Roughness"]["Path"]);
const auto& texturePath = j["Roughness"]["Path"];
const std::string absolutePath = FileSystem::RelativeToAbsolute(texturePath);
if (FileSystem::FileExists(texturePath))
{
GPUResources& resources = GPUResources::Get();
Ref<VulkanImage> image = CreateRef<VulkanImage>(absolutePath);
if (resources.AddTexture(image))
{
RoughnessImage = image->GetID();
}
}
Ref<Texture> metalTexture = TextureManager::Get()->GetTexture(absolutePath);
SetRoughness(metalTexture);
}

48
Nuake/src/Rendering/Vulkan/VulkanSceneRenderer.cpp
View File

@@ -52,8 +52,6 @@ void VkSceneRenderer::BeginScene(RenderContext inContext)
BuildMatrixBuffer();
UpdateTransformBuffer();
auto& cmd = Context.CommandBuffer;
auto& scene = Context.CurrentScene;
auto& vk = VkRenderer::Get();
@@ -395,6 +393,26 @@ void VkSceneRenderer::BuildMatrixBuffer()
ZoneScopedN("Build Matrix Buffer");
auto& scene = Context.CurrentScene;
std::map<UUID, uint32_t> TextureIDMapping;
auto allTextures = GPUResources::Get().GetAllTextures();
std::vector<VkDescriptorImageInfo> imageInfos(allTextures.size());
for (size_t i = 0; i < allTextures.size(); i++) {
imageInfos[i].imageView = allTextures[i]->GetImageView();
imageInfos[i].imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
TextureIDMapping[allTextures[i]->GetID()] = i;
}
VkWriteDescriptorSet write{};
write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
write.dstSet = TextureBufferDescriptor;
write.dstBinding = 0; // Binding 0
write.dstArrayElement = 0;
write.descriptorCount = static_cast<uint32_t>(imageInfos.size());
write.descriptorType = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE;
write.pImageInfo = imageInfos.data();
vkUpdateDescriptorSets(VkRenderer::Get().GetDevice(), 1, &write, 0, nullptr);
std::array<Matrix4, MAX_MODEL_MATRIX> allTransforms;
std::array<MaterialBufferStruct, MAX_MATERIAL> allMaterials;
@@ -441,6 +459,11 @@ void VkSceneRenderer::BuildMatrixBuffer()
materialBuffer.aoValue = material->data.u_AOValue;
materialBuffer.hasRoughness = material->HasRoughness();
materialBuffer.roughnessValue = material->data.u_RoughnessValue;
materialBuffer.albedoTextureId = material->HasAlbedo() ? TextureIDMapping[material->AlbedoImage] : 0;
materialBuffer.normalTextureId = material->HasNormal() ? TextureIDMapping[material->NormalImage] : 0;
materialBuffer.metalnessTextureId = material->HasMetalness() ? TextureIDMapping[material->MetalnessImage] : 0;
materialBuffer.aoTextureId = material->HasAO() ? TextureIDMapping[material->AOImage] : 0;
materialBuffer.roughnessTextureId = material->HasRoughness() ? TextureIDMapping[material->RoughnessImage] : 0;
allMaterials[currentMaterialIndex] = materialBuffer;
MeshMaterialMapping[m->GetVkMesh()->GetID()] = currentMaterialIndex;
@@ -524,22 +547,5 @@ void VkSceneRenderer::UpdateTransformBuffer()
bufferWrite.pImageInfo = VK_NULL_HANDLE;
vkUpdateDescriptorSets(VkRenderer::Get().GetDevice(), 1, &bufferWrite, 0, nullptr);
}
auto allTextures = GPUResources::Get().GetAllTextures();
std::vector<VkDescriptorImageInfo> imageInfos(allTextures.size());
for (size_t i = 0; i < allTextures.size(); i++) {
imageInfos[i].imageView = allTextures[i]->GetImageView();
imageInfos[i].imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
}
VkWriteDescriptorSet write{};
write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
write.dstSet = TextureBufferDescriptor;
write.dstBinding = 0; // Binding 0
write.dstArrayElement = 0;
write.descriptorCount = static_cast<uint32_t>(imageInfos.size());
write.descriptorType = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE;
write.pImageInfo = imageInfos.data();
vkUpdateDescriptorSets(VkRenderer::Get().GetDevice(), 1, &write, 0, nullptr);
}
}

6
Nuake/src/Rendering/Vulkan/VulkanSceneRenderer.h
View File

@@ -42,7 +42,11 @@ namespace Nuake
float metalnessValue;
float roughnessValue;
float aoValue;
float pad;
int albedoTextureId;
int normalTextureId;
int metalnessTextureId;
int roughnessTextureId;
int aoTextureId;
};
// This is the *whole* buffer