2691.patch
b/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp Sun Oct 28 17:46:34 2012 -0700 | ||
---|---|---|
1454 | 1454 |
return false; |
1455 | 1455 |
} |
1456 | 1456 | |
1457 |
#if !FINAL_VERSION |
|
1458 |
// Look for 'NVIDIA PerfHUD' adapter |
|
1459 |
// If it is present, override default settings |
|
1460 |
for (UINT gAdapter=0;gAdapter<_D3D->GetAdapterCount();gAdapter++) |
|
1461 |
{ |
|
1462 |
D3DADAPTER_IDENTIFIER9 Identifier; |
|
1463 |
HRESULT Res; |
|
1464 |
Res = _D3D->GetAdapterIdentifier(gAdapter,0,&Identifier); |
|
1465 |
|
|
1466 |
if (strstr(Identifier.Description,"PerfHUD") != 0) |
|
1467 |
{ |
|
1468 |
nlinfo ("Setting up with PerfHUD"); |
|
1469 |
adapter=gAdapter; |
|
1470 |
_Rasterizer=D3DDEVTYPE_REF; |
|
1471 |
break; |
|
1472 |
} |
|
1473 |
} |
|
1474 |
#endif |
|
1457 | 1475 |
// Create the D3D device |
1458 | 1476 |
HRESULT result = _D3D->CreateDevice (adapter, _Rasterizer, _HWnd, D3DCREATE_HARDWARE_VERTEXPROCESSING|D3DCREATE_PUREDEVICE, ¶meters, &_DeviceInterface); |
1459 | 1477 |
if (result != D3D_OK) |
... | ... | |
1477 | 1495 |
} |
1478 | 1496 |
} |
1479 | 1497 | |
1498 | ||
1499 |
|
|
1480 | 1500 |
// _D3D->CreateDevice (adapter, _Rasterizer, _HWnd, D3DCREATE_SOFTWARE_VERTEXPROCESSING, ¶meters, &_DeviceInterface); |
1481 | 1501 | |
1482 | 1502 |
// Check some caps |
... | ... | |
2584 | 2604 |
#ifndef NL_NO_ASM |
2585 | 2605 |
CFpuRestorer fpuRestorer; // fpu control word is changed by "Reset" |
2586 | 2606 |
#endif |
2587 |
HRESULT hr = _DeviceInterface->Reset (¶meters); |
|
2588 |
if (hr != D3D_OK) |
|
2589 |
{ |
|
2590 |
nlwarning("CDriverD3D::reset: Reset on _DeviceInterface error 0x%x", hr); |
|
2591 |
// tmp |
|
2592 |
nlstopex(("CDriverD3D::reset: Reset on _DeviceInterface")); |
|
2593 |
return false; |
|
2607 |
if (_Rasterizer!=D3DDEVTYPE_REF) { |
|
2608 |
HRESULT hr = _DeviceInterface->Reset (¶meters); |
|
2609 |
if (hr != D3D_OK) |
|
2610 |
{ |
|
2611 |
nlwarning("CDriverD3D::reset: Reset on _DeviceInterface error 0x%x", hr); |
|
2612 |
// tmp |
|
2613 |
nlstopex(("CDriverD3D::reset: Reset on _DeviceInterface")); |
|
2614 |
return false; |
|
2615 |
} |
|
2594 | 2616 |
} |
2595 | 2617 |
} |
2596 | 2618 |