[PATCH] wined3d: Implement WINED3DFMT_B8G8R8X8_UNORM to WINED3DFMT_L8_UNORM conversion

[Stanislav Zhukov]

Fixes https://bugs.winehq.org/show_bug.cgi?id=44888

Signed-off-by: Stanislav Zhukov 
---
 dlls/wined3d/surface.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 5217033..351d888 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -801,6 +801,25 @@ static void convert_yuy2_r5g6b5(const BYTE *src, BYTE *dst,
     }
 }

+static void convert_x8r8g8b8_l8(const BYTE *src, BYTE *dst,
+        DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h)
+{
+    unsigned int x, y;
+
+    TRACE("Converting %ux%u pixels, pitches %u %u.\n", w, h, pitch_in, pitch_out);
+
+    for (y = 0; y < h; ++y)
+    {
+        const DWORD *src_line = (const DWORD *)(src + y * pitch_in);
+        BYTE *dst_line = (BYTE *)(dst + y * pitch_out);
+
+        for (x = 0; x < w; ++x)
+        {
+            dst_line[x] = src_line[x] & 0x000000ff;
+        }
+    }
+}
+
 struct d3dfmt_converter_desc
 {
     enum wined3d_format_id from, to;
@@ -815,6 +834,7 @@ static const struct d3dfmt_converter_desc converters[] =
     {WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_B8G8R8A8_UNORM,  convert_a8r8g8b8_x8r8g8b8},
     {WINED3DFMT_YUY2,           WINED3DFMT_B8G8R8X8_UNORM,  convert_yuy2_x8r8g8b8},
     {WINED3DFMT_YUY2,           WINED3DFMT_B5G6R5_UNORM,    convert_yuy2_r5g6b5},
+    {WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_L8_UNORM,        convert_x8r8g8b8_l8},
 };

static inline const struct d3dfmt_converter_desc *find_converter(enum wined3d_format_id from,

[Henri Verbeet]

On 8 May 2018 at 14:09, Stanislav Zhukov  wrote:
> +static void convert_x8r8g8b8_l8(const BYTE *src, BYTE *dst,
> -
>    DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h)
>
> +{
> - unsigned int x, y;
> -
> - TRACE("Converting %ux%u pixels, pitches %u %u.\n", w, h, pitch_in, pitch_out);
> -
> - for (y = 0; y < h; ++y)
> - {
> -
>    const DWORD *src_line = (const DWORD *)(src + y * pitch_in);
> -
>    BYTE *dst_line = (BYTE *)(dst + y * pitch_out);
> -
> -
>    for (x = 0; x < w; ++x)
> -
>    {
> -
>        dst_line[x] = src_line[x] & 0x000000ff;
> -
>    }
> - }
>
> +}
> -

This looks reasonable enough on first sight (although I wouldn't have
been surprised if we had to calculate actual luminance), but could you
please write a small test to go along with this? Both to show the
implementation is correct and to prevent future regressions.