diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-12-02 20:42:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-02 20:42:20 +0100 |
| commit | b36ff888a0e5b4fa2c53cce8ed78321d727bc041 (patch) | |
| tree | f9bca7f6950e8a69fd61c0ea8b341a4976accb80 /drivers | |
| parent | 3beab2646fa8744a84382d9fcfb73848404fe5b5 (diff) | |
| parent | 70f5972905a5ea6916e9aab909f9a34b963f67b1 (diff) | |
Merge pull request #44025 from reduz/refactor-mesh
Refactored Mesh internals and formats.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/vulkan/rendering_device_vulkan.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/vulkan/rendering_device_vulkan.cpp b/drivers/vulkan/rendering_device_vulkan.cpp index 23e6b3bfb6..bf27342b74 100644 --- a/drivers/vulkan/rendering_device_vulkan.cpp +++ b/drivers/vulkan/rendering_device_vulkan.cpp @@ -615,6 +615,7 @@ int RenderingDeviceVulkan::get_format_vertex_size(DataFormat p_format) { case DATA_FORMAT_B8G8R8A8_SNORM: case DATA_FORMAT_B8G8R8A8_UINT: case DATA_FORMAT_B8G8R8A8_SINT: + case DATA_FORMAT_A2B10G10R10_UNORM_PACK32: return 4; case DATA_FORMAT_R16_UNORM: case DATA_FORMAT_R16_SNORM: @@ -3528,7 +3529,7 @@ RenderingDevice::VertexFormatID RenderingDeviceVulkan::vertex_format_create(cons ERR_FAIL_COND_V(used_locations.has(p_vertex_formats[i].location), INVALID_ID); ERR_FAIL_COND_V_MSG(get_format_vertex_size(p_vertex_formats[i].format) == 0, INVALID_ID, - "Data format for attachment (" + itos(i) + ") is not valid for a vertex array."); + "Data format for attachment (" + itos(i) + "), '" + named_formats[p_vertex_formats[i].format] + "', is not valid for a vertex array."); vdcache.bindings[i].binding = i; vdcache.bindings[i].stride = p_vertex_formats[i].stride; |