RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 19:17:44 +00:00
Code Issues Activity Actions

LibGfx+LibGL: Do not crash if matrix inverse does not exist

Browse source 
Allow `Matrix::inverse()` to return an error and deal with those in
LibGL. Also use this opportunity to more efficiently calculate the
transpose of the model view matrix for the normal transformation.
This commit is contained in:
Jelle Raaijmakers 2022-01-11 00:50:17 +01:00 • committed by Linus Groh
parent 03c1f1780d
commit a4a666152b
2 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -313,11 +313,12 @@ void SoftwareGLContext::gl_end()
// Set up normals transform by taking the upper left 3x3 elements from the model view matrix
// See section 2.11.3 of the OpenGL 1.5 spec
auto const& mv_elements = m_model_view_matrix.elements();
auto normal_transform = FloatMatrix3x3(
mv_elements[0][0], mv_elements[0][1], mv_elements[0][2],
mv_elements[1][0], mv_elements[1][1], mv_elements[1][2],
mv_elements[2][0], mv_elements[2][1], mv_elements[2][2]);
normal_transform = normal_transform.inverse();
auto const model_view_transposed = FloatMatrix3x3(
mv_elements[0][0], mv_elements[1][0], mv_elements[2][0],
mv_elements[0][1], mv_elements[1][1], mv_elements[2][1],
mv_elements[0][2], mv_elements[1][2], mv_elements[2][2]);
auto normal_transform_or_error = model_view_transposed.inverse();
auto const& normal_transform = normal_transform_or_error.is_error() ? model_view_transposed : normal_transform_or_error.release_value();
m_rasterizer.draw_primitives(primitive_type, m_model_view_matrix, normal_transform, m_projection_matrix, m_texture_matrix, m_vertex_list, enabled_texture_units);
@ -2809,7 +2810,9 @@ void SoftwareGLContext::gl_tex_gen_floatv(GLenum coord, GLenum pname, GLfloat co
texture_coordinate_generation(capability).object_plane_coefficients = { params[0], params[1], params[2], params[3] };
break;
case GL_EYE_PLANE: {
auto inverted_model_view_matrix = m_model_view_matrix.inverse();
auto inverse_matrix_or_error = m_model_view_matrix.inverse();
auto const& inverse_model_view_matrix = inverse_matrix_or_error.is_error() ? m_model_view_matrix : inverse_matrix_or_error.release_value();
auto input_coefficients = FloatVector4 { params[0], params[1], params[2], params[3] };
// Note: we are allowed to store transformed coefficients here, according to the documentation on
@ -2818,7 +2821,7 @@ void SoftwareGLContext::gl_tex_gen_floatv(GLenum coord, GLenum pname, GLfloat co
// "The returned values are those maintained in eye coordinates. They are not equal to the values
// specified using glTexGen, unless the modelview matrix was identity when glTexGen was called."
texture_coordinate_generation(capability).eye_plane_coefficients = inverted_model_view_matrix * input_coefficients;
texture_coordinate_generation(capability).eye_plane_coefficients = inverse_model_view_matrix * input_coefficients;
break;
}
default: