[PATCH 0/1] MR2657: d3d9/tests: test table fog z vs rhw with shaders, depth bias, oDepth..

List overview All Threads

newer

older

[PATCH v2 0/4] MR2665:...

[PATCH v5 0/12] MR148:...

Aleksey Komarov (＠q4a)

16 Apr 2023 16 Apr '23

11:15 a.m.

General idea of this test is to show that a lot of factors influence the fog when transformed and untransformed vertex format was used: - Directly changing z and w (which is not equal in the corners). - Changing projection matrix that change z and w. - Using different programmable/ff vs/ps shader. - Using different depth bias. - Chaging depth in pixel shader (oDepth) may or may not affect to colors depending on the vendor implementation. - And various combinations of above.

This gives `succ` in all cases on this configs: - Windows 10 with Radeon HD 8400 or Ivy Bridge GT1 (Intel HD Graphics). - Windows 7 with Radeon HD 6450. - Windows XP with GeForce Go 7300.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2657

Show replies by date

Aleksey Komarov

16 Apr 16 Apr

11:15 a.m.

New subject: [PATCH 1/1] d3d9/tests: test table fog z vs rhw with shaders, depth bias, oDepth..

From: Aleksey Komarov q4arus@ya.ru

diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2c83965f0cb..eed0fa0771a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -20981,6 +20981,311 @@ done: DestroyWindow(window); }

+static void test_table_shader_fog(void) +{ + IDirect3DVertexShader9 *vertex_shader[2] = { NULL, NULL, }; + IDirect3DPixelShader9 *pixel_shader[3] = { NULL, NULL, NULL, }; + float start = 0.0f, end = 1.5f; + unsigned int color; + HRESULT hr; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + IDirect3DSurface9 *ds; + ULONG refcount; + HWND window; + D3DCAPS9 caps; + /* basic vertex shader with reversed fog computation ("foggy") */ + static const DWORD vertex_shader_code1[] = + { + 0xfffe0101, /* vs_1_1 */ + 0x0000001f, 0x80000000, 0x900f0000, /* dcl_position v0 */ + 0x0000001f, 0x8000000a, 0x900f0001, /* dcl_color0 v1 */ + 0x00000051, 0xa00f0000, 0xbfa00000, 0x00000000, 0xbf666666, 0x00000000, /* def c0, -1.25, 0.0, -0.9, 0.0 */ + 0x00000001, 0xc00f0000, 0x90e40000, /* mov oPos, v0 */ + 0x00000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ + 0x00000002, 0x800f0000, 0x90aa0000, 0xa0aa0000, /* add r0, v0.z, c0.z */ + 0x00000005, 0xc00f0001, 0x80000000, 0xa0000000, /* mul oFog, r0.x, c0.x */ + 0x0000ffff + }; + /* basic pixel shader */ + static const DWORD pixel_shader_code1[] = + { + 0xffff0101, /* ps_1_1 */ + 0x00000001, 0x800f0000, 0x90e40000, /* mov r0, v0 */ + 0x0000ffff + }; + /* pixel shader with oDepth = 0.5 */ + static const DWORD pixel_shader_code2[] = + { + 0xffff0200, /* ps_2_0 */ + 0x05000051, 0xa00f0000, 0x3f000000, 0x00000000, 0x00000000, 0x00000000, /* def c0, 0.5, 0.0, 0.0, 0.0 */ + 0x0200001f, 0x80000000, 0x900f0000, /* dcl v0 */ + 0x02000001, 0x800f0800, 0x90e40000, /* mov oC0, v0 */ + 0x02000001, 0x900f0800, 0xa0000000, /* mov oDepth, c0.x */ + 0x0000ffff + }; + static struct + { + struct vec4 position; + unsigned int diffuse; + } + untransformed_q[] = + { + { {160.0f, 120.0f, 0.0f, 0.0f}, 0xffff0000}, + { {480.0f, 120.0f, 0.0f, 0.0f}, 0xffff0000}, + { {160.0f, 360.0f, 0.0f, 0.0f}, 0xffff0000}, + { {480.0f, 360.0f, 0.0f, 0.0f}, 0xffff0000}, + }; + static struct + { + struct vec3 position; + unsigned int diffuse; + } + transformed_q[] = + { + {{-0.5f, 0.5f, 0.0f}, 0xffff0000}, + {{ 0.5f, 0.5f, 0.0f}, 0xffff0000}, + {{-0.5f, -0.5f, 0.0f}, 0xffff0000}, + {{ 0.5f, -0.5f, 0.0f}, 0xffff0000}, + }; + + /* projection matrix */ + static const D3DMATRIX proj[] = + { + {{{ + 0.75f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.202f, 1.0f, + 0.0f, 0.0f, -0.202f, 0.0f + }}}, + {{{ + 1.5f, 0.0f, 0.0f, 0.0f, + 0.0f, 2.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 0.404f, 2.0f, + 0.0f, 0.0f, -0.404f, 0.0f + }}}, + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f + }}}, + }; + union + { + float f; + DWORD d; + } conv; + + static const struct + { + int vshader, pshader; + unsigned int matrix_id; + float z, rhw, depth_bias; + unsigned int format_bits; + unsigned int color1; /* Colors received in Windows with: Radeon HD 8400, HD 6450 and GeForce Go 7300 */ + unsigned int color2; /* Colors received in Windows with Ivy Bridge GT1 */ + } + tests[] = + { + /* cases 0-9 */ + {0, 0, 0, 0.2f, 0.2f, 0.0f, D3DFVF_XYZRHW, 0x0000ff00, 0x0000ff00}, + {0, 0, 0, 0.2f, 0.2f, 0.0f, D3DFVF_XYZ, 0x000000ff, 0x000000ff}, + {0, 0, 0, 1.2f, 1.2f, 0.0f, D3DFVF_XYZRHW, 0x00986700, 0x00986700}, + {0, 0, 0, 1.2f, 1.2f, 0.0f, D3DFVF_XYZ, 0x0008f600, 0x0008f600}, + {0, 0, 1, 0.2f, 0.2f, 0.0f, D3DFVF_XYZRHW, 0x0000ff00, 0x0000ff00}, + {0, 0, 1, 0.2f, 0.2f, 0.0f, D3DFVF_XYZ, 0x000000ff, 0x000000ff}, + {0, 0, 1, 1.2f, 1.2f, 0.0f, D3DFVF_XYZRHW, 0x00986700, 0x00986700}, + {0, 0, 1, 1.2f, 1.2f, 0.0f, D3DFVF_XYZ, 0x0000ff00, 0x0000ff00}, + {0, 0, 2, 0.2f, 0.2f, 0.0f, D3DFVF_XYZRHW, 0x00b24c00, 0x00b24c00}, + {0, 0, 2, 0.2f, 0.2f, 0.0f, D3DFVF_XYZ, 0x00b24c00, 0x00b24c00}, + /* cases 10-19 */ + {0, 0, 2, 1.2f, 1.2f, 0.0f, D3DFVF_XYZRHW, 0x0008f600, 0x0008f600}, + {0, 0, 2, 1.2f, 1.2f, 0.0f, D3DFVF_XYZ, 0x000000ff, 0x000000ff}, + {0, 1, 0, 0.2f, 0.2f, 0.0f, D3DFVF_XYZRHW, 0x0000ff00, 0x0000ff00}, + {0, 1, 0, 0.2f, 0.2f, 0.0f, D3DFVF_XYZ, 0x000000ff, 0x000000ff}, + {0, 1, 0, 1.2f, 1.2f, 0.0f, D3DFVF_XYZRHW, 0x00986700, 0x00986700}, + {0, 1, 0, 1.2f, 1.2f, 0.0f, D3DFVF_XYZ, 0x0008f600, 0x0008f600}, + {0, 1, 1, 0.2f, 0.2f, 0.0f, D3DFVF_XYZRHW, 0x0000ff00, 0x0000ff00}, + {0, 1, 1, 0.2f, 0.2f, 0.0f, D3DFVF_XYZ, 0x000000ff, 0x000000ff}, + {0, 1, 1, 1.2f, 1.2f, 0.0f, D3DFVF_XYZRHW, 0x00986700, 0x00986700}, + {0, 1, 1, 1.2f, 1.2f, 0.0f, D3DFVF_XYZ, 0x0000ff00, 0x0000ff00}, + /* cases 20-29 */ + {0, 1, 2, 0.2f, 0.2f, 0.0f, D3DFVF_XYZRHW, 0x00b24c00, 0x00b24c00}, + {0, 1, 2, 0.2f, 0.2f, 0.0f, D3DFVF_XYZ, 0x00b24c00, 0x00b24c00}, + {0, 1, 2, 1.2f, 1.2f, 0.0f, D3DFVF_XYZRHW, 0x0008f600, 0x0008f600}, + {0, 1, 2, 1.2f, 1.2f, 0.0f, D3DFVF_XYZ, 0x000000ff, 0x000000ff}, + {1, 0, 0, 0.2f, 0.2f, 0.0f, D3DFVF_XYZRHW, 0x0000ff00, 0x0000ff00}, + {1, 0, 0, 0.2f, 0.2f, 0.0f, D3DFVF_XYZ, 0x0055aa00, 0x0055aa00}, + {1, 0, 0, 1.2f, 1.2f, 0.0f, D3DFVF_XYZRHW, 0x00986700, 0x00986700}, + {1, 0, 0, 1.2f, 1.2f, 0.0f, D3DFVF_XYZ, 0x000000ff, 0x000000ff}, + {1, 0, 1, 0.2f, 0.2f, 0.0f, D3DFVF_XYZRHW, 0x0000ff00, 0x0000ff00}, + {1, 0, 1, 0.2f, 0.2f, 0.0f, D3DFVF_XYZ, 0x0055aa00, 0x0055aa00}, + /* cases 30-39 */ + {1, 0, 1, 1.2f, 1.2f, 0.0f, D3DFVF_XYZRHW, 0x00986700, 0x00986700}, + {1, 0, 1, 1.2f, 1.2f, 0.0f, D3DFVF_XYZ, 0x000000ff, 0x000000ff}, + {1, 0, 2, 0.2f, 0.2f, 0.0f, D3DFVF_XYZRHW, 0x00b24c00, 0x00b24c00}, + {1, 0, 2, 0.2f, 0.2f, 0.0f, D3DFVF_XYZ, 0x00b24c00, 0x00b24c00}, + {1, 0, 2, 1.2f, 1.2f, 0.0f, D3DFVF_XYZRHW, 0x0008f600, 0x0008f600}, + {1, 0, 2, 1.2f, 1.2f, 0.0f, D3DFVF_XYZ, 0x000000ff, 0x000000ff}, + {1, 1, 0, 0.2f, 0.2f, 0.0f, D3DFVF_XYZRHW, 0x0000ff00, 0x0000ff00}, + {1, 1, 0, 0.2f, 0.2f, 0.0f, D3DFVF_XYZ, 0x0055aa00, 0x0055aa00}, + {1, 1, 0, 1.2f, 1.2f, 0.0f, D3DFVF_XYZRHW, 0x00986700, 0x00986700}, + {1, 1, 0, 1.2f, 1.2f, 0.0f, D3DFVF_XYZ, 0x000000ff, 0x000000ff}, + /* cases 40-49 */ + {1, 1, 1, 0.2f, 0.2f, 0.0f, D3DFVF_XYZRHW, 0x0000ff00, 0x0000ff00}, + {1, 1, 1, 0.2f, 0.2f, 0.0f, D3DFVF_XYZ, 0x0055aa00, 0x0055aa00}, + {1, 1, 1, 1.2f, 1.2f, 0.0f, D3DFVF_XYZRHW, 0x00986700, 0x00986700}, + {1, 1, 1, 1.2f, 1.2f, 0.0f, D3DFVF_XYZ, 0x000000ff, 0x000000ff}, + {1, 1, 2, 0.2f, 0.2f, 0.2f, D3DFVF_XYZRHW, 0x00906e00, 0x00906e00}, + {1, 1, 2, 0.2f, 0.2f, 0.2f, D3DFVF_XYZ, 0x00906e00, 0x00906e00}, + {1, 1, 2, 1.2f, 1.2f, 0.2f, D3DFVF_XYZRHW, 0x0000ff00, 0x0000ff00}, + {1, 1, 2, 1.2f, 1.2f, 0.2f, D3DFVF_XYZ, 0x000000ff, 0x000000ff}, + {0, 2, 0, 0.2f, 0.2f, 0.2f, D3DFVF_XYZRHW, 0x0000ff00, 0x0000ff00}, + {0, 2, 0, 0.2f, 0.2f, 0.2f, D3DFVF_XYZ, 0x000000ff, 0x000000ff}, + /* cases 50-59 */ + {0, 2, 0, 1.2f, 1.2f, 0.2f, D3DFVF_XYZRHW, 0x00986700, 0x00986700}, + {0, 2, 0, 1.2f, 1.2f, 0.2f, D3DFVF_XYZ, 0x0008f600, 0x0008f600}, + {0, 2, 1, 0.2f, 0.2f, 0.2f, D3DFVF_XYZRHW, 0x0000ff00, 0x0000ff00}, + {0, 2, 1, 0.2f, 0.2f, 0.2f, D3DFVF_XYZ, 0x000000ff, 0x000000ff}, + {0, 2, 1, 1.2f, 1.2f, 0.0f, D3DFVF_XYZRHW, 0x00986700, 0x00986700}, + {0, 2, 1, 1.2f, 1.2f, 0.0f, D3DFVF_XYZ, 0x0000ff00, 0x0000ff00}, + {0, 2, 2, 0.2f, 0.2f, 0.0f, D3DFVF_XYZRHW, 0x00b24c00, 0x00aa5500}, /* color1 != color2 */ + {0, 2, 2, 0.2f, 0.2f, 0.0f, D3DFVF_XYZ, 0x00b24c00, 0x00aa5500}, /* color1 != color2 */ + {0, 2, 2, 1.2f, 1.2f, 0.0f, D3DFVF_XYZRHW, 0x0008f600, 0x00aa5500}, /* color1 != color2 */ + {0, 2, 2, 1.2f, 1.2f, 0.0f, D3DFVF_XYZ, 0x000000ff, 0x000000ff}, + /* cases 60-69 */ + {1, 2, 0, 0.2f, 0.2f, 0.0f, D3DFVF_XYZRHW, 0x0000ff00, 0x0000ff00}, + {1, 2, 0, 0.2f, 0.2f, 0.0f, D3DFVF_XYZ, 0x0055aa00, 0x0055aa00}, + {1, 2, 0, 1.2f, 1.2f, 0.0f, D3DFVF_XYZRHW, 0x00986700, 0x00986700}, + {1, 2, 0, 1.2f, 1.2f, 0.0f, D3DFVF_XYZ, 0x000000ff, 0x000000ff}, + {1, 2, 1, 0.2f, 0.2f, 0.0f, D3DFVF_XYZRHW, 0x0000ff00, 0x0000ff00}, + {1, 2, 1, 0.2f, 0.2f, 0.0f, D3DFVF_XYZ, 0x0055aa00, 0x0055aa00}, + {1, 2, 1, 1.2f, 1.2f, 0.0f, D3DFVF_XYZRHW, 0x00986700, 0x00986700}, + {1, 2, 1, 1.2f, 1.2f, 0.0f, D3DFVF_XYZ, 0x000000ff, 0x000000ff}, + {1, 2, 2, 0.2f, 0.2f, 0.0f, D3DFVF_XYZRHW, 0x00b24c00, 0x00aa5500}, /* color1 != color2 */ + {1, 2, 2, 0.2f, 0.2f, 0.0f, D3DFVF_XYZ, 0x00b24c00, 0x00aa5500}, /* color1 != color2 */ + /* cases 70-71 */ + {1, 2, 2, 1.2f, 1.2f, 0.0f, D3DFVF_XYZRHW, 0x0008f600, 0x00aa5500}, /* color1 != color2 */ + {1, 2, 2, 1.2f, 1.2f, 0.0f, D3DFVF_XYZ, 0x000000ff, 0x000000ff}, + }; + unsigned int i; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#lx.\n", hr); + if (!(caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE)) + { + skip("D3DPRASTERCAPS_FOGTABLE not supported, skipping POSITIONT table fog test.\n"); + goto done; + } + + hr = IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code1, &vertex_shader[1]); + ok(SUCCEEDED(hr), "CreateVertexShader failed, hr %#lx.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, pixel_shader_code1, &pixel_shader[1]); + ok(SUCCEEDED(hr), "CreatePixelShader failed, hr %#lx.\n", hr); + hr = IDirect3DDevice9_CreatePixelShader(device, pixel_shader_code2, &pixel_shader[2]); + ok(SUCCEEDED(hr), "CreatePixelShader failed, hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, TRUE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGCOLOR, 0x0000ff00); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, *(DWORD*)(&start)); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, *(DWORD*)(&end)); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_LINEAR); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TEXTUREFACTOR, 0x00ff00ff); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr); + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 640, 480, D3DFMT_D24X8, + D3DMULTISAMPLE_NONE, 0, FALSE, &ds, NULL); + ok(SUCCEEDED(hr), "Failed to create depth stencil surface, hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); + ok(SUCCEEDED(hr), "Failed to set depth stencil surface, hr %#lx.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &proj[tests[i].matrix_id]); + ok(SUCCEEDED(hr), "Failed to set projection transform, hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, tests[i].format_bits | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "Failed to set fvf, hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetVertexShader(device, vertex_shader[tests[i].vshader]); + ok(SUCCEEDED(hr), "SetVertexShader failed, hr %#lx.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, pixel_shader[tests[i].pshader]); + ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#lx.\n", hr); + conv.f = tests[i].depth_bias; + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_DEPTHBIAS, conv.d); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x000000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#lx.\n", hr); + + if (tests[i].format_bits == D3DFVF_XYZRHW) + { + untransformed_q[0].position.z = 0.1f + tests[i].z; + untransformed_q[1].position.z = 0.2f + tests[i].z; + untransformed_q[2].position.z = 0.3f + tests[i].z; + untransformed_q[3].position.z = 0.4f + tests[i].z; + untransformed_q[0].position.w = 0.6f + tests[i].rhw; + untransformed_q[1].position.w = 0.5f + tests[i].rhw; + untransformed_q[2].position.w = 0.4f + tests[i].rhw; + untransformed_q[3].position.w = 0.3f + tests[i].rhw; + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#lx.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, untransformed_q, sizeof(untransformed_q[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#lx.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr); + } + else + { + transformed_q[0].position.z = 0.1f + tests[i].z; + transformed_q[1].position.z = 0.2f + tests[i].z; + transformed_q[2].position.z = 0.3f + tests[i].z; + transformed_q[3].position.z = 0.4f + tests[i].z; + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#lx.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, transformed_q, sizeof(transformed_q[0])); + ok(SUCCEEDED(hr), "Failed to draw, hr %#lx.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#lx.\n", hr); + } + + color = getPixelColor(device, 320, 240); + ok(color_match(color, tests[i].color1, 2) || color_match(color, tests[i].color2, 2), + "Got unexpected color 0x%08x, expected 0x%08x or 0x%08x, case %u.\n", color, tests[i].color1, tests[i].color2, i); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); + } + + IDirect3DVertexShader9_Release(vertex_shader[1]); + IDirect3DPixelShader9_Release(pixel_shader[1]); + IDirect3DPixelShader9_Release(pixel_shader[2]); + IDirect3DSurface9_Release(ds); +done: + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %lu references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void test_signed_formats(void) { unsigned int expected_color, color, i, j, x, y; @@ -28140,6 +28445,7 @@ START_TEST(visual) test_negative_fixedfunction_fog(); test_position_index(); test_table_fog_zw(); + test_table_shader_fog(); test_signed_formats(); test_multisample_mismatch(); test_texcoordindex();

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2657

Marvin

11:28 a.m.

New subject: [PATCH 1/1] d3d9/tests: test table fog z vs rhw with shaders, depth bias, oDepth..

Hi,

It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=131950

Your paranoid android.

=== w8 (32 bit report) ===

d3d9: visual.c:21272: Test failed: Got unexpected color 0x00b24c00, expected 0x000000ff or 0x000000ff, case 1. visual.c:21272: Test failed: Got unexpected color 0x00669900, expected 0x000000ff or 0x000000ff, case 5. visual.c:21272: Test failed: Got unexpected color 0x0008f700, expected 0x000000ff or 0x000000ff, case 11. visual.c:21272: Test failed: Got unexpected color 0x00b24c00, expected 0x000000ff or 0x000000ff, case 13. visual.c:21272: Test failed: Got unexpected color 0x00669900, expected 0x000000ff or 0x000000ff, case 17. visual.c:21272: Test failed: Got unexpected color 0x0008f700, expected 0x000000ff or 0x000000ff, case 23. visual.c:21272: Test failed: Got unexpected color 0x0055aa00, expected 0x000000ff or 0x000000ff, case 27. visual.c:21272: Test failed: Got unexpected color 0x0055aa00, expected 0x000000ff or 0x000000ff, case 31. visual.c:21272: Test failed: Got unexpected color 0x0008f700, expected 0x000000ff or 0x000000ff, case 35. visual.c:21272: Test failed: Got unexpected color 0x0055aa00, expected 0x000000ff or 0x000000ff, case 39. visual.c:21272: Test failed: Got unexpected color 0x0055aa00, expected 0x000000ff or 0x000000ff, case 43. visual.c:21272: Test failed: Got unexpected color 0x0000ff00, expected 0x000000ff or 0x000000ff, case 47. visual.c:21272: Test failed: Got unexpected color 0x00b24c00, expected 0x000000ff or 0x000000ff, case 49. visual.c:21272: Test failed: Got unexpected color 0x00669900, expected 0x000000ff or 0x000000ff, case 53. visual.c:21272: Test failed: Got unexpected color 0x0008f700, expected 0x000000ff or 0x000000ff, case 59. visual.c:21272: Test failed: Got unexpected color 0x0055aa00, expected 0x000000ff or 0x000000ff, case 63. visual.c:21272: Test failed: Got unexpected color 0x0055aa00, expected 0x000000ff or 0x000000ff, case 67. visual.c:21272: Test failed: Got unexpected color 0x0008f700, expected 0x000000ff or 0x000000ff, case 71.

=== w8adm (32 bit report) ===

=== w864 (32 bit report) ===

=== w1064v1507 (32 bit report) ===

=== w1064v1809 (32 bit report) ===

=== w1064_tsign (32 bit report) ===

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

=== w11pro64 (32 bit report) ===

=== w864 (64 bit report) ===

=== w1064v1507 (64 bit report) ===

=== w1064v1809 (64 bit report) ===

=== w1064_2qxl (64 bit report) ===

=== w1064_adm (64 bit report) ===

=== w1064_tsign (64 bit report) ===

=== w10pro64 (64 bit report) ===

=== w10pro64_en_AE_u8 (64 bit report) ===

=== w10pro64_ar (64 bit report) ===

=== w10pro64_ja (64 bit report) ===

=== w10pro64_zh_CN (64 bit report) ===

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

d3d9: visual.c:21272: Test failed: Got unexpected color 0x00b34c00, expected 0x0000ff00 or 0x0000ff00, case 0. visual.c:21272: Test failed: Got unexpected color 0x0009f600, expected 0x00986700 or 0x00986700, case 2. visual.c:21272: Test failed: Got unexpected color 0x00b34c00, expected 0x0000ff00 or 0x0000ff00, case 4. visual.c:21272: Test failed: Got unexpected color 0x0009f600, expected 0x00986700 or 0x00986700, case 6. visual.c:21272: Test failed: Got unexpected color 0x0008f700, expected 0x0000ff00 or 0x0000ff00, case 7. visual.c:21272: Test failed: Got unexpected color 0x00b34c00, expected 0x0000ff00 or 0x0000ff00, case 12. visual.c:21272: Test failed: Got unexpected color 0x0009f600, expected 0x00986700 or 0x00986700, case 14. visual.c:21272: Test failed: Got unexpected color 0x00b34c00, expected 0x0000ff00 or 0x0000ff00, case 16. visual.c:21272: Test failed: Got unexpected color 0x0009f600, expected 0x00986700 or 0x00986700, case 18. visual.c:21272: Test failed: Got unexpected color 0x0008f700, expected 0x0000ff00 or 0x0000ff00, case 19. visual.c:21272: Test failed: Got unexpected color 0x00b34c00, expected 0x0000ff00 or 0x0000ff00, case 24. visual.c:21272: Test failed: Got unexpected color 0x00b24c00, expected 0x0055aa00 or 0x0055aa00, case 25. visual.c:21272: Test failed: Got unexpected color 0x0009f600, expected 0x00986700 or 0x00986700, case 26. visual.c:21272: Test failed: Got unexpected color 0x00b34c00, expected 0x0000ff00 or 0x0000ff00, case 28. visual.c:21272: Test failed: Got unexpected color 0x00b24c00, expected 0x0055aa00 or 0x0055aa00, case 29. visual.c:21272: Test failed: Got unexpected color 0x0009f600, expected 0x00986700 or 0x00986700, case 30. visual.c:21272: Test failed: Got unexpected color 0x00b34c00, expected 0x0000ff00 or 0x0000ff00, case 36. visual.c:21272: Test failed: Got unexpected color 0x00b24c00, expected 0x0055aa00 or 0x0055aa00, case 37. visual.c:21272: Test failed: Got unexpected color 0x0009f600, expected 0x00986700 or 0x00986700, case 38. visual.c:21272: Test failed: Got unexpected color 0x00b34c00, expected 0x0000ff00 or 0x0000ff00, case 40. visual.c:21272: Test failed: Got unexpected color 0x00b24c00, expected 0x0055aa00 or 0x0055aa00, case 41. visual.c:21272: Test failed: Got unexpected color 0x0009f600, expected 0x00986700 or 0x00986700, case 42. visual.c:21272: Test failed: Got unexpected color 0x00b34c00, expected 0x00906e00 or 0x00906e00, case 44. visual.c:21272: Test failed: Got unexpected color 0x00b24c00, expected 0x00906e00 or 0x00906e00, case 45. visual.c:21272: Test failed: Got unexpected color 0x0009f600, expected 0x0000ff00 or 0x0000ff00, case 46. visual.c:21272: Test failed: Got unexpected color 0x00b34c00, expected 0x0000ff00 or 0x0000ff00, case 48. visual.c:21272: Test failed: Got unexpected color 0x0009f600, expected 0x00986700 or 0x00986700, case 50. visual.c:21272: Test failed: Got unexpected color 0x00b34c00, expected 0x0000ff00 or 0x0000ff00, case 52. visual.c:21272: Test failed: Got unexpected color 0x0009f600, expected 0x00986700 or 0x00986700, case 54. visual.c:21272: Test failed: Got unexpected color 0x0008f700, expected 0x0000ff00 or 0x0000ff00, case 55. visual.c:21272: Test failed: Got unexpected color 0x00b34c00, expected 0x0000ff00 or 0x0000ff00, case 60. visual.c:21272: Test failed: Got unexpected color 0x00b24c00, expected 0x0055aa00 or 0x0055aa00, case 61. visual.c:21272: Test failed: Got unexpected color 0x0009f600, expected 0x00986700 or 0x00986700, case 62. visual.c:21272: Test failed: Got unexpected color 0x00b34c00, expected 0x0000ff00 or 0x0000ff00, case 64. visual.c:21272: Test failed: Got unexpected color 0x00b24c00, expected 0x0055aa00 or 0x0055aa00, case 65. visual.c:21272: Test failed: Got unexpected color 0x0009f600, expected 0x00986700 or 0x00986700, case 66.

=== debian11 (32 bit ar:MA report) ===

=== debian11 (32 bit de report) ===

=== debian11 (32 bit fr report) ===

=== debian11 (32 bit he:IL report) ===

=== debian11 (32 bit hi:IN report) ===

=== debian11 (32 bit ja:JP report) ===

=== debian11 (32 bit zh:CN report) ===

=== debian11b (32 bit WoW report) ===

=== debian11b (64 bit WoW report) ===

Stefan Dösinger (＠stefan)

17 Apr 17 Apr

7:09 a.m.

Whoa, this brings up memories. And reminds me how lucky I am that I didn't have to deal with d3d fog in years.

Is there a particular game that is motivating this patch? Any changes we should make to the implementation?

I'll add a few stylistic comments as I read the test, then test it on my windows box and then try to actually understand what is going on and how it differs from my old understanding.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2657#note_30199

Stefan Dösinger (＠stefan)

7:34 a.m.

Stefan Dösinger (@stefan) commented about dlls/d3d9/tests/visual.c:

...

}

hr = IDirect3DDevice9_GetDeviceCaps(device, &caps);

ok(SUCCEEDED(hr), "Failed to get device caps, hr %#lx.\n", hr);

if (!(caps.RasterCaps & D3DPRASTERCAPS_FOGTABLE))

{
   skip("D3DPRASTERCAPS_FOGTABLE not supported, skipping POSITIONT table fog test.\n");
   goto done;
}

hr = IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code1, &vertex_shader[1]);

ok(SUCCEEDED(hr), "CreateVertexShader failed, hr %#lx.\n", hr);

hr = IDirect3DDevice9_CreatePixelShader(device, pixel_shader_code1, &pixel_shader[1]);

ok(SUCCEEDED(hr), "CreatePixelShader failed, hr %#lx.\n", hr);

hr = IDirect3DDevice9_CreatePixelShader(device, pixel_shader_code2, &pixel_shader[2]);

ok(SUCCEEDED(hr), "CreatePixelShader failed, hr %#lx.\n", hr);

Add a check for capabilities here

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2657#note_30203

Stefan Dösinger (＠stefan)

7:34 a.m.

Stefan Dösinger (@stefan) commented about dlls/d3d9/tests/visual.c:

...

   goto done;
}

hr = IDirect3DDevice9_CreateVertexShader(device, vertex_shader_code1, &vertex_shader[1]);

ok(SUCCEEDED(hr), "CreateVertexShader failed, hr %#lx.\n", hr);

hr = IDirect3DDevice9_CreatePixelShader(device, pixel_shader_code1, &pixel_shader[1]);

ok(SUCCEEDED(hr), "CreatePixelShader failed, hr %#lx.\n", hr);

hr = IDirect3DDevice9_CreatePixelShader(device, pixel_shader_code2, &pixel_shader[2]);

ok(SUCCEEDED(hr), "CreatePixelShader failed, hr %#lx.\n", hr);

hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE);

ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr);

hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, TRUE);

ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr);

hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGCOLOR, 0x0000ff00);

ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr);

hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, *(DWORD*)(&start));

I know we are using this kind of float-to-DWORD cast in a few other places, but technically speaking it violates the C strict aliasing rule. Better use a union, like e.g. in fog_with_shader_test().

(Actually, I see you already have the conv union for depth bias, just reuse it here)

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2657#note_30204

Stefan Dösinger (＠stefan)

7:34 a.m.

Stefan Dösinger (@stefan) commented about dlls/d3d9/tests/visual.c:

...

ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr);

hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, *(DWORD*)(&end));

ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr);

hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE);

ok(SUCCEEDED(hr), "SetRenderState failed, hr %#lx.\n", hr);

hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_LINEAR);

ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr);

hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE);

ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr);

hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TEXTUREFACTOR, 0x00ff00ff);

ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr);

hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 640, 480, D3DFMT_D24X8,
   D3DMULTISAMPLE_NONE, 0, FALSE, &ds, NULL);
ok(SUCCEEDED(hr), "Failed to create depth stencil surface, hr %#lx.\n", hr);

hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds);

ok(SUCCEEDED(hr), "Failed to set depth stencil surface, hr %#lx.\n", hr);

Why do you need the custom depth stencil surface, especially considering that you set D3DRS_ZENABLE=D3DZB_FALSE?

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2657#note_30205

Stefan Dösinger (＠stefan)

7:34 a.m.

Stefan Dösinger (@stefan) commented about dlls/d3d9/tests/visual.c:

...

hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, TRUE);

ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr);

hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGCOLOR, 0x0000ff00);

ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr);

hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, *(DWORD*)(&start));

ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr);

hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, *(DWORD*)(&end));

ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr);

hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE);

ok(SUCCEEDED(hr), "SetRenderState failed, hr %#lx.\n", hr);

hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_LINEAR);

ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr);

hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE);

ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr);

hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TEXTUREFACTOR, 0x00ff00ff);

ok(SUCCEEDED(hr), "Failed to set render state, hr %#lx.\n", hr);

This looks redundant, you never use D3DTA_TFACTOR (or any fixed function fragment processing, beyond passing through the diffiuse color)

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2657#note_30206

Stefan Dösinger (＠stefan)

7:34 a.m.

Stefan Dösinger (@stefan) commented about dlls/d3d9/tests/visual.c:

...

   {0, 2, 2, 0.2f, 0.2f, 0.0f, D3DFVF_XYZ,    0x00b24c00, 0x00aa5500}, /* color1 != color2 */

   {0, 2, 2, 1.2f, 1.2f, 0.0f, D3DFVF_XYZRHW, 0x0008f600, 0x00aa5500}, /* color1 != color2 */

   {0, 2, 2, 1.2f, 1.2f, 0.0f, D3DFVF_XYZ,    0x000000ff, 0x000000ff},

```
   /* cases 60-69 */
```

   {1, 2, 0, 0.2f, 0.2f, 0.0f, D3DFVF_XYZRHW, 0x0000ff00, 0x0000ff00},

   {1, 2, 0, 0.2f, 0.2f, 0.0f, D3DFVF_XYZ,    0x0055aa00, 0x0055aa00},

   {1, 2, 0, 1.2f, 1.2f, 0.0f, D3DFVF_XYZRHW, 0x00986700, 0x00986700},

   {1, 2, 0, 1.2f, 1.2f, 0.0f, D3DFVF_XYZ,    0x000000ff, 0x000000ff},

   {1, 2, 1, 0.2f, 0.2f, 0.0f, D3DFVF_XYZRHW, 0x0000ff00, 0x0000ff00},

   {1, 2, 1, 0.2f, 0.2f, 0.0f, D3DFVF_XYZ,    0x0055aa00, 0x0055aa00},

   {1, 2, 1, 1.2f, 1.2f, 0.0f, D3DFVF_XYZRHW, 0x00986700, 0x00986700},

   {1, 2, 1, 1.2f, 1.2f, 0.0f, D3DFVF_XYZ,    0x000000ff, 0x000000ff},

   {1, 2, 2, 0.2f, 0.2f, 0.0f, D3DFVF_XYZRHW, 0x00b24c00, 0x00aa5500}, /* color1 != color2 */

   {1, 2, 2, 0.2f, 0.2f, 0.0f, D3DFVF_XYZ,    0x00b24c00, 0x00aa5500}, /* color1 != color2 */

```
   /* cases 70-71 */
```

   {1, 2, 2, 1.2f, 1.2f, 0.0f, D3DFVF_XYZRHW, 0x0008f600, 0x00aa5500}, /* color1 != color2 */

Based on your comment in the cover letter I was expecting all oDepth writing draws to have different results. What is special about these tests that one of your Intel GPUs differs?

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2657#note_30207

Stefan Dösinger (＠stefan)

7:34 a.m.

Here are some relatively superficial comments. I haven't yet tried to understand the output colors.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2657#note_30208

Axel Davy (＠axeldavy)

3:54 p.m.

Hi,

To give a bit of background, the development of this test comes from a nine bug in a game with fog, despite getting good results in wine tests. While investigating the bug, I realized that I had misunderstood the documentation, and possibly the others before me as well, as I think neither nine, nor wined3d, nor dxvk have completly correct formula here.

Here is the patch for nine, and the lengthy explanations in the commit message: https://gitlab.freedesktop.org/axeldavy/mesa/-/commit/b337b0d0f89112266669ee...

Basically wine tests use an orthogonal projection matrix, and the case of the non-orthogonal projection matrix was not studied enough. This merge requests fills the gap. The tests show than when a non-orthogonal projection matrix, w is used for fog not z (wfog), no matter what the shaders are. Depthbias, etc do not affect w. In many places where w should be used, using z doesn't give something that looks bad because in many cases the range of z and w is similar, and so the fog formula gives close results. Still that's not the correct output for someone who cares about accuracy.

The odepth test is to know whether zfog (orthogonal projection matrix) is impacted by writing odepth. This is due to the r300/500 hardware manual showing there is fog named registers which tell whether to pick the depth writen by the shader or the depth outputted by the rasterizer. It seems that odepth doesn't affect in practice though, but it's good to have it tested.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2657#note_30238

Stefan Dösinger (＠stefan)

7:36 p.m.

On Mon Apr 17 19:36:09 2023 +0000, Axel Davy wrote:

...

Hi, To give a bit of background, the motivation for the development of this test comes from a nine bug in a game with fog, despite nine getting good results in wine tests. While investigating the bug, I realized that I had misunderstood the documentation, and possibly the others before me as well, as I think neither nine, nor wined3d, nor dxvk have completely correct formula here. Here is the patch for nine, and the lengthy explanation in the commit message: https://gitlab.freedesktop.org/axeldavy/mesa/-/commit/b337b0d0f89112266669ee... Basically wine tests use an orthogonal projection matrix, and the case of the non-orthogonal projection matrix was not studied enough. This merge request fills the gap. The tests show than when a non-orthogonal projection matrix is set, w is used for fog not z (wfog), no matter what the shaders are. Depthbias, etc do not affect w. In many places where w should be used, using z doesn't give something that looks bad because in quite often the range of z and w is similar, and so the fog formula gives close results. Still that's not the correct output for someone who cares about accuracy. The odepth test is to know whether zfog (orthogonal projection matrix) is impacted by writing odepth. This is due to the r300/500 hardware manual showing there is fog named registers which tell whether to pick the depth written by the shader or the depth outputted by the rasterizer. It seems that odepth doesn't affect in practice though, but it's good to have it tested.

Thanks for the explanation, that makes it easier to follow what's going on. I got distracted by updating my hacky visual studio build setup to work with current Wine code, so I didn't test this on my hardware yet.

What game is broken by this? I guess we'll have to fix our shaders too, and are probably out of luck on HW with only fixed function opengl (not that we care particularly much these days any more). (Plus, when a future Windows version / GPU / driver breaks the test it helps to have a comment explaining why the correct behavior matters)

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2657#note_30258

660

Age (days ago)

661

Last active (days ago)

wine-gitlab@winehq.org

11 comments

5 participants

tags (0)

participants (5)

Aleksey Komarov
Aleksey Komarov (＠q4a)
Axel Davy (＠axeldavy)
Marvin
Stefan Dösinger (＠stefan)