diff options
| author | Stephan Unverwerth <s.unverwerth@serenityos.org> | 2022-03-27 15:07:53 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2022-04-06 11:32:24 +0200 |
| commit | b652db1f543c7c32f94a8d5cd9865ca7e02f09fd (patch) | |
| tree | dc2db8537c43d60199a0ee5bdd3c5e7036cb93c0 /Userland/Libraries/LibSoftGPU/Device.h | |
| parent | 7da9447619897b7e0f7d2b6a05d8bf6c1a34036a (diff) | |
| download | serenity-b652db1f543c7c32f94a8d5cd9865ca7e02f09fd.zip | |
LibGL+LibGPU+LibSoftGPU: Move Material.h to LibGPU
Diffstat (limited to 'Userland/Libraries/LibSoftGPU/Device.h')
| -rw-r--r-- | Userland/Libraries/LibSoftGPU/Device.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Userland/Libraries/LibSoftGPU/Device.h b/Userland/Libraries/LibSoftGPU/Device.h index 20e9f2f6c7..4edfb2c6ac 100644 --- a/Userland/Libraries/LibSoftGPU/Device.h +++ b/Userland/Libraries/LibSoftGPU/Device.h @@ -15,6 +15,7 @@ #include <LibGPU/Enums.h> #include <LibGPU/ImageFormat.h> #include <LibGPU/Light.h> +#include <LibGPU/Material.h> #include <LibGPU/SamplerConfig.h> #include <LibGfx/Bitmap.h> #include <LibGfx/Matrix3x3.h> @@ -27,7 +28,6 @@ #include <LibSoftGPU/Clipper.h> #include <LibSoftGPU/Config.h> #include <LibSoftGPU/Image.h> -#include <LibSoftGPU/Light/Material.h> #include <LibSoftGPU/Sampler.h> #include <LibSoftGPU/Triangle.h> #include <LibSoftGPU/Vertex.h> @@ -135,7 +135,7 @@ public: void set_sampler_config(unsigned, GPU::SamplerConfig const&); void set_light_state(unsigned, GPU::Light const&); - void set_material_state(GPU::Face, Material const&); + void set_material_state(GPU::Face, GPU::Material const&); void set_stencil_configuration(GPU::Face, StencilConfiguration const&); RasterPosition raster_position() const { return m_raster_position; } @@ -162,7 +162,7 @@ private: Vector<size_t> m_enabled_texture_units; AlphaBlendFactors m_alpha_blend_factors; Array<GPU::Light, NUM_LIGHTS> m_lights; - Array<Material, 2u> m_materials; + Array<GPU::Material, 2u> m_materials; RasterPosition m_raster_position; Array<StencilConfiguration, 2u> m_stencil_configuration; }; |