diff options
| author | Jason Ekstrand <[email protected]> | 2015-12-02 17:47:37 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-12-03 13:44:02 -0800 |
| commit | fa2435de3c1d849571e4929291d808cd8b46c080 (patch) | |
| tree | 4bfed558dbc63c8ba45382091a01a30e9830f979 /src/vulkan/anv_wsi_wayland.c | |
| parent | 4e904a0310be8a5c311355473e70df4fd4d9caa1 (diff) | |
vk/0.210.0: Update the VkFormat enum
Diffstat (limited to 'src/vulkan/anv_wsi_wayland.c')
| -rw-r--r-- | src/vulkan/anv_wsi_wayland.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/vulkan/anv_wsi_wayland.c b/src/vulkan/anv_wsi_wayland.c index 412501445dd..d75919ea19a 100644 --- a/src/vulkan/anv_wsi_wayland.c +++ b/src/vulkan/anv_wsi_wayland.c @@ -80,6 +80,10 @@ static uint32_t wl_drm_format_for_vk_format(VkFormat vk_format, bool alpha) { switch (vk_format) { + /* TODO: Figure out what all the formats mean and make this table + * correct. + */ +#if 0 case VK_FORMAT_R4G4B4A4_UNORM: return alpha ? WL_DRM_FORMAT_ABGR4444 : WL_DRM_FORMAT_XBGR4444; case VK_FORMAT_R5G6B5_UNORM: @@ -98,12 +102,15 @@ wl_drm_format_for_vk_format(VkFormat vk_format, bool alpha) return WL_DRM_FORMAT_RGB565; case VK_FORMAT_B5G5R5A1_UNORM: return alpha ? WL_DRM_FORMAT_XRGB1555 : WL_DRM_FORMAT_XRGB1555; +#endif case VK_FORMAT_B8G8R8_UNORM: return WL_DRM_FORMAT_BGRX8888; case VK_FORMAT_B8G8R8A8_UNORM: return alpha ? WL_DRM_FORMAT_ARGB8888 : WL_DRM_FORMAT_XRGB8888; +#if 0 case VK_FORMAT_B10G10R10A2_UNORM: return alpha ? WL_DRM_FORMAT_ARGB2101010 : WL_DRM_FORMAT_XRGB2101010; +#endif default: assert("!Unsupported Vulkan format"); @@ -117,6 +124,7 @@ drm_handle_format(void *data, struct wl_drm *drm, uint32_t wl_format) struct wsi_wl_display *display = data; switch (wl_format) { +#if 0 case WL_DRM_FORMAT_ABGR4444: case WL_DRM_FORMAT_XBGR4444: wsi_wl_display_add_vk_format(display, VK_FORMAT_R4G4B4A4_UNORM); @@ -149,16 +157,19 @@ drm_handle_format(void *data, struct wl_drm *drm, uint32_t wl_format) case WL_DRM_FORMAT_XRGB1555: wsi_wl_display_add_vk_format(display, VK_FORMAT_B5G5R5A1_UNORM); break; +#endif case WL_DRM_FORMAT_XRGB8888: wsi_wl_display_add_vk_format(display, VK_FORMAT_B8G8R8_UNORM); /* fallthrough */ case WL_DRM_FORMAT_ARGB8888: wsi_wl_display_add_vk_format(display, VK_FORMAT_B8G8R8A8_UNORM); break; +#if 0 case WL_DRM_FORMAT_ARGB2101010: case WL_DRM_FORMAT_XRGB2101010: wsi_wl_display_add_vk_format(display, VK_FORMAT_B10G10R10A2_UNORM); break; +#endif } } |