=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Add remaining sRGB formats.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Feb 10 11:11:11 CST 2016
Module: wine
Branch: master
Commit: 9c98d632779862aae15e9e3a25f59065fae03386
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c98d632779862aae15e9e3a25f59065fae03386
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Wed Feb 10 02:14:26 2016 +0100
wined3d: Add remaining sRGB 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/wined3d/utils.c | 14 +++++++++++++-
include/wine/wined3d.h | 7 +++++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 9f21be6..d355ee1 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -85,7 +85,9 @@ static const struct wined3d_format_channels formats[] =
/* Standard ARGB formats. */
{WINED3DFMT_B8G8R8_UNORM, 8, 8, 8, 0, 16, 8, 0, 0, 3, 0, 0},
{WINED3DFMT_B8G8R8A8_UNORM, 8, 8, 8, 8, 16, 8, 0, 24, 4, 0, 0},
+ {WINED3DFMT_B8G8R8A8_UNORM_SRGB, 8, 8, 8, 8, 16, 8, 0, 24, 4, 0, 0},
{WINED3DFMT_B8G8R8X8_UNORM, 8, 8, 8, 0, 16, 8, 0, 0, 4, 0, 0},
+ {WINED3DFMT_B8G8R8X8_UNORM_SRGB, 8, 8, 8, 0, 16, 8, 0, 0, 4, 0, 0},
{WINED3DFMT_B5G6R5_UNORM, 5, 6, 5, 0, 11, 5, 0, 0, 2, 0, 0},
{WINED3DFMT_B5G5R5X1_UNORM, 5, 5, 5, 0, 10, 5, 0, 0, 2, 0, 0},
{WINED3DFMT_B5G5R5A1_UNORM, 5, 5, 5, 1, 10, 5, 0, 15, 2, 0, 0},
@@ -1414,10 +1416,13 @@ struct wined3d_format_srgb_info
static const struct wined3d_format_srgb_info format_srgb_info[] =
{
+ {WINED3DFMT_R8G8B8A8_UNORM_SRGB, WINED3DFMT_R8G8B8A8_UNORM},
{WINED3DFMT_BC1_UNORM_SRGB, WINED3DFMT_BC1_UNORM},
{WINED3DFMT_BC2_UNORM_SRGB, WINED3DFMT_BC2_UNORM},
{WINED3DFMT_BC3_UNORM_SRGB, WINED3DFMT_BC3_UNORM},
- {WINED3DFMT_R8G8B8A8_UNORM_SRGB, WINED3DFMT_R8G8B8A8_UNORM},
+ {WINED3DFMT_B8G8R8A8_UNORM_SRGB, WINED3DFMT_B8G8R8A8_UNORM},
+ {WINED3DFMT_B8G8R8X8_UNORM_SRGB, WINED3DFMT_B8G8R8X8_UNORM},
+ {WINED3DFMT_BC7_UNORM_SRGB, WINED3DFMT_BC7_UNORM},
};
static inline int getFmtIdx(enum wined3d_format_id format_id)
@@ -3276,6 +3281,13 @@ const char *debug_d3dformat(enum wined3d_format_id format_id)
FMT_TO_STR(WINED3DFMT_B5G5R5A1_UNORM);
FMT_TO_STR(WINED3DFMT_B8G8R8A8_UNORM);
FMT_TO_STR(WINED3DFMT_B8G8R8X8_UNORM);
+ FMT_TO_STR(WINED3DFMT_B8G8R8A8_TYPELESS);
+ FMT_TO_STR(WINED3DFMT_B8G8R8A8_UNORM_SRGB);
+ FMT_TO_STR(WINED3DFMT_B8G8R8X8_TYPELESS);
+ FMT_TO_STR(WINED3DFMT_B8G8R8X8_UNORM_SRGB);
+ FMT_TO_STR(WINED3DFMT_BC7_TYPELESS);
+ FMT_TO_STR(WINED3DFMT_BC7_UNORM);
+ FMT_TO_STR(WINED3DFMT_BC7_UNORM_SRGB);
FMT_TO_STR(WINED3DFMT_INTZ);
FMT_TO_STR(WINED3DFMT_RESZ);
FMT_TO_STR(WINED3DFMT_NULL);
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index df95da9..f314af3 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -214,6 +214,13 @@ enum wined3d_format_id
WINED3DFMT_B5G5R5A1_UNORM,
WINED3DFMT_B8G8R8A8_UNORM,
WINED3DFMT_B8G8R8X8_UNORM,
+ WINED3DFMT_B8G8R8A8_TYPELESS,
+ WINED3DFMT_B8G8R8A8_UNORM_SRGB,
+ WINED3DFMT_B8G8R8X8_TYPELESS,
+ WINED3DFMT_B8G8R8X8_UNORM_SRGB,
+ WINED3DFMT_BC7_TYPELESS,
+ WINED3DFMT_BC7_UNORM,
+ WINED3DFMT_BC7_UNORM_SRGB,
/* FOURCC formats. */
WINED3DFMT_UYVY = WINEMAKEFOURCC('U','Y','V','Y'),
WINED3DFMT_YUY2 = WINEMAKEFOURCC('Y','U','Y','2'),
More information about the wine-cvs
mailing list