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

mesa: add a fast path for restoring light attributes in glPopAttrib

Browse source 
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6946>
This commit is contained in:
Marek Olšák 2020-10-03 03:58:01 -04:00 • committed by Marge Bot
parent 734af61353
commit 7fa9d9d06c
1 changed files with 55 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
src/mesa/main/attrib.c
View file

@ -879,50 +879,63 @@ _mesa_PopAttrib(void)
if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top)) if (_math_matrix_is_dirty(ctx->ModelviewMatrixStack.Top))
_math_matrix_analyse(ctx->ModelviewMatrixStack.Top); _math_matrix_analyse(ctx->ModelviewMatrixStack.Top);
for (i = 0; i < ctx->Const.MaxLights; i++) { if (ctx->Driver.Lightfv) {
const struct gl_light_uniforms *lu = &attr->Light.LightSource[i]; /* Legacy slow path for some classic drivers. */
const struct gl_light *l = &attr->Light.Light[i]; for (i = 0; i < ctx->Const.MaxLights; i++) {
_mesa_set_enable(ctx, GL_LIGHT0 + i, l->Enabled); const struct gl_light_uniforms *lu = &attr->Light.LightSource[i];
_mesa_light(ctx, i, GL_AMBIENT, lu->Ambient); const struct gl_light *l = &attr->Light.Light[i];
_mesa_light(ctx, i, GL_DIFFUSE, lu->Diffuse); _mesa_set_enable(ctx, GL_LIGHT0 + i, l->Enabled);
_mesa_light(ctx, i, GL_SPECULAR, lu->Specular); _mesa_light(ctx, i, GL_AMBIENT, lu->Ambient);
_mesa_light(ctx, i, GL_POSITION, lu->EyePosition); _mesa_light(ctx, i, GL_DIFFUSE, lu->Diffuse);
_mesa_light(ctx, i, GL_SPOT_DIRECTION, lu->SpotDirection); _mesa_light(ctx, i, GL_SPECULAR, lu->Specular);
{ _mesa_light(ctx, i, GL_POSITION, lu->EyePosition);
GLfloat p[4] = { 0 }; _mesa_light(ctx, i, GL_SPOT_DIRECTION, lu->SpotDirection);
p[0] = lu->SpotExponent; {
_mesa_light(ctx, i, GL_SPOT_EXPONENT, p); GLfloat p[4] = { 0 };
} p[0] = lu->SpotExponent;
{ _mesa_light(ctx, i, GL_SPOT_EXPONENT, p);
GLfloat p[4] = { 0 }; }
p[0] = lu->SpotCutoff; {
_mesa_light(ctx, i, GL_SPOT_CUTOFF, p); GLfloat p[4] = { 0 };
} p[0] = lu->SpotCutoff;
{ _mesa_light(ctx, i, GL_SPOT_CUTOFF, p);
GLfloat p[4] = { 0 }; }
p[0] = lu->ConstantAttenuation; {
_mesa_light(ctx, i, GL_CONSTANT_ATTENUATION, p); GLfloat p[4] = { 0 };
} p[0] = lu->ConstantAttenuation;
{ _mesa_light(ctx, i, GL_CONSTANT_ATTENUATION, p);
GLfloat p[4] = { 0 }; }
p[0] = lu->LinearAttenuation; {
_mesa_light(ctx, i, GL_LINEAR_ATTENUATION, p); GLfloat p[4] = { 0 };
} p[0] = lu->LinearAttenuation;
{ _mesa_light(ctx, i, GL_LINEAR_ATTENUATION, p);
GLfloat p[4] = { 0 }; }
p[0] = lu->QuadraticAttenuation; {
_mesa_light(ctx, i, GL_QUADRATIC_ATTENUATION, p); GLfloat p[4] = { 0 };
p[0] = lu->QuadraticAttenuation;
_mesa_light(ctx, i, GL_QUADRATIC_ATTENUATION, p);
}
} }
/* light model */
_mesa_LightModelfv(GL_LIGHT_MODEL_AMBIENT,
attr->Light.Model.Ambient);
_mesa_LightModelf(GL_LIGHT_MODEL_LOCAL_VIEWER,
(GLfloat) attr->Light.Model.LocalViewer);
_mesa_LightModelf(GL_LIGHT_MODEL_TWO_SIDE,
(GLfloat) attr->Light.Model.TwoSide);
_mesa_LightModelf(GL_LIGHT_MODEL_COLOR_CONTROL,
(GLfloat) attr->Light.Model.ColorControl);
} else {
/* Fast path for other drivers. */
FLUSH_VERTICES(ctx, _NEW_LIGHT);
memcpy(ctx->Light.LightSource, attr->Light.LightSource,
sizeof(attr->Light.LightSource));
memcpy(&ctx->Light.Light, &attr->Light.Light,
sizeof(attr->Light.Light));
memcpy(&ctx->Light.Model, &attr->Light.Model,
sizeof(attr->Light.Model));
} }
/* light model */
_mesa_LightModelfv(GL_LIGHT_MODEL_AMBIENT,
attr->Light.Model.Ambient);
_mesa_LightModelf(GL_LIGHT_MODEL_LOCAL_VIEWER,
(GLfloat) attr->Light.Model.LocalViewer);
_mesa_LightModelf(GL_LIGHT_MODEL_TWO_SIDE,
(GLfloat) attr->Light.Model.TwoSide);
_mesa_LightModelf(GL_LIGHT_MODEL_COLOR_CONTROL,
(GLfloat) attr->Light.Model.ColorControl);
/* shade model */ /* shade model */
_mesa_ShadeModel(attr->Light.ShadeModel); _mesa_ShadeModel(attr->Light.ShadeModel);
/* color material */ /* color material */