fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 22:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: minor clean-ups in dlist material code

Browse source
This commit is contained in:
Brian Paul 2012-05-08 09:12:35 -06:00
parent b13ecbadea
commit 2428de1c50
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/mesa/main/dlist.c
View file

@ -5676,14 +5676,22 @@ save_EdgeFlag(GLboolean x)
save_Attr1fNV(VERT_ATTRIB_EDGEFLAG, x ? (GLfloat)1.0 : (GLfloat)0.0);
}
static inline GLboolean compare4fv( const GLfloat *a,
const GLfloat *b,
GLuint count )
/**
* Compare 'count' elements of vectors 'a' and 'b'.
* \return GL_TRUE if equal, GL_FALSE if different.
*/
static inline GLboolean
compare_vec(const GLfloat *a, const GLfloat *b, GLuint count)
{
return memcmp( a, b, count * sizeof(GLfloat) ) == 0;
}
/**
* This glMaterial function is used for glMaterial calls that are outside
* a glBegin/End pair. For glMaterial inside glBegin/End, see the VBO code.
*/
static void GLAPIENTRY
save_Materialfv(GLenum face, GLenum pname, const GLfloat * param)
{
@ -5734,7 +5742,8 @@ save_Materialfv(GLenum face, GLenum pname, const GLfloat * param)
for (i = 0; i < MAT_ATTRIB_MAX; i++) {
if (bitmask & (1 << i)) {
if (ctx->ListState.ActiveMaterialSize[i] == args &&
compare4fv(ctx->ListState.CurrentMaterial[i], param, args)) {
compare_vec(ctx->ListState.CurrentMaterial[i], param, args)) {
/* no change in material value */
bitmask &= ~(1 << i);
}
else {
@ -5744,8 +5753,7 @@ save_Materialfv(GLenum face, GLenum pname, const GLfloat * param)
}
}
/* If this call has effect, return early:
*/
/* If this call has no effect, return early */
if (bitmask == 0)
return;