griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: Build error on windows

Browse Source 
winstuff.c got converted to .cc recently, and a merge was done of
#113674 from 4.0 which still was using C style code.

Small update in code style was required here.
This commit is contained in:
Ray Molenkamp
2023-10-20 10:44:34 -06:00
parent ac3ae7d452
commit fece71fa0a
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenlib/CMakeLists.txt
View File

@@ -445,7 +445,6 @@ if(WIN32)
)
list(APPEND LIB
bf_intern_utfconv
dxguid
dxgi
)
list(APPEND SRC

18
source/blender/blenlib/intern/winstuff.cc
View File

@@ -458,27 +458,25 @@ bool BLI_windows_get_directx_driver_version(const wchar_t *deviceSubString,
{
IDXGIFactory *pFactory = NULL;
IDXGIAdapter *pAdapter = NULL;
if (CreateDXGIFactory(&IID_IDXGIFactory, (void **)&pFactory) == S_OK) {
for (UINT i = 0; IDXGIFactory_EnumAdapters(pFactory, i, &pAdapter) != DXGI_ERROR_NOT_FOUND;
++i) {
if (CreateDXGIFactory(__uuidof(IDXGIFactory), (void **)&pFactory) == S_OK) {
for (UINT i = 0; pFactory->EnumAdapters(i, &pAdapter) != DXGI_ERROR_NOT_FOUND; ++i) {
LARGE_INTEGER version;
if (IDXGIAdapter_CheckInterfaceSupport(pAdapter, &IID_IDXGIDevice, &version) == S_OK) {
if (pAdapter->CheckInterfaceSupport(__uuidof(IDXGIDevice), &version) == S_OK) {
DXGI_ADAPTER_DESC desc;
if (IDXGIAdapter_GetDesc(pAdapter, &desc) == S_OK) {
if (pAdapter->GetDesc(&desc) == S_OK) {
if (wcsstr(desc.Description, deviceSubString)) {
*r_driverVersion = version.QuadPart;
IDXGIAdapter_Release(pAdapter);
IDXGIFactory_Release(pFactory);
pAdapter->Release();
pFactory->Release();
return true;
}
}
}
IDXGIAdapter_Release(pAdapter);
pAdapter->Release();
}
IDXGIFactory_Release(pFactory);
pFactory->Release();
}
return false;