diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/entities.cpp | 2 | ||||
| -rw-r--r-- | src/window.cpp | 4 | ||||
| -rw-r--r-- | src/window.hpp | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/entities.cpp b/src/entities.cpp index 75a506f..a81c5be 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -1095,7 +1095,7 @@ void EntityType_Load(EntityType &et) { * This should be moved to window.cpp. */ etdHelper.etd->grBinds->vkPipelineLayout = pkePipelines.vkPipelineLayout_Texture; - etdHelper.etd->grBinds->graphicsPipeline = pkePipelines.pipelines.Texture; + etdHelper.etd->grBinds->graphicsPipeline = pkePipelines.pipelines.named.Texture; // handle texture EntityType_LoadTexture(helper, i); diff --git a/src/window.cpp b/src/window.cpp index 0b9de86..20da693 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -2414,7 +2414,7 @@ void RecordCommandBuffer(VkCommandBuffer commandBuffer, uint32_t imageIndex) { vkCmdDrawIndexed(commandBuffer, binder->indexCount, binder->instanceCounter, 0, 0, 0); if (pkeSettings.isRenderingDebug) { - vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pkePipelines.pipelines.TextureWireframe); + vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pkePipelines.pipelines.named.TextureWireframe); vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pkePipelines.vkPipelineLayout_Texture, 0, 1, &pkeDebugHitbox.vkDescriptorSets[imageIndex], 0, {}); vkCmdBindVertexBuffers(commandBuffer, binder->physVertBD.firstBinding, 1, &binder->physVertBD.buffer, binder->physVertBD.offsets); @@ -2428,7 +2428,7 @@ void RecordCommandBuffer(VkCommandBuffer commandBuffer, uint32_t imageIndex) { } if (pkeDebugHitbox.instanceBuffer != VK_NULL_HANDLE) { - vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pkePipelines.pipelines.TextureWireframe); + vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pkePipelines.pipelines.named.TextureWireframe); vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, pkePipelines.vkPipelineLayout_Texture, 0, 1, &pkeDebugHitbox.vkDescriptorSets[imageIndex], 0, {}); vkCmdBindVertexBuffers(commandBuffer, 0, 1, &UniformBuffers[imageIndex], offsets); diff --git a/src/window.hpp b/src/window.hpp index 29f7140..35891c0 100644 --- a/src/window.hpp +++ b/src/window.hpp @@ -71,8 +71,10 @@ struct ImplementedPipelines { VkSampler vkSampler_Texture = VK_NULL_HANDLE; union { VkPipeline arr[2] = { VK_NULL_HANDLE, VK_NULL_HANDLE }; - VkPipeline Texture; - VkPipeline TextureWireframe; + struct ImplementedPipelinesByName { + VkPipeline Texture; + VkPipeline TextureWireframe; + } named; } pipelines; }; extern ImplementedPipelines pkePipelines; |