Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:24:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Try uing DXGI on windows instead of com

Browse source
This commit is contained in:
samcake 2016-11-01 11:12:47 -07:00
parent a23bbd1e4e
commit 861944ba71
1 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
libraries/shared/src/GPUIdent.cpp
View file

@ -15,6 +15,9 @@
#include <atlbase.h> #include <atlbase.h>
#include <Wbemidl.h> #include <Wbemidl.h>
#include <dxgi1_3.h>
#pragma comment(lib, "dxgi.lib")
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MAC)
#include <OpenGL/OpenGL.h> #include <OpenGL/OpenGL.h>
#endif #endif
@ -54,9 +57,44 @@ GPUIdent* GPUIdent::ensureQuery(const QString& vendor, const QString& renderer)
CGLDestroyRendererInfo(rendererInfo); CGLDestroyRendererInfo(rendererInfo);
#elif defined(Q_OS_WIN) #elif defined(Q_OS_WIN)
// Create the DXGI factory
// Let s get into DXGI land:
HRESULT hr = S_OK;
IDXGIFactory1* pFactory = nullptr;
hr = CreateDXGIFactory1(__uuidof(IDXGIFactory1), (void**)(&pFactory) );
// Select our adapter
IDXGIAdapter1* capableAdapter = nullptr;
{
for (UINT adapter = 0; !capableAdapter; ++adapter) {
// get a candidate DXGI adapter
IDXGIAdapter1* pAdapter = nullptr;
hr = pFactory->EnumAdapters1(adapter, &pAdapter);
if (FAILED(hr)) {
break;
}
// query to see if there exists a corresponding compute device
// if so, mark it as the one against which to create our d3d10 device
capableAdapter = pAdapter;
capableAdapter->AddRef();
pAdapter->Release();
}
}
DXGI_ADAPTER_DESC1 adapterDesc;
capableAdapter->GetDesc1(&adapterDesc);
capableAdapter->Release();
pFactory->Release();
// COM must be initialized already using CoInitialize. E.g., by the audio subsystem. // COM must be initialized already using CoInitialize. E.g., by the audio subsystem.
CComPtr<IWbemLocator> spLoc = NULL; CComPtr<IWbemLocator> spLoc = NULL;
HRESULT hr = CoCreateInstance(CLSID_WbemLocator, 0, CLSCTX_SERVER, IID_IWbemLocator, (LPVOID *)&spLoc); hr = CoCreateInstance(CLSID_WbemLocator, 0, CLSCTX_SERVER, IID_IWbemLocator, (LPVOID *)&spLoc);
if (hr != S_OK || spLoc == NULL) { if (hr != S_OK || spLoc == NULL) {
qCDebug(shared) << "Unable to connect to WMI"; qCDebug(shared) << "Unable to connect to WMI";
return this; return this;
@ -150,6 +188,11 @@ GPUIdent* GPUIdent::ensureQuery(const QString& vendor, const QString& renderer)
} }
hr = spEnumInst->Next(WBEM_INFINITE, 1, &spInstance.p, &uNumOfInstances); hr = spEnumInst->Next(WBEM_INFINITE, 1, &spInstance.p, &uNumOfInstances);
} }
const ULONGLONG BYTES_PER_MEGABYTE = 1024 * 1024;
_dedicatedMemoryMB = (uint64_t)(adapterDesc.DedicatedVideoMemory / BYTES_PER_MEGABYTE);
#endif #endif
return this; return this;
} }