system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:54:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

ddraw/tests: Use hardware VP only if available in the visual tests.

Browse source
This commit is contained in:
Stefan Dösinger 2013-03-12 07:20:33 -07:00 committed by Alexandre Julliard
parent f39443787a
commit 3eb6045325
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/visual.c
View file

@ -64,6 +64,17 @@ static HRESULT WINAPI enum_z_fmt(DDPIXELFORMAT *fmt, void *ctx)
return DDENUMRET_OK; return DDENUMRET_OK;
} }
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 BOOL createObjects(void) static BOOL createObjects(void)
{ {
HRESULT hr; HRESULT hr;
@ -71,6 +82,8 @@ static BOOL createObjects(void)
WNDCLASS wc = {0}; WNDCLASS wc = {0};
DDSURFACEDESC2 ddsd; DDSURFACEDESC2 ddsd;
DDPIXELFORMAT zfmt; DDPIXELFORMAT zfmt;
BOOL hal_ok = FALSE;
const GUID *devtype = &IID_IDirect3DHALDevice;
if(!hmod) return FALSE; if(!hmod) return FALSE;
pDirectDrawCreateEx = (void*)GetProcAddress(hmod, "DirectDrawCreateEx"); pDirectDrawCreateEx = (void*)GetProcAddress(hmod, "DirectDrawCreateEx");
@ -116,8 +129,12 @@ static BOOL createObjects(void)
hr = IDirectDraw7_CreateSurface(DirectDraw, &ddsd, &Surface, NULL); hr = IDirectDraw7_CreateSurface(DirectDraw, &ddsd, &Surface, NULL);
if(FAILED(hr)) goto err; if(FAILED(hr)) goto err;
hr = IDirect3D7_EnumDevices(Direct3D, enum_devtype_cb, &hal_ok);
ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr);
if (hal_ok) devtype = &IID_IDirect3DTnLHalDevice;
memset(&zfmt, 0, sizeof(zfmt)); memset(&zfmt, 0, sizeof(zfmt));
hr = IDirect3D7_EnumZBufferFormats(Direct3D, &IID_IDirect3DTnLHalDevice, enum_z_fmt, &zfmt); hr = IDirect3D7_EnumZBufferFormats(Direct3D, devtype, enum_z_fmt, &zfmt);
if (FAILED(hr)) goto err; if (FAILED(hr)) goto err;
if (zfmt.dwSize == 0) goto err; if (zfmt.dwSize == 0) goto err;
@ -136,7 +153,7 @@ static BOOL createObjects(void)
ok(SUCCEEDED(hr), "AddAttachedSurface failed, hr %#x.\n", hr); ok(SUCCEEDED(hr), "AddAttachedSurface failed, hr %#x.\n", hr);
if (FAILED(hr)) goto err; if (FAILED(hr)) goto err;
hr = IDirect3D7_CreateDevice(Direct3D, &IID_IDirect3DTnLHalDevice, Surface, &Direct3DDevice); hr = IDirect3D7_CreateDevice(Direct3D, devtype, Surface, &Direct3DDevice);
if (FAILED(hr) || !Direct3DDevice) goto err; if (FAILED(hr) || !Direct3DDevice) goto err;
return TRUE; return TRUE;