[PATCH 2/8] wined3d: Add R8G8_UNORM vertex format.

[Józef Kucia]

Signed-off-by: Józef Kucia 
---
 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 90488edef6f3..4a02b3f51f69 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 062f8662aa72..469ce1bdacfd 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},

[Marvin]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=48525

Your paranoid android.

=== wvistau64 (32 bit report) ===

d3d11:
d3d11.c:5617: Test failed: Got unexpected IAVertices count: 0.
d3d11.c:5618: Test failed: Got unexpected IAPrimitives count: 0.
d3d11.c:5619: Test failed: Got unexpected VSInvocations count: 0.
d3d11.c:5622: Test failed: Got unexpected CInvocations count: 0.
d3d11.c:5623: Test failed: Got unexpected CPrimitives count: 0.

=== debian9 (32 bit French report) ===

d3d11:
d3d11.c:5593: Test failed: Got unexpected hr 0x8876086a.
Unhandled exception: page fault on read access to 0x00000001 in 32-bit code (0x7ed11f0d).

=== debian9 (32 bit Japanese:Japan report) ===

d3d11:
d3d11.c:5595: Test failed: Got unexpected data size 0.
Unhandled exception: assertion failed in 32-bit code (0xf77e3c89).

Report errors:
d3d11:d3d11 crashed (80000101)

=== debian9 (32 bit Chinese:China report) ===

d3d11:
d3d11.c:5593: Test failed: Got unexpected hr 0x8876086a.
Unhandled exception: page fault on read access to 0x00000001 in 32-bit code (0x7eb4ef0d).

=== debian9 (32 bit WoW report) ===

d3d11:
Unhandled exception: page fault on read access to 0x3f800000 in 32-bit code (0x7ed11f0d).

=== debian9 (64 bit WoW report) ===

d3d11:
d3d11.c:5593: Test failed: Got unexpected hr 0x8876086a.
Unhandled exception: page fault on execute access to 0x00000000 in 64-bit code (0x0000000000000000).

Report errors:
d3d11:d3d11 crashed (c0000005)

[Henri Verbeet]

Signed-off-by: Henri Verbeet