OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: optimize setting the identity matrix

Browse Source 
instead of memcpy from a static mutable place ("const" doesn't help
anything here), just set the values directly

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26548>
This commit is contained in:
Marek Olšák
2023-11-27 15:20:37 -05:00
committed by Marge Bot
parent 5fb106c253
commit 5af047d40a
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/mesa/math/m_matrix.c
View File

@@ -115,17 +115,6 @@
#define TEST_MAT_FLAGS(mat, a) \ #define TEST_MAT_FLAGS(mat, a) \
((MAT_FLAGS_GEOMETRY & (~(a)) & ((mat)->flags) ) == 0) ((MAT_FLAGS_GEOMETRY & (~(a)) & ((mat)->flags) ) == 0)
/**
* Identity matrix.
*/
static const GLfloat Identity[16] = {
1.0, 0.0, 0.0, 0.0,
0.0, 1.0, 0.0, 0.0,
0.0, 0.0, 1.0, 0.0,
0.0, 0.0, 0.0, 1.0
};
/**********************************************************************/ /**********************************************************************/
/** \name Matrix multiplication */ /** \name Matrix multiplication */
@@ -188,6 +177,15 @@ static void matmul34( GLfloat *product, const GLfloat *a, const GLfloat *b )
#undef B #undef B
#undef P #undef P
/* "m" must be a 4x4 matrix. Set it to the identity matrix. */
static void
matrix_set_identity(GLfloat *m)
{
m[0] = m[5] = m[10] = m[15] = 1;
m[1] = m[2] = m[3] = m[4] = m[6] = m[7] = 0;
m[8] = m[9] = m[11] = m[12] = m[13] = m[14] = 0;
}
/** /**
* Multiply a matrix by an array of floats with known properties. * Multiply a matrix by an array of floats with known properties.
* *
@@ -424,7 +422,7 @@ static GLboolean invert_matrix_3d( GLmatrix *mat )
} }
else { else {
/* pure translation */ /* pure translation */
memcpy( out, Identity, sizeof(Identity) ); matrix_set_identity(out);
MAT(out,0,3) = - MAT(in,0,3); MAT(out,0,3) = - MAT(in,0,3);
MAT(out,1,3) = - MAT(in,1,3); MAT(out,1,3) = - MAT(in,1,3);
MAT(out,2,3) = - MAT(in,2,3); MAT(out,2,3) = - MAT(in,2,3);
@@ -462,7 +460,7 @@ static GLboolean invert_matrix_3d( GLmatrix *mat )
*/ */
static GLboolean invert_matrix_identity( GLmatrix *mat ) static GLboolean invert_matrix_identity( GLmatrix *mat )
{ {
memcpy( mat->inv, Identity, sizeof(Identity) ); matrix_set_identity(mat->inv);
return GL_TRUE; return GL_TRUE;
} }
@@ -484,7 +482,7 @@ static GLboolean invert_matrix_3d_no_rot( GLmatrix *mat )
if (MAT(in,0,0) == 0 || MAT(in,1,1) == 0 || MAT(in,2,2) == 0 ) if (MAT(in,0,0) == 0 || MAT(in,1,1) == 0 || MAT(in,2,2) == 0 )
return GL_FALSE; return GL_FALSE;
memcpy( out, Identity, sizeof(Identity) ); matrix_set_identity(out);
MAT(out,0,0) = 1.0F / MAT(in,0,0); MAT(out,0,0) = 1.0F / MAT(in,0,0);
MAT(out,1,1) = 1.0F / MAT(in,1,1); MAT(out,1,1) = 1.0F / MAT(in,1,1);
MAT(out,2,2) = 1.0F / MAT(in,2,2); MAT(out,2,2) = 1.0F / MAT(in,2,2);
@@ -517,7 +515,7 @@ static GLboolean invert_matrix_2d_no_rot( GLmatrix *mat )
if (MAT(in,0,0) == 0 || MAT(in,1,1) == 0) if (MAT(in,0,0) == 0 || MAT(in,1,1) == 0)
return GL_FALSE; return GL_FALSE;
memcpy( out, Identity, sizeof(Identity) ); matrix_set_identity(out);
MAT(out,0,0) = 1.0F / MAT(in,0,0); MAT(out,0,0) = 1.0F / MAT(in,0,0);
MAT(out,1,1) = 1.0F / MAT(in,1,1); MAT(out,1,1) = 1.0F / MAT(in,1,1);
@@ -566,7 +564,7 @@ static GLboolean matrix_invert( GLmatrix *mat )
return GL_TRUE; return GL_TRUE;
} else { } else {
mat->flags |= MAT_FLAG_SINGULAR; mat->flags |= MAT_FLAG_SINGULAR;
memcpy( mat->inv, Identity, sizeof(Identity) ); matrix_set_identity(mat->inv);
return GL_FALSE; return GL_FALSE;
} }
} }
@@ -597,7 +595,7 @@ _math_matrix_rotate( GLmatrix *mat,
s = sinf( angle * M_PI / 180.0 ); s = sinf( angle * M_PI / 180.0 );
c = cosf( angle * M_PI / 180.0 ); c = cosf( angle * M_PI / 180.0 );
memcpy(m, Identity, sizeof(Identity)); matrix_set_identity(m);
optimized = GL_FALSE; optimized = GL_FALSE;
#define M(row,col) m[col*4+row] #define M(row,col) m[col*4+row]
@@ -953,8 +951,8 @@ _math_matrix_viewport(GLmatrix *m, const float scale[3],
void void
_math_matrix_set_identity( GLmatrix *mat ) _math_matrix_set_identity( GLmatrix *mat )
{ {
memcpy( mat->m, Identity, sizeof(Identity) ); matrix_set_identity(mat->m);
memcpy( mat->inv, Identity, sizeof(Identity) ); matrix_set_identity(mat->inv);
mat->type = MATRIX_IDENTITY; mat->type = MATRIX_IDENTITY;
mat->flags &= ~(MAT_DIRTY_FLAGS| mat->flags &= ~(MAT_DIRTY_FLAGS|
@@ -1282,8 +1280,8 @@ void
_math_matrix_ctr( GLmatrix *m ) _math_matrix_ctr( GLmatrix *m )
{ {
memset(m, 0, sizeof(*m)); memset(m, 0, sizeof(*m));
memcpy( m->m, Identity, sizeof(Identity) ); matrix_set_identity(m->m);
memcpy( m->inv, Identity, sizeof(Identity) ); matrix_set_identity(m->inv);
m->type = MATRIX_IDENTITY; m->type = MATRIX_IDENTITY;
m->flags = 0; m->flags = 0;
} }