RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 04:47:35 +00:00
Code Issues Activity Actions

LibGL+LibSoftGPU: Implement glColorMaterial and GL_COLOR_MATERIAL

Browse source 
When `GL_COLOR_MATERIAL` is enabled, specific material parameters can
be overwritten by the current color per-vertex during the lighting
calculations. Which parameter is controlled by `glColorMaterial`.

Also move the lighting calculations _before_ clipping, because the spec
says so. As a result, we interpolate the resulting vertex color instead
of the input color.
This commit is contained in:
Jelle Raaijmakers 2022-01-13 03:03:35 +01:00 • committed by Andreas Kling
parent 9d4c2f6308
commit 8e935ad3b1
8 changed files with 158 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Libraries/LibGL/SoftwareGLContext.h
View file

@ -146,6 +146,7 @@ public:
virtual void gl_lightfv(GLenum light, GLenum pname, GLfloat const* params) override;
virtual void gl_materialf(GLenum face, GLenum pname, GLfloat param) override;
virtual void gl_materialfv(GLenum face, GLenum pname, GLfloat const* params) override;
virtual void gl_color_material(GLenum face, GLenum mode) override;
virtual void present() override;
private:
@ -379,7 +380,8 @@ private:
decltype(&SoftwareGLContext::gl_lightf),
decltype(&SoftwareGLContext::gl_lightfv),
decltype(&SoftwareGLContext::gl_materialf),
decltype(&SoftwareGLContext::gl_materialfv)>;
decltype(&SoftwareGLContext::gl_materialfv),
decltype(&SoftwareGLContext::gl_color_material)>;
using ExtraSavedArguments = Variant<
FloatMatrix4x4>;
@ -431,9 +433,13 @@ private:
// Lighting configuration
bool m_lighting_enabled { false };
Vector<SoftGPU::Light> m_light_states;
Array<SoftGPU::Material, 2u> m_material_states;
// Color material
bool m_color_material_enabled { false };
GLenum m_color_material_face { GL_FRONT_AND_BACK };
GLenum m_color_material_mode { GL_AMBIENT_AND_DIFFUSE };
};
}