mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Branimir Karadžić 2015-03-31 22:01:50 -07:00
parent 8a367819e6
commit 8f3708fe28
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/renderer_d3d11.cpp
View File

@ -543,20 +543,23 @@ namespace bgfx { namespace d3d11
g_caps.gpu[ii].deviceId = (uint16_t)desc.DeviceId; g_caps.gpu[ii].deviceId = (uint16_t)desc.DeviceId;
++g_caps.numGPUs; ++g_caps.numGPUs;
if ( (BGFX_PCI_ID_NONE != g_caps.vendorId || 0 != g_caps.deviceId) if (NULL == m_adapter)
&& (BGFX_PCI_ID_NONE == g_caps.vendorId || desc.VendorId == g_caps.vendorId)
&& ( 0 == g_caps.deviceId || desc.DeviceId == g_caps.deviceId) )
{ {
m_adapter = adapter; if ( (BGFX_PCI_ID_NONE != g_caps.vendorId || 0 != g_caps.deviceId)
m_adapter->AddRef(); && (BGFX_PCI_ID_NONE == g_caps.vendorId || desc.VendorId == g_caps.vendorId)
m_driverType = D3D_DRIVER_TYPE_UNKNOWN; && ( 0 == g_caps.deviceId || desc.DeviceId == g_caps.deviceId) )
} {
m_adapter = adapter;
m_adapter->AddRef();
m_driverType = D3D_DRIVER_TYPE_UNKNOWN;
}
if (BX_ENABLED(BGFX_CONFIG_DEBUG_PERFHUD) if (BX_ENABLED(BGFX_CONFIG_DEBUG_PERFHUD)
&& 0 != strstr(description, "PerfHUD") ) && 0 != strstr(description, "PerfHUD") )
{ {
m_adapter = adapter; m_adapter = adapter;
m_driverType = D3D_DRIVER_TYPE_REFERENCE; m_driverType = D3D_DRIVER_TYPE_REFERENCE;
}
} }
} }

24
src/renderer_d3d9.cpp
View File

@ -380,20 +380,22 @@ namespace bgfx { namespace d3d9
g_caps.gpu[ii].vendorId = (uint16_t)desc.VendorId; g_caps.gpu[ii].vendorId = (uint16_t)desc.VendorId;
g_caps.gpu[ii].deviceId = (uint16_t)desc.DeviceId; g_caps.gpu[ii].deviceId = (uint16_t)desc.DeviceId;
if ( (BGFX_PCI_ID_NONE != g_caps.vendorId || 0 != g_caps.deviceId) if (D3DADAPTER_DEFAULT == m_adapter)
&& (BGFX_PCI_ID_NONE == g_caps.vendorId || desc.VendorId == g_caps.vendorId)
&& ( 0 == g_caps.deviceId || desc.DeviceId == g_caps.deviceId) )
{ {
m_adapter = ii; if ( (BGFX_PCI_ID_NONE != g_caps.vendorId || 0 != g_caps.deviceId)
} && (BGFX_PCI_ID_NONE == g_caps.vendorId || desc.VendorId == g_caps.vendorId)
&& ( 0 == g_caps.deviceId || desc.DeviceId == g_caps.deviceId) )
{
m_adapter = ii;
}
#if BGFX_CONFIG_DEBUG_PERFHUD if (BX_ENABLED(BGFX_CONFIG_DEBUG_PERFHUD)
if (0 != strstr(desc.Description, "PerfHUD") ) && 0 != strstr(description, "PerfHUD"))
{ {
m_adapter = ii; m_adapter = ii;
m_deviceType = D3DDEVTYPE_REF; m_deviceType = D3DDEVTYPE_REF;
}
} }
#endif // BGFX_CONFIG_DEBUG_PERFHUD
} }
} }