mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Direct2D: Refactor DxgiAdapter constructor

Browse source
This commit is contained in:
reuk 2024-08-23 18:35:58 +01:00
parent f78841e0d9
commit 6e9b7dad9a
1 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

47
modules/juce_graphics/native/juce_DirectX_windows.h
View file

@ -39,53 +39,50 @@ struct DxgiAdapter : public ReferenceCountedObject
{ {
using Ptr = ReferenceCountedObjectPtr<DxgiAdapter>; using Ptr = ReferenceCountedObjectPtr<DxgiAdapter>;
DxgiAdapter (ComSmartPtr<ID2D1Factory2> d2dFactory, ComSmartPtr<IDXGIAdapter1> dxgiAdapterIn) static Ptr create (ComSmartPtr<ID2D1Factory2> d2dFactory, ComSmartPtr<IDXGIAdapter1> dxgiAdapterIn)
: dxgiAdapter (dxgiAdapterIn)
{ {
if (dxgiAdapterIn == nullptr || d2dFactory == nullptr)
return {};
Ptr result = new DxgiAdapter;
result->dxgiAdapter = dxgiAdapterIn;
for (UINT i = 0;; ++i) for (UINT i = 0;; ++i)
{ {
ComSmartPtr<IDXGIOutput> output; ComSmartPtr<IDXGIOutput> output;
const auto hr = dxgiAdapter->EnumOutputs (i, output.resetAndGetPointerAddress()); const auto hr = result->dxgiAdapter->EnumOutputs (i, output.resetAndGetPointerAddress());
if (hr == DXGI_ERROR_NOT_FOUND || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) if (hr == DXGI_ERROR_NOT_FOUND || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE)
break; break;
dxgiOutputs.push_back (output); result->dxgiOutputs.push_back (output);
} }
// This flag adds support for surfaces with a different color channel ordering // This flag adds support for surfaces with a different color channel ordering
// than the API default. It is required for compatibility with Direct2D. // than the API default. It is required for compatibility with Direct2D.
const auto creationFlags = D3D11_CREATE_DEVICE_BGRA_SUPPORT; const auto creationFlags = D3D11_CREATE_DEVICE_BGRA_SUPPORT;
jassert (dxgiAdapter);
if (const auto hr = D3D11CreateDevice (dxgiAdapter, if (const auto hr = D3D11CreateDevice (result->dxgiAdapter,
D3D_DRIVER_TYPE_UNKNOWN, D3D_DRIVER_TYPE_UNKNOWN,
nullptr, nullptr,
creationFlags, creationFlags,
nullptr, nullptr,
0, 0,
D3D11_SDK_VERSION, D3D11_SDK_VERSION,
direct3DDevice.resetAndGetPointerAddress(), result->direct3DDevice.resetAndGetPointerAddress(),
nullptr, nullptr,
nullptr); FAILED (hr)) nullptr); FAILED (hr))
{ {
return; return {};
} }
if (const auto hr = direct3DDevice->QueryInterface (dxgiDevice.resetAndGetPointerAddress()); FAILED (hr)) if (const auto hr = result->direct3DDevice->QueryInterface (result->dxgiDevice.resetAndGetPointerAddress()); FAILED (hr))
return; return {};
if (const auto hr = d2dFactory->CreateDevice (dxgiDevice, direct2DDevice.resetAndGetPointerAddress()); FAILED (hr)) if (const auto hr = d2dFactory->CreateDevice (result->dxgiDevice, result->direct2DDevice.resetAndGetPointerAddress()); FAILED (hr))
return; return {};
}
void release() return result;
{
direct2DDevice = nullptr;
dxgiDevice = nullptr;
dxgiOutputs.clear();
dxgiAdapter = nullptr;
direct3DDevice = nullptr; // release the Direct3D device after the adapter to avoid an exception with AMD
} }
bool uniqueIDMatches (ReferenceCountedObjectPtr<DxgiAdapter> other) const bool uniqueIDMatches (ReferenceCountedObjectPtr<DxgiAdapter> other) const
@ -113,6 +110,9 @@ struct DxgiAdapter : public ReferenceCountedObject
ComSmartPtr<ID2D1Device1> direct2DDevice; ComSmartPtr<ID2D1Device1> direct2DDevice;
ComSmartPtr<IDXGIAdapter1> dxgiAdapter; ComSmartPtr<IDXGIAdapter1> dxgiAdapter;
std::vector<ComSmartPtr<IDXGIOutput>> dxgiOutputs; std::vector<ComSmartPtr<IDXGIOutput>> dxgiOutputs;
private:
DxgiAdapter() = default;
}; };
struct DxgiAdapterListener struct DxgiAdapterListener
@ -162,8 +162,11 @@ public:
if (factory->EnumAdapters1 (i, dxgiAdapter.resetAndGetPointerAddress()) == DXGI_ERROR_NOT_FOUND) if (factory->EnumAdapters1 (i, dxgiAdapter.resetAndGetPointerAddress()) == DXGI_ERROR_NOT_FOUND)
break; break;
const auto adapter = adapterArray.add (new DxgiAdapter { d2dFactory, dxgiAdapter }); if (const auto adapter = DxgiAdapter::create (d2dFactory, dxgiAdapter))
listeners.call ([adapter] (DxgiAdapterListener& l) { l.adapterCreated (adapter); }); {
adapterArray.add (adapter);
listeners.call ([adapter] (DxgiAdapterListener& l) { l.adapterCreated (adapter); });
}
} }
} }