[d3d9] Fix a bunch of Wine test failures #3895

K0bin · 2024-03-06T23:47:51Z

Fixes the following Wine test failures:

StretchRect, lighting, specular_lighting

visual.c:4451: Test failed: Test 6, got unexpected hr 0.
visual.c:4451: Test failed: Test 7, got unexpected hr 0.
visual.c:4451: Test failed: Test 8, got unexpected hr 0.
visual.c:4451: Test failed: Test 9, got unexpected hr 0.
visual.c:4451: Test failed: Test 14, got unexpected hr 0.
visual.c:4451: Test failed: Test 15, got unexpected hr 0.
visual.c:4451: Test failed: Test 16, got unexpected hr 0.
visual.c:4451: Test failed: Test 17, got unexpected hr 0.
visual.c:4451: Test failed: Test 22, got unexpected hr 0.
visual.c:4451: Test failed: Test 23, got unexpected hr 0.
visual.c:4451: Test failed: Test 24, got unexpected hr 0.
visual.c:4451: Test failed: Test 25, got unexpected hr 0.
visual.c:4451: Test failed: Test 30, got unexpected hr 0.
visual.c:4451: Test failed: Test 31, got unexpected hr 0.
visual.c:4451: Test failed: Test 32, got unexpected hr 0.
visual.c:4451: Test failed: Test 36, got unexpected hr 0.
visual.c:4451: Test failed: Test 38, got unexpected hr 0.
visual.c:4451: Test failed: Test 39, got unexpected hr 0.
visual.c:4451: Test failed: Test 40, got unexpected hr 0.
visual.c:4451: Test failed: Test 41, got unexpected hr 0.
visual.c:4451: Test failed: Test 42, got unexpected hr 0.
visual.c:4451: Test failed: Test 43, got unexpected hr 0.
visual.c:4451: Test failed: Test 44, got unexpected hr 0.
visual.c:4451: Test failed: Test 46, got unexpected hr 0.
visual.c:4451: Test failed: Test 47, got unexpected hr 0.
visual.c:4451: Test failed: Test 49, got unexpected hr 0.
visual.c:4451: Test failed: Test 51, got unexpected hr 0.
visual.c:4451: Test failed: Test 53, got unexpected hr 0.

visual.c:15446: Test failed: Got hr 0.
visual.c:15462: Test failed: Got hr 0.
visual.c:15466: Test failed: Got hr 0.
visual.c:15468: Test failed: Got hr 0.

visual.c:1126: Test failed: Expected color 0x00000000 at location (160, 120), got 0x00ffffff, case 7.
visual.c:1126: Test failed: Expected color 0x00000000 at location (320, 120), got 0x00adadad, case 7.
visual.c:1126: Test failed: Expected color 0x00000000 at location (480, 120), got 0x005a5a5a, case 7.
visual.c:1126: Test failed: Expected color 0x00000000 at location (160, 240), got 0x00ffffff, case 7.
visual.c:1126: Test failed: Expected color 0x00000000 at location (320, 240), got 0x00d1d1d1, case 7.
visual.c:1126: Test failed: Expected color 0x00000000 at location (480, 240), got 0x00636363, case 7.
visual.c:1126: Test failed: Expected color 0x00000000 at location (160, 360), got 0x00ffffff, case 7.
visual.c:1126: Test failed: Expected color 0x00000000 at location (320, 360), got 0x00adadad, case 7.
visual.c:1126: Test failed: Expected color 0x00000000 at location (480, 360), got 0x005a5a5a, case 7.

Actually matches the documentation here: https://learn.microsoft.com/en-us/windows/win32/api/d3d9/nf-d3d9-idirect3ddevice9-stretchrect

mrdeathjr28 · 2024-03-07T00:08:30Z

hi

which apps are affected with this?

K0bin · 2024-03-07T01:11:48Z

I don't know if any apps are affected. I want to make DXVK play nice with the Wine tests.

src/d3d9/d3d9_device.cpp

K0bin · 2024-03-12T23:09:33Z

229 failures left in the visual category.
dxvk_test_result_2024_03_12.txt

K0bin · 2024-03-13T01:03:24Z

82d8:stateblock: 14738 tests executed (0 marked as todo, 0 as flaky, 0 failures), 0 skipped.

We now pass all state block tests.

src/d3d9/d3d9_device.cpp

K0bin · 2024-03-27T22:57:48Z

I think I'll try to land this first batch before looking into more of the tests.

src/d3d9/d3d9_device.cpp

src/util/util_matrix.cpp

Joshua-Ashton · 2024-04-17T11:33:40Z

src/d3d9/d3d9_device.cpp

    rs[D3DRS_POINTSPRITEENABLE]          = FALSE;
    rs[D3DRS_POINTSCALEENABLE]           = FALSE;
    rs[D3DRS_POINTSCALE_A]               = bit::cast<DWORD>(1.0f);
    rs[D3DRS_POINTSCALE_B]               = bit::cast<DWORD>(0.0f);
    rs[D3DRS_POINTSCALE_C]               = bit::cast<DWORD>(0.0f);
    rs[D3DRS_POINTSIZE]                  = bit::cast<DWORD>(1.0f);
    rs[D3DRS_POINTSIZE_MIN]              = bit::cast<DWORD>(1.0f);
-    rs[D3DRS_POINTSIZE_MAX]              = bit::cast<DWORD>(64.0f);
+    rs[D3DRS_POINTSIZE_MAX]              = bit::cast<DWORD>(limits.pointSizeRange[1]);


"The default render state value has to match what we report in the device caps."

And does that match what any DX9 implementation exposes? We should check that.

MaxPointSize is 8192 in the D3D8 dump that Winter did. (With a NVIDIA GeForce4 Ti 4800 SE).

The Vulkan max point size range is generally much lower unless you're using an AMD GPU.
https://vulkan.gpuinfo.org/displaydevicelimit.php?name=pointSizeRange[1]&platform=linux

So considering that setting the max to 64.0 hasn't caused any issue so far, this should be fine?

For what it's worth that still is the case for Nvidia, namely MaxPointSize is 8192 even with modern drivers/cards. AMD sets it somewhat lower, e.g. 256 on @Blisto91's 7900 XTX.

src/util/util_small_vector.h

src/d3d9/d3d9_stateblock.h

src/d3d9/d3d9_swvp_emu.h

doitsujin

Couple questions.

In general I'd prefer to have unrelated fixes to be PR'd separately though, even if it means a fair bit of PR spam. Makes it easier to review and most of the commits in here would be good to go as-is anyway.

doitsujin · 2024-05-27T18:33:11Z

src/d3d9/d3d9_adapter.cpp

@@ -531,7 +533,7 @@ namespace dxvk {
    // Max Vertex Blend Matrix Index
    pCaps->MaxVertexBlendMatrixIndex = 0;
    // Max Point Size
-    pCaps->MaxPointSize              = 256.0f;
+    pCaps->MaxPointSize              = limits.pointSizeRange[1];


Are games going to be fine with this not being an integer value / power-of-two? Vulkan drivers will report the upper limit of their fixed-point representation here, which is generally something of the format (2^n - 1)/(2^m).

pCaps->MaxPointSize is a float, so you'd hope that games are fine if that's not an integer value. At least I don't have anything indicating they wouldn't be. We could ofc round it down to the nearest integer or power of two but right now I don't see any reason to do that so I'd prefer to wait until we hit a game that actually needs it.

Before we also reported a value that was potentially larger than what the Vulkan driver supports and didn't encounter any problem with that in a game either, so I don't think games actually check this value.

doitsujin · 2024-05-27T18:38:21Z

src/util/util_matrix.cpp

@@ -205,6 +205,10 @@ namespace dxvk {
    Vector4 dot0    = { m[0] * row0 };
    float dot1      = (dot0.x + dot0.y) + (dot0.z + dot0.w);

+    if (unlikely(std::abs(dot1) <= 0.000001f)) {


Which part of the API relies on this and do we have a way to verify native behaviour?

Not the biggest fan of the design here since this is a utility function and we're not giving feedback to the caller.

It's specifically about calculating the normal matrix from the world matrix.

Wine tests what D3D9 does with a singular matrix here.

Would you prefer it if I check the determinant separately even if that means calculating it twice?

doitsujin · 2024-05-27T18:42:25Z

src/d3d9/d3d9_device.cpp

+      bool srcIsSurface = srcTextureInfo->GetType() == D3DRTYPE_SURFACE;
+      bool dstIsSurface = dstTextureInfo->GetType() == D3DRTYPE_SURFACE;
+      bool srcHasRTUsage = (srcTextureInfo->Desc()->Usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL)) != 0;
+      if (unlikely(!dstHasRTUsage && (!dstIsSurface || !srcIsSurface || srcHasRTUsage)))


What exactly does the D3DRTYPE_SURFACE requirement accomplish here? What about textures with only one mip?

This is implementing the no stretching table:

Coming from the docs

Checking surface && !usage_rt && !usage_ds is the easiest way to check for offscreen plain surfaces.

I also added a comment explaining it.

Also fixes a Wine test.

Fixes the diffuse alpha and the direction.

Fixes the Wine test "test_specular_lighting".

Fixes a Wine test and matches further testing on Windows.

The default render state value has to match what we report in the device caps. Fixes a Wine stateblock test.

K0bin added the d3d9 label Mar 6, 2024

K0bin marked this pull request as draft March 7, 2024 16:03

K0bin changed the title ~~[d3d9] Fix Wine test failures in StretchRect~~ [d3d9] Fix a bunch of Wine test failures Mar 7, 2024

K0bin force-pushed the wine-test branch from 75e2f94 to 893fcdc Compare March 7, 2024 20:01

doitsujin reviewed Mar 8, 2024

View reviewed changes

src/d3d9/d3d9_device.cpp Outdated Show resolved Hide resolved

K0bin force-pushed the wine-test branch 2 times, most recently from cd2b68b to 90eb194 Compare March 11, 2024 18:16

DadSchoorse reviewed Mar 13, 2024

View reviewed changes

src/d3d9/d3d9_device.cpp Outdated Show resolved Hide resolved

WinterSnowfall reviewed Mar 13, 2024

View reviewed changes

src/d3d9/d3d9_device.cpp Outdated Show resolved Hide resolved

K0bin force-pushed the wine-test branch 2 times, most recently from 8fc6d83 to ae512ba Compare March 13, 2024 18:31

K0bin marked this pull request as ready for review March 27, 2024 22:57

Joshua-Ashton requested changes Apr 17, 2024

View reviewed changes

K0bin force-pushed the wine-test branch from ae512ba to 2ff0cc8 Compare April 18, 2024 09:30

doitsujin reviewed Apr 22, 2024

View reviewed changes

src/util/util_small_vector.h Show resolved Hide resolved

doitsujin reviewed Apr 22, 2024

View reviewed changes

src/d3d9/d3d9_stateblock.h Show resolved Hide resolved

doitsujin reviewed Apr 22, 2024

View reviewed changes

src/d3d9/d3d9_swvp_emu.h Outdated Show resolved Hide resolved

K0bin force-pushed the wine-test branch 2 times, most recently from 8ac8246 to 6a1cd59 Compare April 23, 2024 16:15

doitsujin reviewed May 27, 2024

View reviewed changes

K0bin added 5 commits May 28, 2024 00:53

[d3d9] Fix Wine test failures in StretchRect

0f3826f

[d3d9] Skip presenting if D3D9Swapchain has no associated window

6e6dfa0

[d3d9] Fix reference leak in ProcessVertices

15ec3fb

Also fixes a Wine test.

[d3d9] Fix default light

a2a3c37

Fixes the diffuse alpha and the direction.

[util] Return unchanged matrix if matrix cannot be inverted

c140456

K0bin added 5 commits May 28, 2024 00:53

[d3d9] FF: Prevent specular highlights on the back of geometry

474da24

Fixes the Wine test "test_specular_lighting".

[d3d9] Ignore the vertex stream offset in StateBlock::Capture

9848a8a

Fixes a Wine test and matches further testing on Windows.

[d3d9] Use max point size of Vulkan device

dfde833

The default render state value has to match what we report in the device caps. Fixes a Wine stateblock test.

[util] Add move & copy constructors to small_vector

3d4d686

[d3d9] Reduce data copied for SWVP vertex decls

adf2443

K0bin force-pushed the wine-test branch from 6a1cd59 to adf2443 Compare May 27, 2024 22:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[d3d9] Fix a bunch of Wine test failures #3895

[d3d9] Fix a bunch of Wine test failures #3895

K0bin commented Mar 6, 2024 •

edited

mrdeathjr28 commented Mar 7, 2024

K0bin commented Mar 7, 2024

K0bin commented Mar 12, 2024 •

edited

K0bin commented Mar 13, 2024

K0bin commented Mar 27, 2024

Joshua-Ashton Apr 17, 2024

K0bin Apr 18, 2024 •

edited

WinterSnowfall Apr 18, 2024 •

edited

doitsujin left a comment

doitsujin May 27, 2024

K0bin May 27, 2024 •

edited

doitsujin May 27, 2024 •

edited

K0bin May 27, 2024

doitsujin May 27, 2024

K0bin May 27, 2024 •

edited

K0bin May 27, 2024

[d3d9] Fix a bunch of Wine test failures #3895

Are you sure you want to change the base?

[d3d9] Fix a bunch of Wine test failures #3895

Conversation

K0bin commented Mar 6, 2024 • edited

mrdeathjr28 commented Mar 7, 2024

K0bin commented Mar 7, 2024

K0bin commented Mar 12, 2024 • edited

K0bin commented Mar 13, 2024

K0bin commented Mar 27, 2024

Joshua-Ashton Apr 17, 2024

Choose a reason for hiding this comment

K0bin Apr 18, 2024 • edited

Choose a reason for hiding this comment

WinterSnowfall Apr 18, 2024 • edited

Choose a reason for hiding this comment

doitsujin left a comment

Choose a reason for hiding this comment

doitsujin May 27, 2024

Choose a reason for hiding this comment

K0bin May 27, 2024 • edited

Choose a reason for hiding this comment

doitsujin May 27, 2024 • edited

Choose a reason for hiding this comment

K0bin May 27, 2024

Choose a reason for hiding this comment

doitsujin May 27, 2024

Choose a reason for hiding this comment

K0bin May 27, 2024 • edited

Choose a reason for hiding this comment

K0bin May 27, 2024

Choose a reason for hiding this comment

K0bin commented Mar 6, 2024 •

edited

K0bin commented Mar 12, 2024 •

edited

K0bin Apr 18, 2024 •

edited

WinterSnowfall Apr 18, 2024 •

edited

K0bin May 27, 2024 •

edited

doitsujin May 27, 2024 •

edited

K0bin May 27, 2024 •

edited