Lenheart
/
Magic_Game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update GetDisplaySettings function

This commit is contained in:
Nomango 2020-05-19 21:12:57 +08:00
parent 2ff0d1ad95
commit 3fd3fbbbd8
2 changed files with 44 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/kiwano/render/DirectX/D3D10DeviceResources.cpp
View File

@ -105,11 +105,13 @@ public:
Size logical_size_; Size logical_size_;
Size output_size_; Size output_size_;
unsigned long ref_count_; unsigned long ref_count_;
DXGI_FORMAT desired_color_format_;
}; };
D3D10DeviceResources::D3D10DeviceResources() D3D10DeviceResources::D3D10DeviceResources()
: ref_count_(0) : ref_count_(0)
, hwnd_(nullptr) , hwnd_(nullptr)
, desired_color_format_(DXGI_FORMAT_B8G8R8A8_UNORM)
{ {
dpi_ = 96.f; // dpi_ = (float)GetDpiForWindow(hwnd); dpi_ = 96.f; // dpi_ = (float)GetDpiForWindow(hwnd);
} }
@ -255,7 +257,7 @@ HRESULT D3D10DeviceResources::CreateDeviceResources()
swap_chain_desc.BufferCount = 2; swap_chain_desc.BufferCount = 2;
swap_chain_desc.BufferDesc.Width = ::lround(output_size_.x); swap_chain_desc.BufferDesc.Width = ::lround(output_size_.x);
swap_chain_desc.BufferDesc.Height = ::lround(output_size_.y); swap_chain_desc.BufferDesc.Height = ::lround(output_size_.y);
swap_chain_desc.BufferDesc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; swap_chain_desc.BufferDesc.Format = desired_color_format_;
swap_chain_desc.BufferDesc.RefreshRate.Numerator = 60; swap_chain_desc.BufferDesc.RefreshRate.Numerator = 60;
swap_chain_desc.BufferDesc.RefreshRate.Denominator = 1; swap_chain_desc.BufferDesc.RefreshRate.Denominator = 1;
swap_chain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_CENTERED; swap_chain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_CENTERED;
@ -308,7 +310,7 @@ HRESULT D3D10DeviceResources::CreateWindowSizeDependentResources()
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
D3D10_RENDER_TARGET_VIEW_DESC renderDesc; D3D10_RENDER_TARGET_VIEW_DESC renderDesc;
renderDesc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; renderDesc.Format = desired_color_format_;
renderDesc.ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2D; renderDesc.ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2D;
renderDesc.Texture2D.MipSlice = 0; renderDesc.Texture2D.MipSlice = 0;
@ -430,35 +432,30 @@ HRESULT D3D10DeviceResources::ResizeTarget(UINT width, UINT height)
HRESULT D3D10DeviceResources::GetDisplaySettings(DXGI_MODE_DESC** mode_descs, int* num) HRESULT D3D10DeviceResources::GetDisplaySettings(DXGI_MODE_DESC** mode_descs, int* num)
{ {
ComPtr<IDXGIAdapter> dxgi_adapter; KGE_ASSERT(dxgi_swap_chain_);
HRESULT hr = dxgi_device_->GetAdapter(&dxgi_adapter);
if (SUCCEEDED(hr))
{
ComPtr<IDXGIOutput> output; ComPtr<IDXGIOutput> output;
hr = dxgi_adapter->EnumOutputs(0, &output); HRESULT hr = dxgi_swap_chain_->GetContainingOutput(&output);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
UINT modes_num = 0; UINT num_of_supported_modes = 0;
DXGI_FORMAT format = DXGI_FORMAT_B8G8R8A8_UNORM; output->GetDisplayModeList(desired_color_format_, 0, &num_of_supported_modes, 0);
UINT flags = DXGI_ENUM_MODES_INTERLACED;
output->GetDisplayModeList(format, flags, &modes_num, 0); if (num_of_supported_modes > 0)
if (modes_num > 0)
{ {
DXGI_MODE_DESC* temp = new DXGI_MODE_DESC[modes_num]; DXGI_MODE_DESC* supported_modes = new DXGI_MODE_DESC[num_of_supported_modes];
ZeroMemory(supported_modes, sizeof(DXGI_MODE_DESC) * num_of_supported_modes);
hr = output->GetDisplayModeList(format, flags, &modes_num, temp); hr = output->GetDisplayModeList(desired_color_format_, 0, &num_of_supported_modes, supported_modes);
if (SUCCEEDED(hr) && mode_descs && num) if (SUCCEEDED(hr) && mode_descs && num)
{ {
(*mode_descs) = temp; (*mode_descs) = supported_modes;
(*num) = (int)modes_num; (*num) = (int)num_of_supported_modes;
} }
else else
{ {
delete[] temp; delete[] supported_modes;
} }
} }
else else
@ -466,7 +463,6 @@ HRESULT D3D10DeviceResources::GetDisplaySettings(DXGI_MODE_DESC** mode_descs, in
hr = E_FAIL; hr = E_FAIL;
} }
} }
}
return hr; return hr;
} }

33
src/kiwano/render/DirectX/D3D11DeviceResources.cpp
View File

@ -20,6 +20,7 @@
#include <kiwano/core/Logger.h> #include <kiwano/core/Logger.h>
#include <kiwano/render/DirectX/D3D11DeviceResources.h> #include <kiwano/render/DirectX/D3D11DeviceResources.h>
#include <memory>
KGE_SUPPRESS_WARNING_PUSH KGE_SUPPRESS_WARNING_PUSH
KGE_SUPPRESS_WARNING(4800) // Implicit conversion from 'type' to bool KGE_SUPPRESS_WARNING(4800) // Implicit conversion from 'type' to bool
@ -96,12 +97,14 @@ public:
unsigned long ref_count_; unsigned long ref_count_;
D3D_FEATURE_LEVEL d3d_feature_level_; D3D_FEATURE_LEVEL d3d_feature_level_;
DXGI_FORMAT desired_color_format_;
}; };
D3D11DeviceResources::D3D11DeviceResources() D3D11DeviceResources::D3D11DeviceResources()
: ref_count_(0) : ref_count_(0)
, hwnd_(nullptr) , hwnd_(nullptr)
, d3d_feature_level_(D3D_FEATURE_LEVEL_9_1) , d3d_feature_level_(D3D_FEATURE_LEVEL_9_1)
, desired_color_format_(DXGI_FORMAT_B8G8R8A8_UNORM)
{ {
dpi_ = 96.f; // dpi_ = (float)GetDpiForWindow(hwnd); dpi_ = 96.f; // dpi_ = (float)GetDpiForWindow(hwnd);
} }
@ -277,7 +280,7 @@ HRESULT D3D11DeviceResources::CreateDeviceResources()
swap_chain_desc.BufferCount = 2; swap_chain_desc.BufferCount = 2;
swap_chain_desc.BufferDesc.Width = ::lround(output_size_.x); swap_chain_desc.BufferDesc.Width = ::lround(output_size_.x);
swap_chain_desc.BufferDesc.Height = ::lround(output_size_.y); swap_chain_desc.BufferDesc.Height = ::lround(output_size_.y);
swap_chain_desc.BufferDesc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; swap_chain_desc.BufferDesc.Format = desired_color_format_;
swap_chain_desc.BufferDesc.RefreshRate.Numerator = 60; swap_chain_desc.BufferDesc.RefreshRate.Numerator = 60;
swap_chain_desc.BufferDesc.RefreshRate.Denominator = 1; swap_chain_desc.BufferDesc.RefreshRate.Denominator = 1;
swap_chain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_CENTERED; swap_chain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_CENTERED;
@ -450,35 +453,30 @@ HRESULT D3D11DeviceResources::ResizeTarget(UINT width, UINT height)
HRESULT D3D11DeviceResources::GetDisplaySettings(DXGI_MODE_DESC** mode_descs, int* num) HRESULT D3D11DeviceResources::GetDisplaySettings(DXGI_MODE_DESC** mode_descs, int* num)
{ {
ComPtr<IDXGIAdapter> dxgi_adapter; KGE_ASSERT(dxgi_swap_chain_);
HRESULT hr = dxgi_device_->GetAdapter(&dxgi_adapter);
if (SUCCEEDED(hr))
{
ComPtr<IDXGIOutput> output; ComPtr<IDXGIOutput> output;
hr = dxgi_adapter->EnumOutputs(0, &output); HRESULT hr = dxgi_swap_chain_->GetContainingOutput(&output);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
UINT modes_num = 0; UINT num_of_supported_modes = 0;
DXGI_FORMAT format = DXGI_FORMAT_B8G8R8A8_UNORM; output->GetDisplayModeList(desired_color_format_, 0, &num_of_supported_modes, 0);
UINT flags = DXGI_ENUM_MODES_INTERLACED;
output->GetDisplayModeList(format, flags, &modes_num, 0); if (num_of_supported_modes > 0)
if (modes_num > 0)
{ {
DXGI_MODE_DESC* temp = new DXGI_MODE_DESC[modes_num]; DXGI_MODE_DESC* supported_modes = new DXGI_MODE_DESC[num_of_supported_modes];
ZeroMemory(supported_modes, sizeof(DXGI_MODE_DESC) * num_of_supported_modes);
hr = output->GetDisplayModeList(format, flags, &modes_num, temp); hr = output->GetDisplayModeList(desired_color_format_, 0, &num_of_supported_modes, supported_modes);
if (SUCCEEDED(hr) && mode_descs && num) if (SUCCEEDED(hr) && mode_descs && num)
{ {
(*mode_descs) = temp; (*mode_descs) = supported_modes;
(*num) = (int)modes_num; (*num) = (int)num_of_supported_modes;
} }
else else
{ {
delete[] temp; delete[] supported_modes;
} }
} }
else else
@ -486,7 +484,6 @@ HRESULT D3D11DeviceResources::GetDisplaySettings(DXGI_MODE_DESC** mode_descs, in
hr = E_FAIL; hr = E_FAIL;
} }
} }
}
return hr; return hr;
} }