KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: rename PointSizeIsOne -> PointSizeIsSet 

this will better convey the meaning of the value

Acked-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17145>
This commit is contained in:
Mike Blumenkrantz 2022-06-20 14:36:21 -04:00 committed by Marge Bot
parent b2155a044d
commit de732cf61b
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/main/context.c
View File

@ -1077,7 +1077,7 @@ _mesa_initialize_context(struct gl_context *ctx,
break;
}
ctx->VertexProgram.PointSizeEnabled = ctx->API == API_OPENGLES2;
ctx->PointSizeIsOne = GL_TRUE;
ctx->PointSizeIsSet = GL_TRUE;
ctx->FirstTimeCurrent = GL_TRUE;

2
src/mesa/main/mtypes.h
View File

@ -3569,7 +3569,7 @@ struct gl_context
GLuint TextureStateTimestamp; /**< detect changes to shared state */
GLboolean LastVertexStageDirty; /**< the last vertex stage has changed */
GLboolean PointSizeIsOne; /**< the glPointSize value is 1.0 */
GLboolean PointSizeIsSet; /**< the glPointSize value in the shader is set */
/** \name For debugging/development only */
/*@{*/

6
src/mesa/main/points.c
View File

@ -37,9 +37,9 @@
static void
is_point_size_one(struct gl_context *ctx)
update_point_size_set(struct gl_context *ctx)
{
ctx->PointSizeIsOne = ctx->Point.Size == 1.0;
ctx->PointSizeIsSet = ctx->Point.Size == 1.0;
}
/**
@ -60,7 +60,7 @@ point_size(struct gl_context *ctx, GLfloat size, bool no_error)
FLUSH_VERTICES(ctx, _NEW_POINT, GL_POINT_BIT);
ctx->Point.Size = size;
is_point_size_one(ctx);
update_point_size_set(ctx);
}

2
src/mesa/state_tracker/st_atom.c
View File

@ -149,7 +149,7 @@ static void check_program_state( struct st_context *st )
}
if (st->lower_point_size && st->ctx->LastVertexStageDirty &&
!st->ctx->VertexProgram.PointSizeEnabled && !st->ctx->PointSizeIsOne) {
!st->ctx->VertexProgram.PointSizeEnabled && !st->ctx->PointSizeIsSet) {
if (new_gp) {
st->dirty |= ST_NEW_GS_CONSTANTS;
} else if (new_tep) {

4
src/mesa/state_tracker/st_atom_shader.c
View File

@ -236,7 +236,7 @@ st_update_vp( struct st_context *st )
!st->ctx->TessEvalProgram._Current) {
/* _NEW_POINT */
if (st->lower_point_size)
key.export_point_size = !st->ctx->VertexProgram.PointSizeEnabled && !st->ctx->PointSizeIsOne;
key.export_point_size = !st->ctx->VertexProgram.PointSizeEnabled && !st->ctx->PointSizeIsSet;
/* _NEW_TRANSFORM */
if (st->lower_ucp && st_user_clip_planes_enabled(st->ctx))
key.lower_ucp = st->ctx->Transform.ClipPlanesEnabled;
@ -293,7 +293,7 @@ st_update_common_program(struct st_context *st, struct gl_program *prog,
key.lower_ucp = st->ctx->Transform.ClipPlanesEnabled;
if (st->lower_point_size)
key.export_point_size = !st->ctx->VertexProgram.PointSizeEnabled && !st->ctx->PointSizeIsOne;
key.export_point_size = !st->ctx->VertexProgram.PointSizeEnabled && !st->ctx->PointSizeIsSet;
}
update_gl_clamp(st, prog, key.gl_clamp);