redstrate/prism
Archived
1
Fork 0
Code Activity

Remove descriptor set cache mesage on Vulkan

Browse source
This commit is contained in:
redstrate 2021-05-09 19:49:10 -04:00
parent 87f15b2007
commit 5fb213db7e
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
engine/gfx/vulkan/src/gfx_vulkan.cpp
View file

@ -734,7 +734,7 @@ GFXPipeline* GFXVulkan::create_graphics_pipeline(const GFXGraphicsPipelineCreate
vertex_module = createShaderModule(vertex_shader_vector.data(), vertex_shader_vector.size() * sizeof(uint32_t)); vertex_module = createShaderModule(vertex_shader_vector.data(), vertex_shader_vector.size() * sizeof(uint32_t));
} }
else { else {
auto vertex_shader = file::open(file::internal_domain / (info.shaders.vertex_src.as_path().string() + ".spv"), true); auto vertex_shader = file::open(file::internal_domain / (info.shaders.vertex_src.as_path().string()), true);
vertex_shader->read_all(); vertex_shader->read_all();
vertex_module = createShaderModule(vertex_shader->cast_data<uint32_t>(), vertex_shader->size()); vertex_module = createShaderModule(vertex_shader->cast_data<uint32_t>(), vertex_shader->size());
@ -761,7 +761,7 @@ GFXPipeline* GFXVulkan::create_graphics_pipeline(const GFXGraphicsPipelineCreate
fragment_module = createShaderModule(fragment_shader_vector.data(), fragment_shader_vector.size() * sizeof(uint32_t)); fragment_module = createShaderModule(fragment_shader_vector.data(), fragment_shader_vector.size() * sizeof(uint32_t));
} }
else { else {
auto fragment_shader = file::open(file::internal_domain / (info.shaders.fragment_src.as_path().string() + ".spv"), true); auto fragment_shader = file::open(file::internal_domain / (info.shaders.fragment_src.as_path().string()), true);
fragment_shader->read_all(); fragment_shader->read_all();
fragment_module = createShaderModule(fragment_shader->cast_data<uint32_t>(), fragment_shader->size()); fragment_module = createShaderModule(fragment_shader->cast_data<uint32_t>(), fragment_shader->size());
@ -1688,8 +1688,6 @@ void GFXVulkan::resetDescriptorState() {
void GFXVulkan::cacheDescriptorState(GFXVulkanPipeline* pipeline, VkDescriptorSetLayout layout) { void GFXVulkan::cacheDescriptorState(GFXVulkanPipeline* pipeline, VkDescriptorSetLayout layout) {
uint64_t hash = getDescriptorHash(pipeline); uint64_t hash = getDescriptorHash(pipeline);
prism::log::debug(System::GFX, "Caching descriptor hash {}", std::to_string(hash));
vkDeviceWaitIdle(device); vkDeviceWaitIdle(device);
// create set object // create set object