godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Merge pull request #70104 from RandomShaper/vk_dev_asserts

Browse Source 
Replace certain sanity checks with proper dev-only assertions in Vulkan RD
This commit is contained in:
Clay John
2022-12-15 08:22:17 -08:00
committed by GitHub
parent d99ea32999 af6189711e
commit aa8a899f52
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/vulkan/rendering_device_vulkan.cpp
View File

@@ -5469,10 +5469,8 @@ RID RenderingDeviceVulkan::uniform_set_create(const Vector<Uniform> &p_uniforms,
// Can also be used as storage, add to mutable sampled. // Can also be used as storage, add to mutable sampled.
mutable_sampled_textures.push_back(texture); mutable_sampled_textures.push_back(texture);
} }
if (texture->owner.is_valid()) {
texture = texture_owner.get_or_null(texture->owner); DEV_ASSERT(!texture->owner.is_valid() || texture_owner.get_or_null(texture->owner));
ERR_FAIL_COND_V(!texture, RID()); // Bug, should never happen.
}
img_info.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; img_info.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
@@ -5523,10 +5521,7 @@ RID RenderingDeviceVulkan::uniform_set_create(const Vector<Uniform> &p_uniforms,
mutable_sampled_textures.push_back(texture); mutable_sampled_textures.push_back(texture);
} }
if (texture->owner.is_valid()) { DEV_ASSERT(!texture->owner.is_valid() || texture_owner.get_or_null(texture->owner));
texture = texture_owner.get_or_null(texture->owner);
ERR_FAIL_COND_V(!texture, RID()); // Bug, should never happen.
}
img_info.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; img_info.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
@@ -5571,10 +5566,7 @@ RID RenderingDeviceVulkan::uniform_set_create(const Vector<Uniform> &p_uniforms,
mutable_storage_textures.push_back(texture); mutable_storage_textures.push_back(texture);
} }
if (texture->owner.is_valid()) { DEV_ASSERT(!texture->owner.is_valid() || texture_owner.get_or_null(texture->owner));
texture = texture_owner.get_or_null(texture->owner);
ERR_FAIL_COND_V(!texture, RID()); // Bug, should never happen.
}
img_info.imageLayout = VK_IMAGE_LAYOUT_GENERAL; img_info.imageLayout = VK_IMAGE_LAYOUT_GENERAL;
@@ -5736,10 +5728,7 @@ RID RenderingDeviceVulkan::uniform_set_create(const Vector<Uniform> &p_uniforms,
img_info.sampler = VK_NULL_HANDLE; img_info.sampler = VK_NULL_HANDLE;
img_info.imageView = texture->view; img_info.imageView = texture->view;
if (texture->owner.is_valid()) { DEV_ASSERT(!texture->owner.is_valid() || texture_owner.get_or_null(texture->owner));
texture = texture_owner.get_or_null(texture->owner);
ERR_FAIL_COND_V(!texture, RID()); // Bug, should never happen.
}
img_info.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL; img_info.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;