Skip to content

Commit

Permalink
typo fixed (#1085)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sfpgmr
sfpgmr authored Sep 14, 2023
1 parent 0183d5a commit 831e82b
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/Renderer/D3D11/Device/D3D11Adapter.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ namespace s3d

D3D_FEATURE_LEVEL selectedLevel = D3D_FEATURE_LEVEL_9_1;

bool d3d11_1_runtimeSupprot = false;
bool d3d11_1_runtimeSupport = false;

bool computeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x = false;
};
Expand Down
2 changes: 1 addition & 1 deletion Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/Renderer/D3D11/Device/D3D11Device.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ namespace s3d
return m_deviceInfo.device.Get();
}

ComPtr<ID3D11Device> D3D11Device::getDeiviceComPtr() const noexcept
ComPtr<ID3D11Device> D3D11Device::getDeviceComPtr() const noexcept
{
return m_deviceInfo.device;
}
Expand Down
2 changes: 1 addition & 1 deletion Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/Renderer/D3D11/Device/D3D11Device.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ namespace s3d
ID3D11Device* getDevice() const noexcept;

[[nodiscard]]
ComPtr<ID3D11Device> getDeiviceComPtr() const noexcept;
ComPtr<ID3D11Device> getDeviceComPtr() const noexcept;

[[nodiscard]]
ID3D11DeviceContext* getContext() const noexcept;
Expand Down
30 changes: 15 additions & 15 deletions Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/Renderer/D3D11/Device/D3D11DeviceHelper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ namespace s3d::detail
}

// Direct3D 11.1 ランタイムを使用可能かチェック
bool d3d11_1_runtimeSupprot = false;
bool d3d11_1_runtimeSupport = false;
ComPtr<IDXGIAdapter2> pAdapter2;
if (hr = pAdapter->QueryInterface(__uuidof(IDXGIAdapter2), &pAdapter2);
SUCCEEDED(hr))
Expand All @@ -253,7 +253,7 @@ namespace s3d::detail
continue;
}

d3d11_1_runtimeSupprot = true;
d3d11_1_runtimeSupport = true;
}

DXGI_ADAPTER_DESC adapterDesc;
Expand All @@ -266,13 +266,13 @@ namespace s3d::detail
.name = Unicode::FromWstring(adapterDesc.Description),
.adapterDesc = adapterDesc,
.vendor = ToAdapterVendor(adapter.adapterDesc.VendorId),
.d3d11_1_runtimeSupprot = d3d11_1_runtimeSupprot,
.d3d11_1_runtimeSupport = d3d11_1_runtimeSupport,
};

LOG_INFO(U"ℹ️ IDXGIAdapter [{}]: {} (supports Direct3D 11.{} runtime)"_fmt(
adapterIndex,
detail::ToString(adapter.adapterDesc),
(d3d11_1_runtimeSupprot ? 1 : 0)
(d3d11_1_runtimeSupport ? 1 : 0)
));

if (!CheckHardwareDevice(adapter, pD3D11CreateDevice, D3D_FEATURE_LEVEL_10_0, unspecified))
Expand Down Expand Up @@ -325,22 +325,22 @@ namespace s3d::detail
.vendor = ToAdapterVendor(adapter.adapterDesc.VendorId),
.maxLevel = cache.maxLevel,
.selectedLevel = cache.selectedLevel,
.d3d11_1_runtimeSupprot = cache.d3d11_1_runtimeSupprot,
.d3d11_1_runtimeSupport = cache.d3d11_1_runtimeSupport,
.computeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x = cache.computeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x
};

LOG_INFO(U"ℹ️ IDXGIAdapter [{}]: {} (supports Direct3D 11.{} runtime)"_fmt(
adapterIndex,
detail::ToString(adapter.adapterDesc),
(adapter.d3d11_1_runtimeSupprot ? 1 : 0)
(adapter.d3d11_1_runtimeSupport ? 1 : 0)
));

adapters.push_back(adapter);
break;
}

// Direct3D 11.1 ランタイムを使用可能かチェック
bool d3d11_1_runtimeSupprot = false;
bool d3d11_1_runtimeSupport = false;
ComPtr<IDXGIAdapter2> pAdapter2;
if (hr = pAdapter->QueryInterface(__uuidof(IDXGIAdapter2), &pAdapter2);
SUCCEEDED(hr))
Expand All @@ -354,7 +354,7 @@ namespace s3d::detail
continue;
}

d3d11_1_runtimeSupprot = true;
d3d11_1_runtimeSupport = true;
}

D3D11Adapter adapter =
Expand All @@ -364,13 +364,13 @@ namespace s3d::detail
.name = Unicode::FromWstring(adapterDesc.Description),
.adapterDesc = adapterDesc,
.vendor = ToAdapterVendor(adapter.adapterDesc.VendorId),
.d3d11_1_runtimeSupprot = d3d11_1_runtimeSupprot,
.d3d11_1_runtimeSupport = d3d11_1_runtimeSupport,
};

LOG_INFO(U"ℹ️ IDXGIAdapter [{}]: {} (supports Direct3D 11.{} runtime)"_fmt(
adapterIndex,
detail::ToString(adapter.adapterDesc),
(d3d11_1_runtimeSupprot ? 1 : 0)
(d3d11_1_runtimeSupport ? 1 : 0)
));

if (!CheckHardwareDevice(adapter, pD3D11CreateDevice, D3D_FEATURE_LEVEL_10_0, unspecified))
Expand Down Expand Up @@ -541,7 +541,7 @@ namespace s3d::detail
.adapterIndex = adapterIndex,
.deviceType = D3D_DRIVER_TYPE_HARDWARE,
.featureLevel = featureLevel,
.d3d11_1_runtimeSupprot = adapter.d3d11_1_runtimeSupprot,
.d3d11_1_runtimeSupport = adapter.d3d11_1_runtimeSupport,
.device = device,
.context = context,
};
Expand All @@ -565,7 +565,7 @@ namespace s3d::detail
.adapterIndex = adapterIndex,
.deviceType = D3D_DRIVER_TYPE_HARDWARE,
.featureLevel = featureLevel,
.d3d11_1_runtimeSupprot = (featureLevel >= D3D_FEATURE_LEVEL_11_1),
.d3d11_1_runtimeSupport = (featureLevel >= D3D_FEATURE_LEVEL_11_1),
.device = device,
.context = context,
};
Expand Down Expand Up @@ -601,7 +601,7 @@ namespace s3d::detail
.adapterIndex = none,
.deviceType = D3D_DRIVER_TYPE_WARP,
.featureLevel = featureLevel,
.d3d11_1_runtimeSupprot = (featureLevel >= D3D_FEATURE_LEVEL_11_1),
.d3d11_1_runtimeSupport = (featureLevel >= D3D_FEATURE_LEVEL_11_1),
.device = device,
.context = context,
};
Expand Down Expand Up @@ -636,7 +636,7 @@ namespace s3d::detail
.adapterIndex = none,
.deviceType = D3D_DRIVER_TYPE_REFERENCE,
.featureLevel = featureLevel,
.d3d11_1_runtimeSupprot = (featureLevel >= D3D_FEATURE_LEVEL_11_1),
.d3d11_1_runtimeSupport = (featureLevel >= D3D_FEATURE_LEVEL_11_1),
.device = device,
.context = context,
};
Expand Down Expand Up @@ -704,7 +704,7 @@ namespace s3d::detail
.revision = adapter.adapterDesc.Revision,
.maxLevel = adapter.maxLevel,
.selectedLevel = adapter.selectedLevel,
.d3d11_1_runtimeSupprot = adapter.d3d11_1_runtimeSupprot,
.d3d11_1_runtimeSupport = adapter.d3d11_1_runtimeSupport,
.computeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x = adapter.computeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x,
};

Expand Down
2 changes: 1 addition & 1 deletion Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/Renderer/D3D11/Device/D3D11DeviceHelper.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ namespace s3d::detail

D3D_FEATURE_LEVEL selectedLevel = D3D_FEATURE_LEVEL_9_1;

bool d3d11_1_runtimeSupprot = false;
bool d3d11_1_runtimeSupport = false;

bool computeShaders_Plus_RawAndStructuredBuffers_Via_Shader_4_x = false;

Expand Down
2 changes: 1 addition & 1 deletion Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/Renderer/D3D11/Device/D3D11DeviceInfo.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace s3d

D3D_FEATURE_LEVEL featureLevel = D3D_FEATURE_LEVEL_9_1;

bool d3d11_1_runtimeSupprot = false;
bool d3d11_1_runtimeSupport = false;

ComPtr<ID3D11Device> device;

Expand Down
2 changes: 1 addition & 1 deletion Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/Renderer/D3D11/SwapChain/D3D11SwapChain.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ namespace s3d
LOG_TRACE(U"IDXGIDevice2::SetMaximumFrameLatency()");

if (ComPtr<IDXGIDevice2> pDXGIDevice;
SUCCEEDED(device.getDeiviceComPtr().As(&pDXGIDevice)))
SUCCEEDED(device.getDeviceComPtr().As(&pDXGIDevice)))
{
pDXGIDevice->SetMaximumFrameLatency(2);
}
Expand Down

0 comments on commit 831e82b

Please sign in to comment.