Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-09-20 14:32:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Vulkan: account for externally backed textures (i.e., created via texture_create_from_extension()), as such textures lack ownership information.

Browse Source 
More info: #96832
This commit is contained in:
Sander 2024-09-11 02:25:12 +03:00 committed by Kroket
parent 97ef3c8372
commit 41fdc55b05
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/vulkan/rendering_device_driver_vulkan.cpp
View File

@ -1772,16 +1772,17 @@ RDD::TextureID RenderingDeviceDriverVulkan::texture_create_from_extension(uint64
tex_info->vk_view = vk_image_view; tex_info->vk_view = vk_image_view;
tex_info->rd_format = p_format; tex_info->rd_format = p_format;
tex_info->vk_view_create_info = image_view_create_info; tex_info->vk_view_create_info = image_view_create_info;
#ifdef DEBUG_ENABLED
tex_info->created_from_extension = true;
#endif
return TextureID(tex_info); return TextureID(tex_info);
} }
RDD::TextureID RenderingDeviceDriverVulkan::texture_create_shared(TextureID p_original_texture, const TextureView &p_view) { RDD::TextureID RenderingDeviceDriverVulkan::texture_create_shared(TextureID p_original_texture, const TextureView &p_view) {
const TextureInfo *owner_tex_info = (const TextureInfo *)p_original_texture.id; const TextureInfo *owner_tex_info = (const TextureInfo *)p_original_texture.id;
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
ERR_FAIL_COND_V(!owner_tex_info->allocation.handle, TextureID()); ERR_FAIL_COND_V(!owner_tex_info->allocation.handle && !owner_tex_info->created_from_extension, TextureID());
#endif #endif
VkImageViewCreateInfo image_view_create_info = owner_tex_info->vk_view_create_info; VkImageViewCreateInfo image_view_create_info = owner_tex_info->vk_view_create_info;
image_view_create_info.format = RD_TO_VK_FORMAT[p_view.format]; image_view_create_info.format = RD_TO_VK_FORMAT[p_view.format];
image_view_create_info.components.r = (VkComponentSwizzle)p_view.swizzle_r; image_view_create_info.components.r = (VkComponentSwizzle)p_view.swizzle_r;
@ -1837,7 +1838,7 @@ RDD::TextureID RenderingDeviceDriverVulkan::texture_create_shared(TextureID p_or
RDD::TextureID RenderingDeviceDriverVulkan::texture_create_shared_from_slice(TextureID p_original_texture, const TextureView &p_view, TextureSliceType p_slice_type, uint32_t p_layer, uint32_t p_layers, uint32_t p_mipmap, uint32_t p_mipmaps) { RDD::TextureID RenderingDeviceDriverVulkan::texture_create_shared_from_slice(TextureID p_original_texture, const TextureView &p_view, TextureSliceType p_slice_type, uint32_t p_layer, uint32_t p_layers, uint32_t p_mipmap, uint32_t p_mipmaps) {
const TextureInfo *owner_tex_info = (const TextureInfo *)p_original_texture.id; const TextureInfo *owner_tex_info = (const TextureInfo *)p_original_texture.id;
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
ERR_FAIL_COND_V(!owner_tex_info->allocation.handle, TextureID()); ERR_FAIL_COND_V(!owner_tex_info->allocation.handle && !owner_tex_info->created_from_extension, TextureID());
#endif #endif
VkImageViewCreateInfo image_view_create_info = owner_tex_info->vk_view_create_info; VkImageViewCreateInfo image_view_create_info = owner_tex_info->vk_view_create_info;

3
drivers/vulkan/rendering_device_driver_vulkan.h
View File

@ -213,6 +213,9 @@ public:
VmaAllocation handle = nullptr; VmaAllocation handle = nullptr;
VmaAllocationInfo info = {}; VmaAllocationInfo info = {};
} allocation; // All 0/null if just a view. } allocation; // All 0/null if just a view.
#ifdef DEBUG_ENABLED
bool created_from_extension = false;
#endif
}; };
VkSampleCountFlagBits _ensure_supported_sample_count(TextureSamples p_requested_sample_count); VkSampleCountFlagBits _ensure_supported_sample_count(TextureSamples p_requested_sample_count);