mirror of
https://github.com/borgesdan/xn65
synced 2024-12-29 21:54:47 +01:00
Renomeia impl para Implementation
This commit is contained in:
parent
02a1911532
commit
234a957484
@ -6,7 +6,7 @@
|
|||||||
namespace xna {
|
namespace xna {
|
||||||
struct ImplementationBase {
|
struct ImplementationBase {
|
||||||
struct PlatformImplementation;
|
struct PlatformImplementation;
|
||||||
std::unique_ptr<PlatformImplementation> impl;
|
std::unique_ptr<PlatformImplementation> Implementation;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@ namespace xna {
|
|||||||
static sptr<DisplayModeCollection> getSupportedDisplayModes(comptr<IDXGIAdapter1>& dxAdapter);
|
static sptr<DisplayModeCollection> getSupportedDisplayModes(comptr<IDXGIAdapter1>& dxAdapter);
|
||||||
|
|
||||||
GraphicsAdapter::GraphicsAdapter() {
|
GraphicsAdapter::GraphicsAdapter() {
|
||||||
impl = unew<PlatformImplementation>();
|
Implementation = unew<PlatformImplementation>();
|
||||||
}
|
}
|
||||||
|
|
||||||
uptr<GraphicsAdapter> GraphicsAdapter::DefaultAdapter() {
|
uptr<GraphicsAdapter> GraphicsAdapter::DefaultAdapter() {
|
||||||
@ -22,8 +22,8 @@ namespace xna {
|
|||||||
if (pFactory->EnumAdapters1(0, pAdapter.GetAddressOf()) != DXGI_ERROR_NOT_FOUND) {
|
if (pFactory->EnumAdapters1(0, pAdapter.GetAddressOf()) != DXGI_ERROR_NOT_FOUND) {
|
||||||
auto adp = uptr<GraphicsAdapter>(new GraphicsAdapter());
|
auto adp = uptr<GraphicsAdapter>(new GraphicsAdapter());
|
||||||
|
|
||||||
adp->impl->adapter = pAdapter;
|
adp->Implementation->adapter = pAdapter;
|
||||||
adp->impl->factory = pFactory;
|
adp->Implementation->factory = pFactory;
|
||||||
|
|
||||||
DXGI_ADAPTER_DESC1 desc{};
|
DXGI_ADAPTER_DESC1 desc{};
|
||||||
pAdapter->GetDesc1(&desc);
|
pAdapter->GetDesc1(&desc);
|
||||||
@ -62,8 +62,8 @@ namespace xna {
|
|||||||
for (UINT count = 0; pFactory->EnumAdapters1(count, pAdapter.GetAddressOf()) != DXGI_ERROR_NOT_FOUND; ++count) {
|
for (UINT count = 0; pFactory->EnumAdapters1(count, pAdapter.GetAddressOf()) != DXGI_ERROR_NOT_FOUND; ++count) {
|
||||||
auto adp = uptr<GraphicsAdapter>(new GraphicsAdapter());
|
auto adp = uptr<GraphicsAdapter>(new GraphicsAdapter());
|
||||||
|
|
||||||
adp->impl->adapter = pAdapter;
|
adp->Implementation->adapter = pAdapter;
|
||||||
adp->impl->factory = pFactory;
|
adp->Implementation->factory = pFactory;
|
||||||
|
|
||||||
DXGI_ADAPTER_DESC1 desc{};
|
DXGI_ADAPTER_DESC1 desc{};
|
||||||
pAdapter->GetDesc1(&desc);
|
pAdapter->GetDesc1(&desc);
|
||||||
@ -101,7 +101,7 @@ namespace xna {
|
|||||||
|
|
||||||
comptr<IDXGIOutput> pOutput = nullptr;
|
comptr<IDXGIOutput> pOutput = nullptr;
|
||||||
|
|
||||||
if (impl->adapter->EnumOutputs(0, pOutput.GetAddressOf()) != DXGI_ERROR_NOT_FOUND){
|
if (Implementation->adapter->EnumOutputs(0, pOutput.GetAddressOf()) != DXGI_ERROR_NOT_FOUND){
|
||||||
comptr<IDXGIOutput1> pOutput1 = nullptr;
|
comptr<IDXGIOutput1> pOutput1 = nullptr;
|
||||||
|
|
||||||
pOutput->QueryInterface(IID_IDXGIOutput1, (void**)pOutput1.GetAddressOf());
|
pOutput->QueryInterface(IID_IDXGIOutput1, (void**)pOutput1.GetAddressOf());
|
||||||
|
@ -226,7 +226,7 @@ namespace xna {
|
|||||||
createDeviceFlags = D3D11_CREATE_DEVICE_FLAG::D3D11_CREATE_DEVICE_DEBUG;
|
createDeviceFlags = D3D11_CREATE_DEVICE_FLAG::D3D11_CREATE_DEVICE_DEBUG;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
const auto& pAdapter = GraphicsAdapter::UseNullDevice() ? NULL : currentAdapter.impl->Adapter().Get();
|
const auto& pAdapter = GraphicsAdapter::UseNullDevice() ? NULL : currentAdapter.Implementation->Adapter().Get();
|
||||||
|
|
||||||
//
|
//
|
||||||
// if pAdapter is not NULL driverType must be D3D_DRIVER_TYPE_UNKNOWN
|
// if pAdapter is not NULL driverType must be D3D_DRIVER_TYPE_UNKNOWN
|
||||||
|
@ -27,7 +27,7 @@ namespace xna {
|
|||||||
auto adapter = device.Adapter();
|
auto adapter = device.Adapter();
|
||||||
|
|
||||||
comptr<IDXGIFactory2> dxFactory2 = nullptr;
|
comptr<IDXGIFactory2> dxFactory2 = nullptr;
|
||||||
const auto hr = adapter->impl->Factory()->QueryInterface(IID_IDXGIFactory2, (void**)&dxFactory2);
|
const auto hr = adapter->Implementation->Factory()->QueryInterface(IID_IDXGIFactory2, (void**)&dxFactory2);
|
||||||
|
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
return false;
|
return false;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user