diff --git a/includes/xna-dx/implementations.hpp b/includes/xna-dx/implementations.hpp index 83fd917..ce3706b 100644 --- a/includes/xna-dx/implementations.hpp +++ b/includes/xna-dx/implementations.hpp @@ -4,15 +4,10 @@ #include "headers.hpp" namespace xna { - struct GraphicsAdapterImplementation { - comptr Adapter; - comptr Factory; - }; - struct BlendStateImplementation { D3D11_BLEND_DESC Description{}; float BlendFactor[4]{ 1.0F, 1.0F, 1.0F, 1.0F }; - UINT SampleMask{ 0xffffffff }; + UINT SampleMask{ 0xffffffff }; comptr BlendState; static constexpr int MAX_RENDER_TARGETS = 8; @@ -23,6 +18,11 @@ namespace xna { D3D11_DEPTH_STENCIL_DESC Description{}; }; + struct GraphicsAdapterImplementation { + comptr Adapter; + comptr Factory; + }; + struct SpriteFont::PlatformImplementation { uptr dxSpriteFont{ nullptr }; }; diff --git a/includes/xna/graphics/depthstencilstate.hpp b/includes/xna/graphics/depthstencilstate.hpp index bdf2fac..ddaa01a 100644 --- a/includes/xna/graphics/depthstencilstate.hpp +++ b/includes/xna/graphics/depthstencilstate.hpp @@ -1,11 +1,11 @@ #ifndef XNA_GRAPHICS_DEPTHSTENCILSTATE_HPP #define XNA_GRAPHICS_DEPTHSTENCILSTATE_HPP -#include "gresource.hpp" #include "../platform.hpp" +#include "gresource.hpp" #include "shared.hpp" -#include #include +#include namespace xna { enum class StencilOperation diff --git a/includes/xna/graphics/device.hpp b/includes/xna/graphics/device.hpp index 0cb6f4c..54ed745 100644 --- a/includes/xna/graphics/device.hpp +++ b/includes/xna/graphics/device.hpp @@ -65,8 +65,6 @@ namespace xna { struct PlatformImplementation; uptr impl = nullptr; }; - - using PGraphicsDevice = sptr; } #endif \ No newline at end of file