=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Add few missing formats.
Alexandre Julliard
julliard at winehq.org
Fri Aug 12 10:00:58 CDT 2016
Module: wine
Branch: master
Commit: 4323924b2de57d1c04cf8ecdd2957519fbd7a551
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4323924b2de57d1c04cf8ecdd2957519fbd7a551
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Thu Aug 11 12:57:24 2016 +0200
wined3d: Add few missing 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/d3d11/utils.c | 12 ++++++++++++
dlls/dxgi/utils.c | 12 ++++++++++++
dlls/wined3d/utils.c | 4 ++++
include/wine/wined3d.h | 4 ++++
4 files changed, 32 insertions(+)
diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c
index 36cad41..370858e 100644
--- a/dlls/d3d11/utils.c
+++ b/dlls/d3d11/utils.c
@@ -139,10 +139,14 @@ const char *debug_dxgi_format(DXGI_FORMAT format)
WINE_D3D_TO_STR(DXGI_FORMAT_B5G5R5A1_UNORM);
WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8A8_UNORM);
WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8X8_UNORM);
+ WINE_D3D_TO_STR(DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM);
WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8A8_TYPELESS);
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_BC6H_TYPELESS);
+ WINE_D3D_TO_STR(DXGI_FORMAT_BC6H_UF16);
+ WINE_D3D_TO_STR(DXGI_FORMAT_BC6H_SF16);
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);
@@ -255,10 +259,14 @@ 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_R10G10B10_XR_BIAS_A2_UNORM: return DXGI_FORMAT_R10G10B10_XR_BIAS_A2_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_BC6H_TYPELESS: return DXGI_FORMAT_BC6H_TYPELESS;
+ case WINED3DFMT_BC6H_UF16: return DXGI_FORMAT_BC6H_UF16;
+ case WINED3DFMT_BC6H_SF16: return DXGI_FORMAT_BC6H_SF16;
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;
@@ -361,10 +369,14 @@ 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_R10G10B10_XR_BIAS_A2_UNORM: return WINED3DFMT_R10G10B10_XR_BIAS_A2_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_BC6H_TYPELESS: return WINED3DFMT_BC6H_TYPELESS;
+ case DXGI_FORMAT_BC6H_UF16: return WINED3DFMT_BC6H_UF16;
+ case DXGI_FORMAT_BC6H_SF16: return WINED3DFMT_BC6H_SF16;
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;
diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c
index 9371de1..b9be4a5 100644
--- a/dlls/dxgi/utils.c
+++ b/dlls/dxgi/utils.c
@@ -137,10 +137,14 @@ 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_R10G10B10_XR_BIAS_A2_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_BC6H_TYPELESS);
+ WINE_DXGI_TO_STR(DXGI_FORMAT_BC6H_UF16);
+ WINE_DXGI_TO_STR(DXGI_FORMAT_BC6H_SF16);
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);
@@ -245,10 +249,14 @@ 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_R10G10B10_XR_BIAS_A2_UNORM: return DXGI_FORMAT_R10G10B10_XR_BIAS_A2_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_BC6H_TYPELESS: return DXGI_FORMAT_BC6H_TYPELESS;
+ case WINED3DFMT_BC6H_UF16: return DXGI_FORMAT_BC6H_UF16;
+ case WINED3DFMT_BC6H_SF16: return DXGI_FORMAT_BC6H_SF16;
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;
@@ -351,10 +359,14 @@ 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_R10G10B10_XR_BIAS_A2_UNORM: return WINED3DFMT_R10G10B10_XR_BIAS_A2_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_BC6H_TYPELESS: return WINED3DFMT_BC6H_TYPELESS;
+ case DXGI_FORMAT_BC6H_UF16: return WINED3DFMT_BC6H_UF16;
+ case DXGI_FORMAT_BC6H_SF16: return WINED3DFMT_BC6H_SF16;
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;
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 31d5014..f02220c 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -3671,6 +3671,7 @@ const char *debug_d3dformat(enum wined3d_format_id format_id)
FMT_TO_STR(WINED3DFMT_R10G10B10A2_UNORM);
FMT_TO_STR(WINED3DFMT_R10G10B10A2_UINT);
FMT_TO_STR(WINED3DFMT_R10G10B10A2_SNORM);
+ FMT_TO_STR(WINED3DFMT_R10G10B10_XR_BIAS_A2_UNORM);
FMT_TO_STR(WINED3DFMT_R11G11B10_FLOAT);
FMT_TO_STR(WINED3DFMT_R8G8B8A8_TYPELESS);
FMT_TO_STR(WINED3DFMT_R8G8B8A8_UNORM);
@@ -3738,6 +3739,9 @@ const char *debug_d3dformat(enum wined3d_format_id format_id)
FMT_TO_STR(WINED3DFMT_B8G8R8A8_UNORM_SRGB);
FMT_TO_STR(WINED3DFMT_B8G8R8X8_TYPELESS);
FMT_TO_STR(WINED3DFMT_B8G8R8X8_UNORM_SRGB);
+ FMT_TO_STR(WINED3DFMT_BC6H_TYPELESS);
+ FMT_TO_STR(WINED3DFMT_BC6H_UF16);
+ FMT_TO_STR(WINED3DFMT_BC6H_SF16);
FMT_TO_STR(WINED3DFMT_BC7_TYPELESS);
FMT_TO_STR(WINED3DFMT_BC7_UNORM);
FMT_TO_STR(WINED3DFMT_BC7_UNORM_SRGB);
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 1e50020..1c9b262 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -151,6 +151,7 @@ enum wined3d_format_id
WINED3DFMT_R10G10B10A2_UNORM,
WINED3DFMT_R10G10B10A2_UINT,
WINED3DFMT_R10G10B10A2_SNORM,
+ WINED3DFMT_R10G10B10_XR_BIAS_A2_UNORM,
WINED3DFMT_R11G11B10_FLOAT,
WINED3DFMT_R8G8B8A8_TYPELESS,
WINED3DFMT_R8G8B8A8_UNORM,
@@ -218,6 +219,9 @@ enum wined3d_format_id
WINED3DFMT_B8G8R8A8_UNORM_SRGB,
WINED3DFMT_B8G8R8X8_TYPELESS,
WINED3DFMT_B8G8R8X8_UNORM_SRGB,
+ WINED3DFMT_BC6H_TYPELESS,
+ WINED3DFMT_BC6H_UF16,
+ WINED3DFMT_BC6H_SF16,
WINED3DFMT_BC7_TYPELESS,
WINED3DFMT_BC7_UNORM,
WINED3DFMT_BC7_UNORM_SRGB,
More information about the wine-cvs
mailing list