=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Add R8G8_UNORM vertex format.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8205547f966a60d207dbbbd3375bad2542ad5caa
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=8205547f966a60d207dbbbd3375bad2542ad5caa

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Fri Mar  1 13:31:25 2019 +0100

wined3d: Add R8G8_UNORM vertex format.

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/tests/d3d11.c | 3 ++-
 dlls/wined3d/utils.c     | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index 90488ed..4a02b3f 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -16341,6 +16341,7 @@ static void test_create_input_layout(void)
         DXGI_FORMAT_R32_SINT,
         DXGI_FORMAT_R16_UINT,
         DXGI_FORMAT_R16_SINT,
+        DXGI_FORMAT_R8G8_UNORM,
         DXGI_FORMAT_R8_UINT,
         DXGI_FORMAT_R8_SINT,
     };
@@ -16357,7 +16358,7 @@ static void test_create_input_layout(void)
         layout_desc->Format = vertex_formats[i];
         hr = ID3D11Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc),
                 vs_code, sizeof(vs_code), &input_layout);
-        ok(SUCCEEDED(hr), "Failed to create input layout for format %#x, hr %#x.\n",
+        ok(hr == S_OK, "Failed to create input layout for format %#x, hr %#x.\n",
                 vertex_formats[i], hr);
         refcount = get_refcount(device);
         ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n",
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index 062f866..469ce1b 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -633,6 +633,7 @@ static const struct wined3d_format_vertex_info format_vertex_info[] =
     {WINED3DFMT_R16G16B16A16_FLOAT, WINED3D_FFP_EMIT_FLOAT16_4, GL_HALF_FLOAT, ARB_HALF_FLOAT_VERTEX},
     {WINED3DFMT_R8G8B8A8_SNORM,     WINED3D_FFP_EMIT_INVALID,   GL_BYTE},
     {WINED3DFMT_R8G8B8A8_SINT,      WINED3D_FFP_EMIT_INVALID,   GL_BYTE},
+    {WINED3DFMT_R8G8_UNORM,         WINED3D_FFP_EMIT_INVALID,   GL_UNSIGNED_BYTE},
     {WINED3DFMT_R16G16B16A16_UINT,  WINED3D_FFP_EMIT_INVALID,   GL_UNSIGNED_SHORT},
     {WINED3DFMT_R8_UNORM,           WINED3D_FFP_EMIT_INVALID,   GL_UNSIGNED_BYTE},
     {WINED3DFMT_R8_UINT,            WINED3D_FFP_EMIT_INVALID,   GL_UNSIGNED_BYTE},