RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 03:37:43 +00:00
Code Issues Activity Actions

LibGL: Implement glGetMaterial

Browse source
This commit is contained in:
Jesse Buhagiar 2022-01-21 09:53:28 +11:00 • committed by Andreas Kling
parent f5cde1b6fb
commit 68e50759b4
5 changed files with 76 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibGL/GL/gl.h
View file

@ -588,6 +588,8 @@ GLAPI void glGetFloatv(GLenum pname, GLfloat* params);
GLAPI void glGetIntegerv(GLenum pname, GLint* data); GLAPI void glGetIntegerv(GLenum pname, GLint* data);
GLAPI void glGetLightfv(GLenum light, GLenum pname, GLfloat* params); GLAPI void glGetLightfv(GLenum light, GLenum pname, GLfloat* params);
GLAPI void glGetLightiv(GLenum light, GLenum pname, GLint* params); GLAPI void glGetLightiv(GLenum light, GLenum pname, GLint* params);
GLAPI void glGetMaterialfv(GLenum face, GLenum pname, GLfloat* params);
GLAPI void glGetMaterialiv(GLenum face, GLenum pname, GLint* params);
GLAPI void glDepthMask(GLboolean flag); GLAPI void glDepthMask(GLboolean flag);
GLAPI void glEnableClientState(GLenum cap); GLAPI void glEnableClientState(GLenum cap);
GLAPI void glDisableClientState(GLenum cap); GLAPI void glDisableClientState(GLenum cap);

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

@ -120,6 +120,7 @@ public:
virtual void gl_materialfv(GLenum face, GLenum pname, GLfloat const* params) = 0; virtual void gl_materialfv(GLenum face, GLenum pname, GLfloat const* params) = 0;
virtual void gl_color_material(GLenum face, GLenum mode) = 0; virtual void gl_color_material(GLenum face, GLenum mode) = 0;
virtual void gl_get_light(GLenum light, GLenum pname, void* params, GLenum type) = 0; virtual void gl_get_light(GLenum light, GLenum pname, void* params, GLenum type) = 0;
virtual void gl_get_material(GLenum face, GLenum pname, void* params, GLenum type) = 0;
virtual void present() = 0; virtual void present() = 0;
}; };

10
Userland/Libraries/LibGL/GLLights.cpp
View file

@ -72,3 +72,13 @@ void glGetLightiv(GLenum light, GLenum pname, GLint* params)
{ {
g_gl_context->gl_get_light(light, pname, params, GL_INT); g_gl_context->gl_get_light(light, pname, params, GL_INT);
} }
void glGetMaterialfv(GLenum face, GLenum pname, GLfloat* params)
{
g_gl_context->gl_get_material(face, pname, params, GL_FLOAT);
}
void glGetMaterialiv(GLenum face, GLenum pname, GLint* params)
{
g_gl_context->gl_get_material(face, pname, params, GL_INT);
}

60
Userland/Libraries/LibGL/SoftwareGLContext.cpp
View file

@ -3577,4 +3577,64 @@ void SoftwareGLContext::get_light_param(GLenum light, GLenum pname, T* params)
} }
} }
void SoftwareGLContext::gl_get_material(GLenum face, GLenum pname, void* params, GLenum type)
{
APPEND_TO_CALL_LIST_AND_RETURN_IF_NEEDED(gl_get_material, face, pname, params, type);
RETURN_WITH_ERROR_IF(m_in_draw_state, GL_INVALID_OPERATION);
RETURN_WITH_ERROR_IF(!(pname == GL_AMBIENT || pname == GL_DIFFUSE || pname == GL_SPECULAR || pname == GL_EMISSION), GL_INVALID_ENUM);
RETURN_WITH_ERROR_IF(!(face == GL_FRONT || face == GL_BACK), GL_INVALID_ENUM);
Face material_face = Front;
switch (face) {
case GL_FRONT:
material_face = Front;
break;
case GL_BACK:
material_face = Back;
break;
}
if (type == GL_FLOAT)
get_material_param<GLfloat>(material_face, pname, static_cast<GLfloat*>(params));
else if (type == GL_INT)
get_material_param<GLint>(material_face, pname, static_cast<GLint*>(params));
else
VERIFY_NOT_REACHED();
}
template<typename T>
void SoftwareGLContext::get_material_param(Face face, GLenum pname, T* params)
{
auto const& material = m_material_states[face];
switch (pname) {
case GL_AMBIENT:
params[0] = static_cast<T>(material.ambient.x());
params[1] = static_cast<T>(material.ambient.y());
params[2] = static_cast<T>(material.ambient.z());
params[3] = static_cast<T>(material.ambient.w());
break;
case GL_DIFFUSE:
params[0] = static_cast<T>(material.diffuse.x());
params[1] = static_cast<T>(material.diffuse.y());
params[2] = static_cast<T>(material.diffuse.z());
params[3] = static_cast<T>(material.diffuse.w());
break;
case GL_SPECULAR:
params[0] = static_cast<T>(material.specular.x());
params[1] = static_cast<T>(material.specular.y());
params[2] = static_cast<T>(material.specular.z());
params[3] = static_cast<T>(material.specular.w());
break;
case GL_EMISSION:
params[0] = static_cast<T>(material.emissive.x());
params[1] = static_cast<T>(material.emissive.y());
params[2] = static_cast<T>(material.emissive.z());
params[3] = static_cast<T>(material.emissive.w());
break;
case GL_SHININESS:
*params = material.shininess;
break;
}
}
} }

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

@ -151,6 +151,7 @@ public:
virtual void gl_materialfv(GLenum face, GLenum pname, GLfloat const* params) 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 gl_color_material(GLenum face, GLenum mode) override;
virtual void gl_get_light(GLenum light, GLenum pname, void* params, GLenum type) override; virtual void gl_get_light(GLenum light, GLenum pname, void* params, GLenum type) override;
virtual void gl_get_material(GLenum face, GLenum pname, void* params, GLenum type) override;
virtual void present() override; virtual void present() override;
private: private:
@ -184,6 +185,8 @@ private:
void get_floating_point(GLenum pname, T* params); void get_floating_point(GLenum pname, T* params);
template<typename T> template<typename T>
void get_light_param(GLenum light, GLenum pname, T* params); void get_light_param(GLenum light, GLenum pname, T* params);
template<typename T>
void get_material_param(Face face, GLenum pname, T* params);
void invoke_list(size_t list_index); void invoke_list(size_t list_index);
[[nodiscard]] bool should_append_to_listing() const { return m_current_listing_index.has_value(); } [[nodiscard]] bool should_append_to_listing() const { return m_current_listing_index.has_value(); }