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

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

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

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

@ -3413,7 +3413,7 @@ void GLContext::gl_materialfv(GLenum face, GLenum pname, GLfloat const* params)
RETURN_WITH_ERROR_IF(!(pname == GL_AMBIENT || pname == GL_DIFFUSE || pname == GL_SPECULAR || pname == GL_EMISSION || pname == GL_SHININESS || pname == GL_AMBIENT_AND_DIFFUSE), GL_INVALID_ENUM);
RETURN_WITH_ERROR_IF((pname == GL_SHININESS && *params > 128.0f), GL_INVALID_VALUE);
auto update_material = [](SoftGPU::Material& material, GLenum pname, GLfloat const* params) {
auto update_material = [](GPU::Material& material, GLenum pname, GLfloat const* params) {
switch (pname) {
case GL_AMBIENT:
material.ambient = { params[0], params[1], params[2], params[3] };
@ -3460,7 +3460,7 @@ void GLContext::gl_materialiv(GLenum face, GLenum pname, GLint const* params)
RETURN_WITH_ERROR_IF(!(pname == GL_AMBIENT || pname == GL_DIFFUSE || pname == GL_SPECULAR || pname == GL_EMISSION || pname == GL_SHININESS || pname == GL_AMBIENT_AND_DIFFUSE), GL_INVALID_ENUM);
RETURN_WITH_ERROR_IF((pname == GL_SHININESS && *params > 128), GL_INVALID_VALUE);
auto update_material = [](SoftGPU::Material& material, GLenum pname, GLint const* params) {
auto update_material = [](GPU::Material& material, GLenum pname, GLint const* params) {
switch (pname) {
case GL_AMBIENT:
material.ambient = { static_cast<float>(params[0]), static_cast<float>(params[1]), static_cast<float>(params[2]), static_cast<float>(params[3]) };

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

@ -439,7 +439,7 @@ private:
// Lighting configuration
bool m_lighting_enabled { false };
Vector<GPU::Light> m_light_states;
Array<SoftGPU::Material, 2u> m_material_states;
Array<GPU::Material, 2u> m_material_states;
// Color material
bool m_color_material_enabled { false };