diff --git a/Sources/Backends/D3D11/D3D11Image.c b/Sources/Backends/D3D11/D3D11Image.c
index 9ba91ed..5a1f96a 100644
--- a/Sources/Backends/D3D11/D3D11Image.c
+++ b/Sources/Backends/D3D11/D3D11Image.c
@@ -8,6 +8,54 @@
 #include "D3D11Image.h"
 #include "D3D11Device.h"
 
+static DXGI_FORMAT PulseImageFormatToDXGIFormat[] = {
+    DXGI_FORMAT_UNKNOWN,              // INVALID
+    DXGI_FORMAT_A8_UNORM,             // A8_UNORM
+    DXGI_FORMAT_R8_UNORM,             // R8_UNORM
+    DXGI_FORMAT_R8G8_UNORM,           // R8G8_UNORM
+    DXGI_FORMAT_R8G8B8A8_UNORM,       // R8G8B8A8_UNORM
+    DXGI_FORMAT_R16_UNORM,            // R16_UNORM
+    DXGI_FORMAT_R16G16_UNORM,         // R16G16_UNORM
+    DXGI_FORMAT_R16G16B16A16_UNORM,   // R16G16B16A16_UNORM
+    DXGI_FORMAT_R10G10B10A2_UNORM,    // R10G10B10A2_UNORM
+    DXGI_FORMAT_B5G6R5_UNORM,         // B5G6R5_UNORM
+    DXGI_FORMAT_B5G5R5A1_UNORM,       // B5G5R5A1_UNORM
+    DXGI_FORMAT_B4G4R4A4_UNORM,       // B4G4R4A4_UNORM
+    DXGI_FORMAT_B8G8R8A8_UNORM,       // B8G8R8A8_UNORM
+    DXGI_FORMAT_R8_SNORM,             // R8_SNORM
+    DXGI_FORMAT_R8G8_SNORM,           // R8G8_SNORM
+    DXGI_FORMAT_R8G8B8A8_SNORM,       // R8G8B8A8_SNORM
+    DXGI_FORMAT_R16_SNORM,            // R16_SNORM
+    DXGI_FORMAT_R16G16_SNORM,         // R16G16_SNORM
+    DXGI_FORMAT_R16G16B16A16_SNORM,   // R16G16B16A16_SNORM
+    DXGI_FORMAT_R16_FLOAT,            // R16_FLOAT
+    DXGI_FORMAT_R16G16_FLOAT,         // R16G16_FLOAT
+    DXGI_FORMAT_R16G16B16A16_FLOAT,   // R16G16B16A16_FLOAT
+    DXGI_FORMAT_R32_FLOAT,            // R32_FLOAT
+    DXGI_FORMAT_R32G32_FLOAT,         // R32G32_FLOAT
+    DXGI_FORMAT_R32G32B32A32_FLOAT,   // R32G32B32A32_FLOAT
+    DXGI_FORMAT_R11G11B10_FLOAT,      // R11G11B10_UFLOAT
+    DXGI_FORMAT_R8_UINT,              // R8_UINT
+    DXGI_FORMAT_R8G8_UINT,            // R8G8_UINT
+    DXGI_FORMAT_R8G8B8A8_UINT,        // R8G8B8A8_UINT
+    DXGI_FORMAT_R16_UINT,             // R16_UINT
+    DXGI_FORMAT_R16G16_UINT,          // R16G16_UINT
+    DXGI_FORMAT_R16G16B16A16_UINT,    // R16G16B16A16_UINT
+    DXGI_FORMAT_R32_UINT,             // R32_UINT
+    DXGI_FORMAT_R32G32_UINT,          // R32G32_UINT
+    DXGI_FORMAT_R32G32B32A32_UINT,    // R32G32B32A32_UINT
+	DXGI_FORMAT_R8_SINT,              // R8_INT
+	DXGI_FORMAT_R8G8_SINT,            // R8G8_INT
+	DXGI_FORMAT_R8G8B8A8_SINT,        // R8G8B8A8_INT
+	DXGI_FORMAT_R16_SINT,             // R16_INT
+	DXGI_FORMAT_R16G16_SINT,          // R16G16_INT
+	DXGI_FORMAT_R16G16B16A16_SINT,    // R16G16B16A16_INT
+	DXGI_FORMAT_R32_SINT,             // R32_INT
+	DXGI_FORMAT_R32G32_SINT,          // R32G32_INT
+	DXGI_FORMAT_R32G32B32A32_SINT,    // R32G32B32A32_INT
+};
+PULSE_STATIC_ASSERT(PulseImageFormatToDXGIFormat, PULSE_SIZEOF_ARRAY(PulseImageFormatToDXGIFormat) == PULSE_IMAGE_FORMAT_MAX_ENUM);
+
 PulseImage Direct3D11CreateImage(PulseDevice device, const PulseImageCreateInfo* create_infos)
 {
 	Direct3D11Device* d3d11_device = D3D11_RETRIEVE_DRIVER_DATA_AS(device, Direct3D11Device*);
@@ -23,6 +71,14 @@ PulseImage Direct3D11CreateImage(PulseDevice device, const PulseImageCreateInfo*
 
 bool Direct3D11IsImageFormatValid(PulseDevice device, PulseImageFormat format, PulseImageType type, PulseImageUsageFlags usage)
 {
+	Direct3D11Device* d3d11_device = D3D11_RETRIEVE_DRIVER_DATA_AS(device, Direct3D11Device*);
+	DXGI_FORMAT dxgi_format = PulseImageFormatToDXGIFormat[format];
+	UINT format_support;
+
+	if(FAILED(ID3D11Device_CheckFormatSupport(d3d11_device->device, dxgi_format, &format_support)))
+		return false; // Format does not exist ?
+
+	return true;
 }
 
 bool Direct3D11CopyImageToBuffer(PulseCommandList cmd, const PulseImageRegion* src, const PulseBufferRegion* dst)
diff --git a/Sources/Backends/Vulkan/VulkanImage.c b/Sources/Backends/Vulkan/VulkanImage.c
index c8fe49a..7388aac 100644
--- a/Sources/Backends/Vulkan/VulkanImage.c
+++ b/Sources/Backends/Vulkan/VulkanImage.c
@@ -69,13 +69,23 @@ static VkComponentMapping SwizzleForFormat(PulseImageFormat format)
 		};
 	}
 
-	if(format == PULSE_IMAGE_FORMAT_B4G4R4A4_UNORM)
+	if(format == PULSE_IMAGE_FORMAT_B5G6R5_UNORM)
 	{
 		return (VkComponentMapping){
+			VK_COMPONENT_SWIZZLE_B,
 			VK_COMPONENT_SWIZZLE_G,
 			VK_COMPONENT_SWIZZLE_R,
-			VK_COMPONENT_SWIZZLE_A,
-			VK_COMPONENT_SWIZZLE_B
+			VK_COMPONENT_SWIZZLE_ZERO
+		};
+	}
+
+	if(format == PULSE_IMAGE_FORMAT_B5G5R5A1_UNORM)
+	{
+		return (VkComponentMapping){
+			VK_COMPONENT_SWIZZLE_B,
+			VK_COMPONENT_SWIZZLE_G,
+			VK_COMPONENT_SWIZZLE_R,
+			VK_COMPONENT_SWIZZLE_A
 		};
 	}