From fae3a31bbbefb2ac795ba0d5df613343a5a9e119 Mon Sep 17 00:00:00 2001 From: Yuanhan Liu Date: Thu, 23 Feb 2012 14:19:18 +0800 Subject: [PATCH] tnl: let _TNL_ATTRIB_POINTSIZE do not depend on ctx->VertexProgram._Enabled We may specify the point size in a glsl vertex shader. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=46311 piglit: glsl-vs-point-size NOTE: This is a candidate for stable release branches. Signed-off-by: Yuanhan Liu Reviewed-by: Brian Paul (cherry picked from commit 9962280c332aba4b945b73ae19862041a7053a71) --- src/mesa/tnl/t_context.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c index 1ded44ccffb..e38c0a34c74 100644 --- a/src/mesa/tnl/t_context.c +++ b/src/mesa/tnl/t_context.c @@ -151,8 +151,7 @@ _tnl_InvalidateState( struct gl_context *ctx, GLuint new_state ) if (ctx->RenderMode == GL_FEEDBACK) tnl->render_inputs_bitset |= BITFIELD64_BIT(_TNL_ATTRIB_TEX0); - if (ctx->Point._Attenuated || - (ctx->VertexProgram._Enabled && ctx->VertexProgram.PointSizeEnabled)) + if (ctx->Point._Attenuated || ctx->VertexProgram.PointSizeEnabled) tnl->render_inputs_bitset |= BITFIELD64_BIT(_TNL_ATTRIB_POINTSIZE); /* check for varying vars which are written by the vertex program */