rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-18 13:54:16 +01:00
Code Issues Projects Releases Wiki Activity

[dxgi] Cosmetic changes

Browse Source
This commit is contained in:
Philip Rebohle 2018-04-14 12:02:55 +02:00
parent a6767ebd52
commit 8d3e60c2f1
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
9 changed files with 93 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dxgi/dxgi_adapter.cpp
View File

@ -52,7 +52,7 @@ namespace dxvk {
HRESULT STDMETHODCALLTYPE DxgiAdapter::CheckInterfaceSupport(
REFGUID InterfaceName,
LARGE_INTEGER* pUMDVersion) {
Logger::err("DxgiAdapter::CheckInterfaceSupport: No D3D10 support");
Logger::err("DXGI: CheckInterfaceSupport: No D3D10 support");
return DXGI_ERROR_UNSUPPORTED;
}

2
src/dxgi/dxgi_device.cpp
View File

@ -100,7 +100,7 @@ namespace dxvk {
if (Priority < -7 || Priority > 7)
return E_INVALIDARG;
Logger::err("DxgiDevice::SetGPUThreadPriority: Ignoring");
Logger::err("DXGI: SetGPUThreadPriority: Ignoring");
return S_OK;
}

8
src/dxgi/dxgi_factory.cpp
View File

@ -33,9 +33,7 @@ namespace dxvk {
}
HRESULT STDMETHODCALLTYPE DxgiFactory::GetParent(
REFIID riid,
void** ppParent) {
HRESULT STDMETHODCALLTYPE DxgiFactory::GetParent(REFIID riid, void** ppParent) {
InitReturnPtr(ppParent);
Logger::warn("DxgiFactory::GetParent: Unknown interface query");
@ -51,7 +49,7 @@ namespace dxvk {
if (ppAdapter == nullptr)
return DXGI_ERROR_INVALID_CALL;
Logger::err("DxgiFactory::CreateSoftwareAdapter: Software adapters not supported");
Logger::err("DXGI: CreateSoftwareAdapter: Software adapters not supported");
return DXGI_ERROR_UNSUPPORTED;
}
@ -120,7 +118,7 @@ namespace dxvk {
HRESULT STDMETHODCALLTYPE DxgiFactory::MakeWindowAssociation(HWND WindowHandle, UINT Flags) {
Logger::warn("DxgiFactory::MakeWindowAssociation: Ignoring flags");
Logger::warn("DXGI: MakeWindowAssociation: Ignoring flags");
m_associatedWindow = WindowHandle;
return S_OK;
}

26
src/dxgi/dxgi_factory.h
View File

@ -16,16 +16,16 @@ namespace dxvk {
~DxgiFactory();
HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid,
void** ppvObject) final;
REFIID riid,
void** ppvObject) final;
HRESULT STDMETHODCALLTYPE GetParent(
REFIID riid,
void** ppParent) final;
REFIID riid,
void** ppParent) final;
HRESULT STDMETHODCALLTYPE CreateSoftwareAdapter(
HMODULE Module,
IDXGIAdapter** ppAdapter) final;
HMODULE Module,
IDXGIAdapter** ppAdapter) final;
HRESULT STDMETHODCALLTYPE CreateSwapChain(
IUnknown* pDevice,
@ -33,19 +33,19 @@ namespace dxvk {
IDXGISwapChain** ppSwapChain) final;
HRESULT STDMETHODCALLTYPE EnumAdapters(
UINT Adapter,
IDXGIAdapter** ppAdapter) final;
UINT Adapter,
IDXGIAdapter** ppAdapter) final;
HRESULT STDMETHODCALLTYPE EnumAdapters1(
UINT Adapter,
IDXGIAdapter1** ppAdapter) final;
UINT Adapter,
IDXGIAdapter1** ppAdapter) final;
HRESULT STDMETHODCALLTYPE GetWindowAssociation(
HWND *pWindowHandle) final;
HWND* pWindowHandle) final;
HRESULT STDMETHODCALLTYPE MakeWindowAssociation(
HWND WindowHandle,
UINT Flags) final;
HWND WindowHandle,
UINT Flags) final;
BOOL STDMETHODCALLTYPE IsCurrent();

16
src/dxgi/dxgi_object.h
View File

@ -12,24 +12,24 @@ namespace dxvk {
public:
HRESULT STDMETHODCALLTYPE GetPrivateData(
REFGUID Name,
UINT *pDataSize,
void *pData) final {
REFGUID Name,
UINT* pDataSize,
void* pData) final {
return m_privateData.getData(
Name, pDataSize, pData);
}
HRESULT STDMETHODCALLTYPE SetPrivateData(
REFGUID Name,
UINT DataSize,
const void *pData) final {
REFGUID Name,
UINT DataSize,
const void* pData) final {
return m_privateData.setData(
Name, DataSize, pData);
}
HRESULT STDMETHODCALLTYPE SetPrivateDataInterface(
REFGUID Name,
const IUnknown *pUnknown) final {
REFGUID Name,
const IUnknown* pUnknown) final {
return m_privateData.setInterface(
Name, pUnknown);
}

27
src/dxgi/dxgi_output.cpp
View File

@ -65,20 +65,11 @@ namespace dxvk {
const DXGI_MODE_DESC *pModeToMatch,
DXGI_MODE_DESC *pClosestMatch,
IUnknown *pConcernedDevice) {
if (pModeToMatch == nullptr) {
Logger::err("DxgiOutput::FindClosestMatchingMode: pModeToMatch is nullptr");
if (pModeToMatch == nullptr || pClosestMatch == nullptr)
return DXGI_ERROR_INVALID_CALL;
}
if (pClosestMatch == nullptr) {
Logger::err("DxgiOutput::FindClosestMatchingMode: pClosestMatch is nullptr");
return DXGI_ERROR_INVALID_CALL;
}
if (pModeToMatch->Format == DXGI_FORMAT_UNKNOWN && pConcernedDevice == nullptr) {
Logger::err("DxgiOutput::FindClosestMatchingMode: no pointer to device was provided for DXGI_FORMAT_UNKNOWN format");
if (pModeToMatch->Format == DXGI_FORMAT_UNKNOWN && pConcernedDevice == nullptr)
return DXGI_ERROR_INVALID_CALL;
}
// If no format was specified, fall back to a standard
// SRGB format, which is supported on all devices.
@ -101,7 +92,7 @@ namespace dxvk {
GetDisplayModeList(targetFormat, DXGI_ENUM_MODES_SCALING, &modeCount, nullptr);
if (modeCount == 0) {
Logger::err("DxgiOutput::FindClosestMatchingMode: No modes found");
Logger::err("DXGI: FindClosestMatchingMode: No modes found");
return DXGI_ERROR_NOT_FOUND;
}
@ -154,7 +145,7 @@ namespace dxvk {
monInfo.cbSize = sizeof(monInfo);
if (!::GetMonitorInfoW(m_monitor, reinterpret_cast<MONITORINFO*>(&monInfo))) {
Logger::err("DxgiOutput: Failed to query monitor info");
Logger::err("DXGI: Failed to query monitor info");
return E_FAIL;
}
@ -181,7 +172,7 @@ namespace dxvk {
monInfo.cbSize = sizeof(monInfo);
if (!::GetMonitorInfoW(m_monitor, reinterpret_cast<MONITORINFO*>(&monInfo))) {
Logger::err("DxgiOutput: Failed to query monitor info");
Logger::err("DXGI: Failed to query monitor info");
return E_FAIL;
}
@ -246,7 +237,7 @@ namespace dxvk {
DXGI_VK_OUTPUT_DATA outputData;
if (FAILED(m_adapter->GetOutputData(m_monitor, &outputData))) {
Logger::err("DxgiOutput: Failed to query output data");
Logger::err("DXGI: Failed to query output data");
return E_FAIL;
}
@ -259,7 +250,7 @@ namespace dxvk {
DXGI_VK_OUTPUT_DATA outputData;
if (FAILED(m_adapter->GetOutputData(m_monitor, &outputData))) {
Logger::err("DxgiOutput: Failed to query output data");
Logger::err("DXGI: Failed to query output data");
return E_FAIL;
}
@ -295,7 +286,7 @@ namespace dxvk {
DXGI_VK_OUTPUT_DATA outputData;
if (FAILED(m_adapter->GetOutputData(m_monitor, &outputData))) {
Logger::err("DxgiOutput: Failed to query output data");
Logger::err("DXGI: Failed to query output data");
return E_FAIL;
}
@ -303,7 +294,7 @@ namespace dxvk {
outputData.GammaDirty = TRUE;
if (FAILED(m_adapter->SetOutputData(m_monitor, &outputData))) {
Logger::err("DxgiOutput: Failed to query output data");
Logger::err("DXGI: Failed to update output data");
return E_FAIL;
} return S_OK;
}

38
src/dxgi/dxgi_output.h
View File

@ -30,35 +30,35 @@ namespace dxvk {
~DxgiOutput();
HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid,
void **ppvObject) final;
REFIID riid,
void** ppvObject) final;
HRESULT STDMETHODCALLTYPE GetParent(
REFIID riid,
void **ppParent) final;
REFIID riid,
void** ppParent) final;
HRESULT STDMETHODCALLTYPE FindClosestMatchingMode(
const DXGI_MODE_DESC *pModeToMatch,
DXGI_MODE_DESC *pClosestMatch,
IUnknown *pConcernedDevice) final;
const DXGI_MODE_DESC* pModeToMatch,
DXGI_MODE_DESC* pClosestMatch,
IUnknown* pConcernedDevice) final;
HRESULT STDMETHODCALLTYPE GetDesc(
DXGI_OUTPUT_DESC *pDesc) final;
DXGI_OUTPUT_DESC* pDesc) final;
HRESULT STDMETHODCALLTYPE GetDisplayModeList(
DXGI_FORMAT EnumFormat,
UINT Flags,
UINT *pNumModes,
DXGI_MODE_DESC *pDesc) final;
DXGI_FORMAT EnumFormat,
UINT Flags,
UINT* pNumModes,
DXGI_MODE_DESC* pDesc) final;
HRESULT STDMETHODCALLTYPE GetDisplaySurfaceData(
IDXGISurface *pDestination) final;
IDXGISurface* pDestination) final;
HRESULT STDMETHODCALLTYPE GetFrameStatistics(
DXGI_FRAME_STATISTICS *pStats) final;
DXGI_FRAME_STATISTICS* pStats) final;
HRESULT STDMETHODCALLTYPE GetGammaControl(
DXGI_GAMMA_CONTROL *pArray) final;
DXGI_GAMMA_CONTROL* pArray) final;
HRESULT STDMETHODCALLTYPE GetGammaControlCapabilities(
DXGI_GAMMA_CONTROL_CAPABILITIES *pGammaCaps) final;
@ -66,14 +66,14 @@ namespace dxvk {
void STDMETHODCALLTYPE ReleaseOwnership() final;
HRESULT STDMETHODCALLTYPE SetDisplaySurface(
IDXGISurface *pScanoutSurface) final;
IDXGISurface* pScanoutSurface) final;
HRESULT STDMETHODCALLTYPE SetGammaControl(
const DXGI_GAMMA_CONTROL *pArray) final;
const DXGI_GAMMA_CONTROL* pArray) final;
HRESULT STDMETHODCALLTYPE TakeOwnership(
IUnknown *pDevice,
BOOL Exclusive) final;
IUnknown* pDevice,
BOOL Exclusive) final;
HRESULT STDMETHODCALLTYPE WaitForVBlank() final;

20
src/dxgi/dxgi_swapchain.cpp
View File

@ -17,7 +17,7 @@ namespace dxvk {
// communicate with the underlying D3D device
if (FAILED(pDevice->QueryInterface(__uuidof(IDXGIVkPresenter),
reinterpret_cast<void**>(&m_presentDevice))))
throw DxvkError("DxgiSwapChain::DxgiSwapChain: Invalid device");
throw DxvkError("DXGI: DxgiSwapChain: Invalid device");
// Retrieve the adapter, which is going
// to be used to enumerate displays.
@ -25,10 +25,10 @@ namespace dxvk {
Com<IDXGIAdapter> adapter;
if (FAILED(pDevice->QueryInterface(__uuidof(IDXGIDevice), reinterpret_cast<void**>(&device))))
throw DxvkError("DxgiSwapChain::DxgiSwapChain: Invalid device");
throw DxvkError("DXGI: DxgiSwapChain: Invalid device");
if (FAILED(device->GetAdapter(&adapter)))
throw DxvkError("DxgiSwapChain::DxgiSwapChain: Failed to retrieve adapter");
throw DxvkError("DXGI: DxgiSwapChain: Failed to retrieve adapter");
m_device = static_cast<DxgiDevice*>(device.ptr());
m_adapter = static_cast<DxgiAdapter*>(adapter.ptr());
@ -49,13 +49,13 @@ namespace dxvk {
// Set initial window mode and fullscreen state
if (!pDesc->Windowed && FAILED(EnterFullscreenMode(nullptr)))
throw DxvkError("DxgiSwapChain: Failed to set initial fullscreen state");
throw DxvkError("DXGI: DxgiSwapChain: Failed to set initial fullscreen state");
if (FAILED(CreatePresenter()) || FAILED(CreateBackBuffer()))
throw DxvkError("DxgiSwapChain: Failed to create presenter or back buffer");
throw DxvkError("DXGI: DxgiSwapChain: Failed to create presenter or back buffer");
if (FAILED(SetDefaultGammaControl()))
throw DxvkError("DxgiSwapChain: Failed to set up gamma ramp");
throw DxvkError("DXGI: DxgiSwapChain: Failed to set up gamma ramp");
}
@ -344,7 +344,7 @@ namespace dxvk {
VkSampleCountFlagBits sampleCount = VK_SAMPLE_COUNT_1_BIT;
if (FAILED(GetSampleCount(m_desc.SampleDesc.Count, &sampleCount))) {
Logger::err("DxgiSwapChain: Invalid sample count");
Logger::err("DXGI: CreateBackBuffer: Invalid sample count");
return E_INVALIDARG;
}
@ -352,7 +352,7 @@ namespace dxvk {
m_backBuffer = nullptr;
if (FAILED(m_presentDevice->CreateSwapChainBackBuffer(&m_desc, &m_backBuffer))) {
Logger::err("DxgiSwapChain: Failed to create back buffer");
Logger::err("DXGI: CreateBackBuffer: Failed to create back buffer");
return E_FAIL;
}
@ -377,12 +377,12 @@ namespace dxvk {
}
HRESULT DxgiSwapChain::EnterFullscreenMode(IDXGIOutput *pTarget) {
HRESULT DxgiSwapChain::EnterFullscreenMode(IDXGIOutput* pTarget) {
Com<IDXGIOutput> output = static_cast<DxgiOutput*>(pTarget);
if (output == nullptr) {
if (FAILED(GetContainingOutput(&output))) {
Logger::err("DxgiSwapChain: Failed to enter fullscreen mode: Cannot query containing output");
Logger::err("DXGI: EnterFullscreenMode: Cannot query containing output");
return E_FAIL;
}
}

58
src/dxgi/dxgi_swapchain.h
View File

@ -25,64 +25,64 @@ namespace dxvk {
public:
DxgiSwapChain(
DxgiFactory* factory,
IUnknown* pDevice,
DXGI_SWAP_CHAIN_DESC* pDesc);
DxgiFactory* factory,
IUnknown* pDevice,
DXGI_SWAP_CHAIN_DESC* pDesc);
~DxgiSwapChain();
HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid,
void** ppvObject) final;
REFIID riid,
void** ppvObject) final;
HRESULT STDMETHODCALLTYPE GetParent(
REFIID riid,
void** ppParent) final;
REFIID riid,
void** ppParent) final;
HRESULT STDMETHODCALLTYPE GetDevice(
REFIID riid,
void** ppDevice) final;
REFIID riid,
void** ppDevice) final;
HRESULT STDMETHODCALLTYPE GetBuffer(
UINT Buffer,
REFIID riid,
void** ppSurface) final;
UINT Buffer,
REFIID riid,
void** ppSurface) final;
HRESULT STDMETHODCALLTYPE GetContainingOutput(
IDXGIOutput **ppOutput) final;
IDXGIOutput** ppOutput) final;
HRESULT STDMETHODCALLTYPE GetDesc(
DXGI_SWAP_CHAIN_DESC *pDesc) final;
DXGI_SWAP_CHAIN_DESC* pDesc) final;
HRESULT STDMETHODCALLTYPE GetFrameStatistics(
DXGI_FRAME_STATISTICS *pStats) final;
DXGI_FRAME_STATISTICS* pStats) final;
HRESULT STDMETHODCALLTYPE GetFullscreenState(
BOOL *pFullscreen,
IDXGIOutput **ppTarget) final;
BOOL* pFullscreen,
IDXGIOutput** ppTarget) final;
HRESULT STDMETHODCALLTYPE GetLastPresentCount(
UINT *pLastPresentCount) final;
UINT* pLastPresentCount) final;
HRESULT STDMETHODCALLTYPE Present(
UINT SyncInterval,
UINT Flags) final;
UINT SyncInterval,
UINT Flags) final;
HRESULT STDMETHODCALLTYPE ResizeBuffers(
UINT BufferCount,
UINT Width,
UINT Height,
DXGI_FORMAT NewFormat,
UINT SwapChainFlags) final;
UINT BufferCount,
UINT Width,
UINT Height,
DXGI_FORMAT NewFormat,
UINT SwapChainFlags) final;
HRESULT STDMETHODCALLTYPE ResizeTarget(
const DXGI_MODE_DESC *pNewTargetParameters) final;
const DXGI_MODE_DESC* pNewTargetParameters) final;
HRESULT STDMETHODCALLTYPE SetFullscreenState(
BOOL Fullscreen,
IDXGIOutput *pTarget) final;
BOOL Fullscreen,
IDXGIOutput* pTarget) final;
HRESULT SetGammaControl(
const DXGI_GAMMA_CONTROL* pGammaControl);
const DXGI_GAMMA_CONTROL* pGammaControl);
HRESULT SetDefaultGammaControl();