diff options
| author | Stephan Unverwerth <s.unverwerth@serenityos.org> | 2022-03-27 15:43:51 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2022-04-06 11:32:24 +0200 |
| commit | 5d2740217fbc0f62f46480f85c142a340580f679 (patch) | |
| tree | 564b274a5fd7ce246e51d4cb0e0efe8c648f3665 /Userland/Libraries/LibSoftGPU/Device.h | |
| parent | 5bf224708ff7ef0166153ef0f94ec15f4e95f232 (diff) | |
| download | serenity-5d2740217fbc0f62f46480f85c142a340580f679.zip | |
LibGL+LibGPU+LibSoftGPU: Move Vertex.h to LibGPU
Diffstat (limited to 'Userland/Libraries/LibSoftGPU/Device.h')
| -rw-r--r-- | Userland/Libraries/LibSoftGPU/Device.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Userland/Libraries/LibSoftGPU/Device.h b/Userland/Libraries/LibSoftGPU/Device.h index 356d3bb4b2..76870833e5 100644 --- a/Userland/Libraries/LibSoftGPU/Device.h +++ b/Userland/Libraries/LibSoftGPU/Device.h @@ -21,6 +21,7 @@ #include <LibGPU/SamplerConfig.h> #include <LibGPU/StencilConfiguration.h> #include <LibGPU/TexCoordGenerationConfig.h> +#include <LibGPU/Vertex.h> #include <LibGfx/Bitmap.h> #include <LibGfx/Matrix3x3.h> #include <LibGfx/Matrix4x4.h> @@ -34,7 +35,6 @@ #include <LibSoftGPU/Image.h> #include <LibSoftGPU/Sampler.h> #include <LibSoftGPU/Triangle.h> -#include <LibSoftGPU/Vertex.h> namespace SoftGPU { @@ -71,8 +71,8 @@ struct RasterizerOptions { GPU::WindingOrder front_face { GPU::WindingOrder::CounterClockwise }; bool cull_back { true }; bool cull_front { false }; - Array<u8, NUM_SAMPLERS> texcoord_generation_enabled_coordinates {}; - Array<Array<GPU::TexCoordGenerationConfig, 4>, NUM_SAMPLERS> texcoord_generation_config {}; + Array<u8, GPU::NUM_SAMPLERS> texcoord_generation_enabled_coordinates {}; + Array<Array<GPU::TexCoordGenerationConfig, 4>, GPU::NUM_SAMPLERS> texcoord_generation_config {}; Gfx::IntRect viewport; bool lighting_enabled { false }; bool color_material_enabled { false }; @@ -88,7 +88,7 @@ public: GPU::DeviceInfo info() const; - void draw_primitives(GPU::PrimitiveType, FloatMatrix4x4 const& model_view_transform, FloatMatrix4x4 const& projection_transform, FloatMatrix4x4 const& texture_transform, Vector<Vertex> const& vertices, Vector<size_t> const& enabled_texture_units); + void draw_primitives(GPU::PrimitiveType, FloatMatrix4x4 const& model_view_transform, FloatMatrix4x4 const& projection_transform, FloatMatrix4x4 const& texture_transform, Vector<GPU::Vertex> const& vertices, Vector<size_t> const& enabled_texture_units); void resize(Gfx::IntSize const& min_size); void clear_color(FloatVector4 const&); void clear_depth(GPU::DepthType); @@ -129,8 +129,8 @@ private: Clipper m_clipper; Vector<Triangle> m_triangle_list; Vector<Triangle> m_processed_triangles; - Vector<Vertex> m_clipped_vertices; - Array<Sampler, NUM_SAMPLERS> m_samplers; + Vector<GPU::Vertex> m_clipped_vertices; + Array<Sampler, GPU::NUM_SAMPLERS> m_samplers; Vector<size_t> m_enabled_texture_units; AlphaBlendFactors m_alpha_blend_factors; Array<GPU::Light, NUM_LIGHTS> m_lights; |