Module: wine Branch: master Commit: 012b282ffac7de5460e4e2dbe887085ec0dbe377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=012b282ffac7de5460e4e2dbe8...
Author: Józef Kucia jkucia@codeweavers.com Date: Fri Mar 4 11:43:28 2016 +0100
d3d11: Sync formats with dxgi.
Signed-off-by: Józef Kucia jkucia@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3d11/utils.c | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 6c6212c..d05ff3d 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -143,6 +143,9 @@ const char *debug_dxgi_format(DXGI_FORMAT format) WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8A8_UNORM_SRGB); WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8X8_TYPELESS); WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8X8_UNORM_SRGB); + WINE_D3D_TO_STR(DXGI_FORMAT_BC7_TYPELESS); + WINE_D3D_TO_STR(DXGI_FORMAT_BC7_UNORM); + WINE_D3D_TO_STR(DXGI_FORMAT_BC7_UNORM_SRGB); default: FIXME("Unrecognized DXGI_FORMAT %#x.\n", format); return "unrecognized"; @@ -248,6 +251,9 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_B8G8R8A8_UNORM_SRGB: return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; case WINED3DFMT_B8G8R8X8_TYPELESS: return DXGI_FORMAT_B8G8R8X8_TYPELESS; case WINED3DFMT_B8G8R8X8_UNORM_SRGB: return DXGI_FORMAT_B8G8R8X8_UNORM_SRGB; + case WINED3DFMT_BC7_TYPELESS: return DXGI_FORMAT_BC7_TYPELESS; + case WINED3DFMT_BC7_UNORM: return DXGI_FORMAT_BC7_UNORM; + case WINED3DFMT_BC7_UNORM_SRGB: return DXGI_FORMAT_BC7_UNORM_SRGB; default: FIXME("Unhandled wined3d format %#x.\n", format); return DXGI_FORMAT_UNKNOWN; @@ -351,6 +357,9 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB: return WINED3DFMT_B8G8R8A8_UNORM_SRGB; case DXGI_FORMAT_B8G8R8X8_TYPELESS: return WINED3DFMT_B8G8R8X8_TYPELESS; case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB: return WINED3DFMT_B8G8R8X8_UNORM_SRGB; + case DXGI_FORMAT_BC7_TYPELESS: return WINED3DFMT_BC7_TYPELESS; + case DXGI_FORMAT_BC7_UNORM: return WINED3DFMT_BC7_UNORM; + case DXGI_FORMAT_BC7_UNORM_SRGB: return WINED3DFMT_BC7_UNORM_SRGB; default: FIXME("Unhandled DXGI_FORMAT %#x.\n", format); return WINED3DFMT_UNKNOWN;