backup/xn65
1
0
Fork 0
mirror of https://github.com/borgesdan/xn65 synced 2024-12-29 21:54:47 +01:00
Code Issues Projects Releases Activity

Corrige nomes e acessos em GraphicsAdapter

Browse Source
This commit is contained in:
Danilo 2024-11-13 09:47:59 -03:00
parent 077caf7a05
commit 146ae9cf89
5 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
includes/xna-dx/implementations.hpp
View File

@ -4,20 +4,11 @@
#include "headers.hpp" #include "headers.hpp"
namespace xna { namespace xna {
struct GraphicsAdapterImpl { struct GraphicsAdapterImplementation {
comptr<IDXGIAdapter1> Adapter() const {
return adapter;
}
comptr<IDXGIFactory1> Factory() const {
return factory;
}
private:
friend class GraphicsAdapter; friend class GraphicsAdapter;
comptr<IDXGIAdapter1> adapter; comptr<IDXGIAdapter1> Adapter;
comptr<IDXGIFactory1> factory; comptr<IDXGIFactory1> Factory;
}; };
struct BlendRenderTarget { struct BlendRenderTarget {

5
includes/xna/graphics/adapter.hpp
View File

@ -9,9 +9,10 @@
namespace xna { namespace xna {
struct GraphicsAdapterImpl; struct GraphicsAdapterImplementation;
//Provides methods to retrieve and manipulate graphics adapters. //Provides methods to retrieve and manipulate graphics adapters.
class GraphicsAdapter : public ImplementationBase<GraphicsAdapterImpl> { class GraphicsAdapter : public ImplementationBase<GraphicsAdapterImplementation> {
public: public:
//Collection of available adapters on the system. //Collection of available adapters on the system.
static void Adapters(std::vector<std::unique_ptr<GraphicsAdapter>>& adapters); static void Adapters(std::vector<std::unique_ptr<GraphicsAdapter>>& adapters);

12
sources/framework-dx/adapter.cpp
View File

@ -8,7 +8,7 @@ namespace xna {
static sptr<DisplayModeCollection> getSupportedDisplayModes(comptr<IDXGIAdapter1>& dxAdapter); static sptr<DisplayModeCollection> getSupportedDisplayModes(comptr<IDXGIAdapter1>& dxAdapter);
GraphicsAdapter::GraphicsAdapter() { GraphicsAdapter::GraphicsAdapter() {
Implementation = unew<GraphicsAdapterImpl>(); Implementation = unew<GraphicsAdapterImplementation>();
} }
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->Implementation->adapter = pAdapter; adp->Implementation->Adapter = pAdapter;
adp->Implementation->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->Implementation->adapter = pAdapter; adp->Implementation->Adapter = pAdapter;
adp->Implementation->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 (Implementation->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());

2
sources/framework-dx/device.cpp
View File

@ -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.Implementation->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

2
sources/framework-dx/swapchain.cpp
View File

@ -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->Implementation->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;