redstrate/novus
1
Fork 0
mirror of https://github.com/redstrate/Novus.git synced 2025-04-23 12:37:45 +00:00
Code Activity

Fix running out of descriptors too easily in the simple renderer

Browse source
This commit is contained in:
Joshua Goins 2024-05-13 22:57:33 -04:00
parent f57c9329ba
commit 23e93811de
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
renderer/src/simplerenderer.cpp
View file

@ -70,7 +70,7 @@ void SimpleRenderer::render(VkCommandBuffer commandBuffer, Camera &camera, Scene
vkCmdBeginRenderPass(commandBuffer, &renderPassInfo, VK_SUBPASS_CONTENTS_INLINE); vkCmdBeginRenderPass(commandBuffer, &renderPassInfo, VK_SUBPASS_CONTENTS_INLINE);
for (auto model : models) { for (const auto &model : models) {
if (model.skinned) { if (model.skinned) {
if (m_wireframe) { if (m_wireframe) {
vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, m_skinnedPipelineWireframe); vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, m_skinnedPipelineWireframe);
@ -110,7 +110,7 @@ void SimpleRenderer::render(VkCommandBuffer commandBuffer, Camera &camera, Scene
if (static_cast<size_t>(part.materialIndex) >= model.materials.size()) { if (static_cast<size_t>(part.materialIndex) >= model.materials.size()) {
material = &defaultMaterial; material = &defaultMaterial;
} else { } else {
material = &model.materials[part.materialIndex]; material = const_cast<RenderMaterial *>(&model.materials[part.materialIndex]);
} }
const auto h = hash(model, *material); const auto h = hash(model, *material);
@ -439,15 +439,15 @@ void SimpleRenderer::initTextures(int width, int height)
uint64_t SimpleRenderer::hash(const DrawObject &model, const RenderMaterial &material) uint64_t SimpleRenderer::hash(const DrawObject &model, const RenderMaterial &material)
{ {
uint64_t hash = 0; uint64_t hash = 0;
hash += reinterpret_cast<intptr_t>((void *)&model); hash += reinterpret_cast<intptr_t>((void *)model.model.p_ptr);
if (material.diffuseTexture) if (material.diffuseTexture)
hash += reinterpret_cast<intptr_t>((void *)&material.diffuseTexture); hash += reinterpret_cast<intptr_t>(material.diffuseTexture->image);
if (material.normalTexture) if (material.normalTexture)
hash += reinterpret_cast<intptr_t>((void *)&material.normalTexture); hash += reinterpret_cast<intptr_t>(material.normalTexture->image);
if (material.specularTexture) if (material.specularTexture)
hash += reinterpret_cast<intptr_t>((void *)&material.specularTexture); hash += reinterpret_cast<intptr_t>(material.specularTexture->image);
if (material.multiTexture) if (material.multiTexture)
hash += reinterpret_cast<intptr_t>((void *)&material.multiTexture); hash += reinterpret_cast<intptr_t>(material.multiTexture->image);
return hash; return hash;
} }