Henri Verbeet : d3d10core: Try to create a software adapter when no regular adapters are found as well .
Alexandre Julliard
julliard at winehq.org
Mon Oct 25 10:58:23 CDT 2010
Module: wine
Branch: master
Commit: bbc7b5ac20bf60d61c43ef3264fe84f3f7a855b2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbc7b5ac20bf60d61c43ef3264fe84f3f7a855b2
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Mon Oct 25 12:33:41 2010 +0200
d3d10core: Try to create a software adapter when no regular adapters are found as well.
---
dlls/d3d10core/tests/device.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c
index 4195bad..ce3d03c 100644
--- a/dlls/d3d10core/tests/device.c
+++ b/dlls/d3d10core/tests/device.c
@@ -35,18 +35,19 @@ static ID3D10Device *create_device(void)
if (FAILED(hr)) goto cleanup;
hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter);
- ok(SUCCEEDED(hr) ||
- hr == DXGI_ERROR_NOT_FOUND, /* Some VMware and VirtualBox */
- "EnumAdapters failed, hr %#x\n", hr);
- if (FAILED(hr)) goto cleanup;
+ ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_FOUND, /* Some VMware and VirtualBox */
+ "EnumAdapters failed, hr %#x.\n", hr);
+ if (SUCCEEDED(hr))
+ {
+ hr = D3D10CoreCreateDevice(factory, adapter, 0, NULL, &device);
+ }
- hr = D3D10CoreCreateDevice(factory, adapter, 0, NULL, &device);
if (FAILED(hr))
{
HMODULE d3d10ref;
trace("Failed to create a HW device, trying REF\n");
- IDXGIAdapter_Release(adapter);
+ if (adapter) IDXGIAdapter_Release(adapter);
adapter = NULL;
d3d10ref = LoadLibraryA("d3d10ref.dll");
More information about the wine-cvs
mailing list