From 7da9447619897b7e0f7d2b6a05d8bf6c1a34036a Mon Sep 17 00:00:00 2001
From: Stephan Unverwerth <s.unverwerth@serenityos.org>
Date: Sun, 27 Mar 2022 15:02:20 +0200
Subject: [PATCH] LibGL+LibGPU+LibSoftGPU: Move Light.h to LibGPU

---
 Userland/Libraries/LibGL/GLContext.h                    | 4 ++--
 Userland/Libraries/{LibSoftGPU/Light => LibGPU}/Light.h | 2 +-
 Userland/Libraries/LibSoftGPU/Device.cpp                | 2 +-
 Userland/Libraries/LibSoftGPU/Device.h                  | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename Userland/Libraries/{LibSoftGPU/Light => LibGPU}/Light.h (98%)

diff --git a/Userland/Libraries/LibGL/GLContext.h b/Userland/Libraries/LibGL/GLContext.h
index 7bf7645251..2e9cfb2f3f 100644
--- a/Userland/Libraries/LibGL/GLContext.h
+++ b/Userland/Libraries/LibGL/GLContext.h
@@ -18,13 +18,13 @@
 #include <LibGL/Tex/Texture.h>
 #include <LibGL/Tex/TextureUnit.h>
 #include <LibGPU/DeviceInfo.h>
+#include <LibGPU/Light.h>
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/Matrix4x4.h>
 #include <LibGfx/Rect.h>
 #include <LibGfx/Vector3.h>
 #include <LibSoftGPU/Clipper.h>
 #include <LibSoftGPU/Device.h>
-#include <LibSoftGPU/Light/Light.h>
 #include <LibSoftGPU/Vertex.h>
 
 namespace GL {
@@ -438,7 +438,7 @@ private:
 
     // Lighting configuration
     bool m_lighting_enabled { false };
-    Vector<SoftGPU::Light> m_light_states;
+    Vector<GPU::Light> m_light_states;
     Array<SoftGPU::Material, 2u> m_material_states;
 
     // Color material
diff --git a/Userland/Libraries/LibSoftGPU/Light/Light.h b/Userland/Libraries/LibGPU/Light.h
similarity index 98%
rename from Userland/Libraries/LibSoftGPU/Light/Light.h
rename to Userland/Libraries/LibGPU/Light.h
index 9589ac2e31..83509b73c9 100644
--- a/Userland/Libraries/LibSoftGPU/Light/Light.h
+++ b/Userland/Libraries/LibGPU/Light.h
@@ -9,7 +9,7 @@
 #include <LibGfx/Vector3.h>
 #include <LibGfx/Vector4.h>
 
-namespace SoftGPU {
+namespace GPU {
 
 struct Light {
     bool is_enabled { false };
diff --git a/Userland/Libraries/LibSoftGPU/Device.cpp b/Userland/Libraries/LibSoftGPU/Device.cpp
index 7703afd74d..a7dd7c984b 100644
--- a/Userland/Libraries/LibSoftGPU/Device.cpp
+++ b/Userland/Libraries/LibSoftGPU/Device.cpp
@@ -1236,7 +1236,7 @@ void Device::set_sampler_config(unsigned sampler, GPU::SamplerConfig const& conf
     m_samplers[sampler].set_config(config);
 }
 
-void Device::set_light_state(unsigned int light_id, Light const& light)
+void Device::set_light_state(unsigned int light_id, GPU::Light const& light)
 {
     m_lights.at(light_id) = light;
 }
diff --git a/Userland/Libraries/LibSoftGPU/Device.h b/Userland/Libraries/LibSoftGPU/Device.h
index 16ec94953d..20e9f2f6c7 100644
--- a/Userland/Libraries/LibSoftGPU/Device.h
+++ b/Userland/Libraries/LibSoftGPU/Device.h
@@ -14,6 +14,7 @@
 #include <LibGPU/DeviceInfo.h>
 #include <LibGPU/Enums.h>
 #include <LibGPU/ImageFormat.h>
+#include <LibGPU/Light.h>
 #include <LibGPU/SamplerConfig.h>
 #include <LibGfx/Bitmap.h>
 #include <LibGfx/Matrix3x3.h>
@@ -26,7 +27,6 @@
 #include <LibSoftGPU/Clipper.h>
 #include <LibSoftGPU/Config.h>
 #include <LibSoftGPU/Image.h>
-#include <LibSoftGPU/Light/Light.h>
 #include <LibSoftGPU/Light/Material.h>
 #include <LibSoftGPU/Sampler.h>
 #include <LibSoftGPU/Triangle.h>
@@ -134,7 +134,7 @@ public:
     NonnullRefPtr<Image> create_image(GPU::ImageFormat format, unsigned width, unsigned height, unsigned depth, unsigned levels, unsigned layers);
 
     void set_sampler_config(unsigned, GPU::SamplerConfig const&);
-    void set_light_state(unsigned, Light const&);
+    void set_light_state(unsigned, GPU::Light const&);
     void set_material_state(GPU::Face, Material const&);
     void set_stencil_configuration(GPU::Face, StencilConfiguration const&);
 
@@ -161,7 +161,7 @@ private:
     Array<Sampler, NUM_SAMPLERS> m_samplers;
     Vector<size_t> m_enabled_texture_units;
     AlphaBlendFactors m_alpha_blend_factors;
-    Array<Light, NUM_LIGHTS> m_lights;
+    Array<GPU::Light, NUM_LIGHTS> m_lights;
     Array<Material, 2u> m_materials;
     RasterPosition m_raster_position;
     Array<StencilConfiguration, 2u> m_stencil_configuration;