[PATCH] wined3d: Add WINED3DFMT_R11G11B10_FLOAT vertex format.

[Andrey Gusev]

Used by Dark Souls: Remastered.

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com>
---
 dlls/d3d10core/tests/d3d10core.c | 2 ++
 dlls/d3d11/tests/d3d11.c         | 2 ++
 dlls/wined3d/utils.c             | 1 +
 3 files changed, 5 insertions(+)

diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c
index a4729f9d2d3..a1c4be46b7f 100644
--- a/dlls/d3d10core/tests/d3d10core.c
+++ b/dlls/d3d10core/tests/d3d10core.c
@@ -12370,6 +12370,7 @@ static void test_create_input_layout(void)
         DXGI_FORMAT_R16G16_FLOAT,
         DXGI_FORMAT_R16G16_UINT,
         DXGI_FORMAT_R16G16_SINT,
+        DXGI_FORMAT_R11G11B10_FLOAT,
         DXGI_FORMAT_R32_FLOAT,
         DXGI_FORMAT_R32_UINT,
         DXGI_FORMAT_R32_SINT,
@@ -13649,6 +13650,7 @@ static void test_format_support(void)
     static const struct format_support vertex_buffers[] =
     {
         {DXGI_FORMAT_R8G8_UINT},
+        {DXGI_FORMAT_R11G11B10_FLOAT},
         {DXGI_FORMAT_R16_FLOAT},
     };
 
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index 53087684acf..5a8affbf75a 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -18549,6 +18549,7 @@ static void test_create_input_layout(void)
         DXGI_FORMAT_R16G16_FLOAT,
         DXGI_FORMAT_R16G16_UINT,
         DXGI_FORMAT_R16G16_SINT,
+        DXGI_FORMAT_R11G11B10_FLOAT,
         DXGI_FORMAT_R32_FLOAT,
         DXGI_FORMAT_R32_UINT,
         DXGI_FORMAT_R32_SINT,
@@ -20623,6 +20624,7 @@ static void test_format_support(const D3D_FEATURE_LEVEL feature_level)
     static const struct format_support vertex_buffers[] =
     {
         {DXGI_FORMAT_R8G8_UINT, D3D_FEATURE_LEVEL_10_0},
+        {DXGI_FORMAT_R11G11B10_FLOAT, D3D_FEATURE_LEVEL_10_0},
         {DXGI_FORMAT_R16_FLOAT, D3D_FEATURE_LEVEL_10_0},
     };
 
diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c
index ef2e28b545a..61e77f46ebc 100644
--- a/dlls/wined3d/utils.c
+++ b/dlls/wined3d/utils.c
@@ -709,6 +709,7 @@ static const struct wined3d_format_vertex_info format_vertex_info[] =
     {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FFP_EMIT_SHORT4N,   GL_SHORT},
     {WINED3DFMT_R16G16_UNORM,       WINED3D_FFP_EMIT_USHORT2N,  GL_UNSIGNED_SHORT},
     {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FFP_EMIT_USHORT4N,  GL_UNSIGNED_SHORT},
+    {WINED3DFMT_R11G11B10_FLOAT,    WINED3D_FFP_EMIT_FLOAT3,    GL_FLOAT},
     {WINED3DFMT_R10G10B10X2_UINT,   WINED3D_FFP_EMIT_UDEC3,     GL_UNSIGNED_SHORT},
     {WINED3DFMT_R10G10B10X2_SNORM,  WINED3D_FFP_EMIT_DEC3N,     GL_SHORT},
     {WINED3DFMT_R10G10B10A2_UNORM,  WINED3D_FFP_EMIT_INVALID,   GL_UNSIGNED_INT_2_10_10_10_REV,
-- 
2.33.1

[Marvin]

Hi,

While running your changed tests, 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=104172

Your paranoid android.


=== w1064 (32 bit report) ===

d3d11:
d3d11.c:5920: Test failed: Got unexpected IAVertices count: 0.
d3d11.c:5921: Test failed: Got unexpected IAPrimitives count: 0.
d3d11.c:5922: Test failed: Got unexpected VSInvocations count: 0.
d3d11.c:5925: Test failed: Got unexpected CInvocations count: 0.
d3d11.c:5926: Test failed: Got unexpected CPrimitives count: 0.
d3d11.c:5765: Test failed: Got unexpected query result 0x0000000000000000.

=== w10pro64 (32 bit report) ===

d3d11:
d3d11.c:5920: Test failed: Got unexpected IAVertices count: 0.
d3d11.c:5921: Test failed: Got unexpected IAPrimitives count: 0.
d3d11.c:5922: Test failed: Got unexpected VSInvocations count: 0.
d3d11.c:5925: Test failed: Got unexpected CInvocations count: 0.
d3d11.c:5926: Test failed: Got unexpected CPrimitives count: 0.

=== debian11 (32 bit Arabic:Morocco report) ===

d3d11:
d3d11.c:28264: Test succeeded inside todo block: Got 0xffffffff, expected 0xffffffff at (640, 480, 1), sub-resource 0.

=== debian11 (32 bit German report) ===

d3d11:
d3d11.c:9770: Test failed: d3d11.c:15155: Test marked todo: Got hr 0 for WRITE.

=== debian11 (32 bit Hindi:India report) ===

d3d11:
d3d11.c:28255: Test failed: Got 0xffffffff, expected 0xff00ff00 at (639, 479, 0), sub-resource 0.

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

d3d11:
d3d11.c:9770: Test failed: d3d11.c:15155: Test marked todo: Got hr 0 for WRITE.

[Henri Verbeet]

On Thu, 16 Dec 2021 at 19:19, Andrey Gusev <andrey.goosev(a)gmail.com> wrote:
> @@ -709,6 +709,7 @@ static const struct wined3d_format_vertex_info format_vertex_info[] =
>      {WINED3DFMT_R16G16B16A16_SNORM, WINED3D_FFP_EMIT_SHORT4N,   GL_SHORT},
>      {WINED3DFMT_R16G16_UNORM,       WINED3D_FFP_EMIT_USHORT2N,  GL_UNSIGNED_SHORT},
>      {WINED3DFMT_R16G16B16A16_UNORM, WINED3D_FFP_EMIT_USHORT4N,  GL_UNSIGNED_SHORT},
> +    {WINED3DFMT_R11G11B10_FLOAT,    WINED3D_FFP_EMIT_FLOAT3,    GL_FLOAT},

Unfortunately it's a little harder than that. GL_FLOAT expects 32-bit
float components (i.e., like R32_FLOAT), while
WINED3DFMT_R11G11B10_FLOAT is a packed "11.11.10" floating-point
format. This needs GL_UNSIGNED_INT_10F_11F_11F_REV, provided by the
ARB_vertex_type_10f_11f_11f_rev extension.

The WINED3DFMT_R10G10B10A2_UNORM format is somewhat similar; you could
use that as an example.