diff --git a/Userland/Libraries/LibGL/GLContext.h b/Userland/Libraries/LibGL/GLContext.h index 394ee8216e..7bf7645251 100644 --- a/Userland/Libraries/LibGL/GLContext.h +++ b/Userland/Libraries/LibGL/GLContext.h @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -304,7 +305,7 @@ private: } SoftGPU::Device m_rasterizer; - SoftGPU::DeviceInfo const m_device_info; + GPU::DeviceInfo const m_device_info; bool m_sampler_config_is_dirty { true }; bool m_light_state_is_dirty { true }; diff --git a/Userland/Libraries/LibSoftGPU/DeviceInfo.h b/Userland/Libraries/LibGPU/DeviceInfo.h similarity index 94% rename from Userland/Libraries/LibSoftGPU/DeviceInfo.h rename to Userland/Libraries/LibGPU/DeviceInfo.h index 602c4cbcff..4c9ba9fcea 100644 --- a/Userland/Libraries/LibSoftGPU/DeviceInfo.h +++ b/Userland/Libraries/LibGPU/DeviceInfo.h @@ -8,7 +8,7 @@ #include -namespace SoftGPU { +namespace GPU { struct DeviceInfo final { String vendor_name; diff --git a/Userland/Libraries/LibSoftGPU/Device.cpp b/Userland/Libraries/LibSoftGPU/Device.cpp index 20dc857d1b..5c49674949 100644 --- a/Userland/Libraries/LibSoftGPU/Device.cpp +++ b/Userland/Libraries/LibSoftGPU/Device.cpp @@ -577,7 +577,7 @@ Device::Device(Gfx::IntSize const& size) m_options.viewport = m_frame_buffer->rect(); } -DeviceInfo Device::info() const +GPU::DeviceInfo Device::info() const { return { .vendor_name = "SerenityOS", diff --git a/Userland/Libraries/LibSoftGPU/Device.h b/Userland/Libraries/LibSoftGPU/Device.h index 86568ec57b..2577a1a18d 100644 --- a/Userland/Libraries/LibSoftGPU/Device.h +++ b/Userland/Libraries/LibSoftGPU/Device.h @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -21,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -113,7 +113,7 @@ class Device final { public: Device(Gfx::IntSize const& min_size); - DeviceInfo info() const; + GPU::DeviceInfo info() const; void draw_primitives(PrimitiveType, FloatMatrix4x4 const& model_view_transform, FloatMatrix4x4 const& projection_transform, FloatMatrix4x4 const& texture_transform, Vector const& vertices, Vector const& enabled_texture_units); void resize(Gfx::IntSize const& min_size);