backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

Merge pull request #9 from notaz/gcc6_build

Browse Source 
Fix build on gcc6
This commit is contained in:
Philip Rebohle 2018-01-19 00:28:07 +01:00 committed by GitHub
commit 0b867566f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/d3d11/d3d11_device.cpp
View File

@ -1251,7 +1251,7 @@ namespace dxvk {
HRESULT STDMETHODCALLTYPE D3D11Device::GetDeviceRemovedReason() { HRESULT STDMETHODCALLTYPE D3D11Device::GetDeviceRemovedReason() {
static std::atomic<bool> s_errorShown = false; static std::atomic<bool> s_errorShown = { false };
if (!s_errorShown.exchange(true)) if (!s_errorShown.exchange(true))
Logger::warn("D3D11Device::GetDeviceRemovedReason: Stub"); Logger::warn("D3D11Device::GetDeviceRemovedReason: Stub");

10
src/dxgi/dxgi_output.cpp
View File

@ -55,8 +55,9 @@ namespace dxvk {
if (pDesc == nullptr) if (pDesc == nullptr)
return DXGI_ERROR_INVALID_CALL; return DXGI_ERROR_INVALID_CALL;
::MONITORINFOEX monInfo = { sizeof(monInfo) }; ::MONITORINFOEX monInfo;
monInfo.cbSize = sizeof(monInfo);
if (!::GetMonitorInfo(m_monitor, &monInfo)) { if (!::GetMonitorInfo(m_monitor, &monInfo)) {
Logger::err("DxgiOutput: Failed to query monitor info"); Logger::err("DxgiOutput: Failed to query monitor info");
return E_FAIL; return E_FAIL;
@ -82,8 +83,9 @@ namespace dxvk {
return DXGI_ERROR_INVALID_CALL; return DXGI_ERROR_INVALID_CALL;
// Query monitor info to get the device name // Query monitor info to get the device name
::MONITORINFOEX monInfo = { sizeof(monInfo) }; ::MONITORINFOEX monInfo;
monInfo.cbSize = sizeof(monInfo);
if (!::GetMonitorInfo(m_monitor, &monInfo)) { if (!::GetMonitorInfo(m_monitor, &monInfo)) {
Logger::err("DxgiOutput: Failed to query monitor info"); Logger::err("DxgiOutput: Failed to query monitor info");
return E_FAIL; return E_FAIL;

5
tests/dxbc/test_dxbc_disasm.cpp
View File

@ -1,5 +1,6 @@
#include <cstring> #include <cstring>
#include <fstream> #include <fstream>
#include <vector>
#include <d3dcompiler.h> #include <d3dcompiler.h>
@ -46,9 +47,7 @@ int WINAPI WinMain(HINSTANCE hInstance,
return 1; return 1;
} }
std::string data; std::string data((const char *)assembly->GetBufferPointer(), assembly->GetBufferSize());
data.resize(assembly->GetBufferSize());
std::memcpy(data.data(), assembly->GetBufferPointer(), data.size());
std::cout << data; std::cout << data;
return 0; return 0;
} }

1
tests/dxbc/test_hlsl_compiler.cpp
View File

@ -1,5 +1,6 @@
#include <cstring> #include <cstring>
#include <fstream> #include <fstream>
#include <vector>
#include <d3dcompiler.h> #include <d3dcompiler.h>