RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-14 06:14:58 +00:00
Code Issues Activity Actions

LibGL+LibGPU+LibSoftGPU: Move Light.h to LibGPU

Browse source
This commit is contained in:
Stephan Unverwerth 2022-03-27 15:02:20 +02:00 • committed by Andreas Kling
parent e7450fa940
commit 7da9447619
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibGL/GLContext.h
View file

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

2
Userland/Libraries/LibSoftGPU/Light/Light.h → Userland/Libraries/LibGPU/Light.h
View file

@ -9,7 +9,7 @@
#include <LibGfx/Vector3.h>
#include <LibGfx/Vector4.h>
namespace SoftGPU {
namespace GPU {
struct Light {
bool is_enabled { false };

2
Userland/Libraries/LibSoftGPU/Device.cpp
View file

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

6
Userland/Libraries/LibSoftGPU/Device.h
View file

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