wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

tests: Set tags in the d3d9 runner.

Browse Source
This commit is contained in:
Elizabeth Figura
2025-10-14 17:27:30 -05:00
committed by Henri Verbeet
parent 27e87ff0f3
commit 6b5fe9daaf
Notes: Henri Verbeet 2025-10-27 19:10:04 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1793
1 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
tests/shader_runner_d3d9.c
View File

@@ -75,27 +75,6 @@ static HRESULT set_viewport(IDirect3DDevice9 *device, unsigned int x, unsigned i
return IDirect3DDevice9_SetViewport(device, &vp); return IDirect3DDevice9_SetViewport(device, &vp);
} }
static void init_adapter_info(void)
{
D3DADAPTER_IDENTIFIER9 identifier;
IDirect3D9 *d3d;
HRESULT hr;
d3d = pDirect3DCreate9(D3D_SDK_VERSION);
ok(!!d3d, "Failed to create a D3D object.\n");
hr = IDirect3D9_GetAdapterIdentifier(d3d, test_options.adapter_idx, 0, &identifier);
ok(hr == S_OK, "Failed to get adapter identifier, hr %#lx.\n", hr);
trace("Driver string: %s.\n", identifier.Driver);
trace("Device: %s, %04lx:%04lx.\n", identifier.Description, identifier.VendorId, identifier.DeviceId);
if (identifier.VendorId == 0x1414 && identifier.DeviceId == 0x008c)
trace("Using WARP device.\n");
IDirect3D9_Release(d3d);
}
static const BOOL windowed = TRUE; static const BOOL windowed = TRUE;
static bool init_test_context(struct d3d9_shader_runner *runner) static bool init_test_context(struct d3d9_shader_runner *runner)
@@ -109,6 +88,7 @@ static bool init_test_context(struct d3d9_shader_runner *runner)
.BackBufferFormat = D3DFMT_A8R8G8B8, .BackBufferFormat = D3DFMT_A8R8G8B8,
}; };
RECT rect = {0, 0, RENDER_TARGET_WIDTH, RENDER_TARGET_HEIGHT}; RECT rect = {0, 0, RENDER_TARGET_WIDTH, RENDER_TARGET_HEIGHT};
D3DADAPTER_IDENTIFIER9 identifier;
IDirect3D9 *d3d; IDirect3D9 *d3d;
D3DCAPS9 caps; D3DCAPS9 caps;
HRESULT hr; HRESULT hr;
@@ -123,6 +103,12 @@ static bool init_test_context(struct d3d9_shader_runner *runner)
d3d = pDirect3DCreate9(D3D_SDK_VERSION); d3d = pDirect3DCreate9(D3D_SDK_VERSION);
ok(!!d3d, "Failed to create a D3D object.\n"); ok(!!d3d, "Failed to create a D3D object.\n");
hr = IDirect3D9_GetAdapterIdentifier(d3d, test_options.adapter_idx, 0, &identifier);
ok(hr == S_OK, "Failed to get adapter identifier, hr %#lx.\n", hr);
trace("Driver string: %s.\n", identifier.Driver);
trace("Device: %s, %04lx:%04lx.\n", identifier.Description, identifier.VendorId, identifier.DeviceId);
present_parameters.hDeviceWindow = runner->window; present_parameters.hDeviceWindow = runner->window;
hr = IDirect3D9_CreateDevice(d3d, test_options.adapter_idx, D3DDEVTYPE_HAL, runner->window, hr = IDirect3D9_CreateDevice(d3d, test_options.adapter_idx, D3DDEVTYPE_HAL, runner->window,
@@ -153,6 +139,18 @@ static bool init_test_context(struct d3d9_shader_runner *runner)
runner->caps.shader_caps[SHADER_CAP_FOG] = true; runner->caps.shader_caps[SHADER_CAP_FOG] = true;
runner->caps.shader_caps[SHADER_CAP_POINT_SIZE] = true; runner->caps.shader_caps[SHADER_CAP_POINT_SIZE] = true;
runner->caps.tags[SHADER_RUNNER_TAG_WINDOWS].present = true;
if (identifier.VendorId == 0x1414 && identifier.DeviceId == 0x008c)
{
trace("Using WARP device.\n");
runner->caps.tags[SHADER_RUNNER_TAG_WARP].present = true;
}
else if (identifier.VendorId == 0x10de)
{
runner->caps.tags[SHADER_RUNNER_TAG_NVIDIA].present = true;
}
return true; return true;
} }
@@ -804,7 +802,6 @@ void run_shader_tests_d3d9(void)
pDirect3DCreate9 = (void *)GetProcAddress(d3d9_module, "Direct3DCreate9"); pDirect3DCreate9 = (void *)GetProcAddress(d3d9_module, "Direct3DCreate9");
init_adapter_info();
if (init_test_context(&runner)) if (init_test_context(&runner))
{ {
run_shader_tests(&runner.r, &runner.caps, &d3d9_runner_ops, NULL); run_shader_tests(&runner.r, &runner.caps, &d3d9_runner_ops, NULL);