diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-10-24 22:13:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-24 22:13:57 +0200 |
| commit | d5bda5964978b6af7a956262cecf80de1797500c (patch) | |
| tree | f5b2f2ec923bf3eb1593531bc3d91c3dc1a1c0a1 /drivers/vulkan/rendering_device_vulkan.cpp | |
| parent | b67ccf1a6f326c5d4d5fa1cc7cd15eff3573f8f7 (diff) | |
| parent | 84d734da0e4dc4f0076c61a7178d8ad7b9f3b616 (diff) | |
| download | redot-engine-d5bda5964978b6af7a956262cecf80de1797500c.tar.gz | |
Merge pull request #43052 from reduz/refactor-2d-lighting
Refactored 2D shader and lighting system
Diffstat (limited to 'drivers/vulkan/rendering_device_vulkan.cpp')
| -rw-r--r-- | drivers/vulkan/rendering_device_vulkan.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/vulkan/rendering_device_vulkan.cpp b/drivers/vulkan/rendering_device_vulkan.cpp index 2cbb305153..41b9c33d7f 100644 --- a/drivers/vulkan/rendering_device_vulkan.cpp +++ b/drivers/vulkan/rendering_device_vulkan.cpp @@ -3258,7 +3258,7 @@ VkRenderPass RenderingDeviceVulkan::_render_pass_create(const Vector<AttachmentF render_pass_create_info.pAttachments = attachments.ptr(); render_pass_create_info.subpassCount = 1; render_pass_create_info.pSubpasses = &subpass; - render_pass_create_info.dependencyCount = 2; + render_pass_create_info.dependencyCount = 0; //2 - throws validation layer error render_pass_create_info.pDependencies = dependencies; VkRenderPass render_pass; @@ -4610,12 +4610,12 @@ RID RenderingDeviceVulkan::uniform_set_create(const Vector<Uniform> &p_uniforms, } } ERR_FAIL_COND_V_MSG(uniform_idx == -1, RID(), - "All the shader bindings for the given set must be covered by the uniforms provided. Binding (" + itos(set_uniform.binding) + ") was not provided."); + "All the shader bindings for the given set must be covered by the uniforms provided. Binding (" + itos(set_uniform.binding) + "), set (" + itos(p_shader_set) + ") was not provided."); const Uniform &uniform = uniforms[uniform_idx]; ERR_FAIL_COND_V_MSG(uniform.type != set_uniform.type, RID(), - "Mismatch uniform type for binding (" + itos(set_uniform.binding) + "). Expected '" + shader_uniform_names[set_uniform.type] + "', supplied: '" + shader_uniform_names[uniform.type] + "'."); + "Mismatch uniform type for binding (" + itos(set_uniform.binding) + "), set (" + itos(p_shader_set) + "). Expected '" + shader_uniform_names[set_uniform.type] + "', supplied: '" + shader_uniform_names[uniform.type] + "'."); VkWriteDescriptorSet write; //common header write.sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; |