ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ddraw/tests: Use a TnLHal device only if supported in ddraw7 tests. 

Intel GPUs don't support d3d7 hardware vertexprocessing on Windows. In
d3d8 and d3d9 it is available starting with i965 chips, but for some
reason the driver does not expose this for d3d7.
This commit is contained in:
Stefan Dösinger 2013-03-12 07:20:31 -07:00 committed by Alexandre Julliard
parent 0e7f39439d
commit a990dbfa22
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/ddraw/tests/ddraw7.c
View File

@ -202,6 +202,17 @@ static IDirectDraw7 *create_ddraw(void)
return ddraw; return ddraw;
} }
static HRESULT WINAPI enum_devtype_cb(char *desc_str, char *name, D3DDEVICEDESC7 *desc, void *ctx)
{
BOOL *hal_ok = ctx;
if (IsEqualGUID(&desc->deviceGUID, &IID_IDirect3DTnLHalDevice))
{
*hal_ok = TRUE;
return DDENUMRET_CANCEL;
}
return DDENUMRET_OK;
}
static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level) static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level)
{ {
IDirectDrawSurface7 *surface, *ds; IDirectDrawSurface7 *surface, *ds;
@ -211,6 +222,8 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level)
IDirectDraw7 *ddraw; IDirectDraw7 *ddraw;
IDirect3D7 *d3d7; IDirect3D7 *d3d7;
HRESULT hr; HRESULT hr;
BOOL hal_ok = FALSE;
const GUID *devtype = &IID_IDirect3DHALDevice;
if (!(ddraw = create_ddraw())) if (!(ddraw = create_ddraw()))
return NULL; return NULL;
@ -249,8 +262,12 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level)
return NULL; return NULL;
} }
hr = IDirect3D7_EnumDevices(d3d7, enum_devtype_cb, &hal_ok);
ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr);
if (hal_ok) devtype = &IID_IDirect3DTnLHalDevice;
memset(&z_fmt, 0, sizeof(z_fmt)); memset(&z_fmt, 0, sizeof(z_fmt));
hr = IDirect3D7_EnumZBufferFormats(d3d7, &IID_IDirect3DTnLHalDevice, enum_z_fmt, &z_fmt); hr = IDirect3D7_EnumZBufferFormats(d3d7, devtype, enum_z_fmt, &z_fmt);
if (FAILED(hr) || !z_fmt.dwSize) if (FAILED(hr) || !z_fmt.dwSize)
{ {
IDirect3D7_Release(d3d7); IDirect3D7_Release(d3d7);
@ -284,7 +301,7 @@ static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level)
return NULL; return NULL;
} }
hr = IDirect3D7_CreateDevice(d3d7, &IID_IDirect3DTnLHalDevice, surface, &device); hr = IDirect3D7_CreateDevice(d3d7, devtype, surface, &device);
IDirect3D7_Release(d3d7); IDirect3D7_Release(d3d7);
IDirectDrawSurface7_Release(surface); IDirectDrawSurface7_Release(surface);
if (FAILED(hr)) if (FAILED(hr))