=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: dxgi: Add recently introduced wined3d formats.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Mar 4 09:48:34 CST 2016
Module: wine
Branch: master
Commit: 71e35c46b05fcbf87c06309771158bf0df8863f0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=71e35c46b05fcbf87c06309771158bf0df8863f0
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Fri Mar 4 11:43:27 2016 +0100
dxgi: Add recently introduced wined3d formats.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dxgi/utils.c | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c
index 92a049f..dea1b69 100644
--- a/dlls/dxgi/utils.c
+++ b/dlls/dxgi/utils.c
@@ -120,8 +120,15 @@ const char *debug_dxgi_format(DXGI_FORMAT format)
WINE_DXGI_TO_STR(DXGI_FORMAT_B5G5R5A1_UNORM);
WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8A8_UNORM);
WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8X8_UNORM);
+ WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8A8_TYPELESS);
+ WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8A8_UNORM_SRGB);
+ WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8X8_TYPELESS);
+ WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8X8_UNORM_SRGB);
+ WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_TYPELESS);
+ WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_UNORM);
+ WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_UNORM_SRGB);
default:
- FIXME("Unrecognized DXGI_FORMAT %#x\n", format);
+ FIXME("Unrecognized DXGI_FORMAT %#x.\n", format);
return "unrecognized";
}
}
@@ -221,6 +228,13 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format)
case WINED3DFMT_B5G5R5A1_UNORM: return DXGI_FORMAT_B5G5R5A1_UNORM;
case WINED3DFMT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM;
case WINED3DFMT_B8G8R8X8_UNORM: return DXGI_FORMAT_B8G8R8X8_UNORM;
+ case WINED3DFMT_B8G8R8A8_TYPELESS: return DXGI_FORMAT_B8G8R8A8_TYPELESS;
+ 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;
@@ -320,8 +334,15 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format)
case DXGI_FORMAT_B5G5R5A1_UNORM: return WINED3DFMT_B5G5R5A1_UNORM;
case DXGI_FORMAT_B8G8R8A8_UNORM: return WINED3DFMT_B8G8R8A8_UNORM;
case DXGI_FORMAT_B8G8R8X8_UNORM: return WINED3DFMT_B8G8R8X8_UNORM;
+ case DXGI_FORMAT_B8G8R8A8_TYPELESS: return WINED3DFMT_B8G8R8A8_TYPELESS;
+ 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);
+ FIXME("Unhandled DXGI_FORMAT %#x.\n", format);
return WINED3DFMT_UNKNOWN;
}
}
More information about the wine-cvs
mailing list