Mesa (8.0): tnl: let _TNL_ATTRIB_POINTSIZE do not depend on ctx-> VertexProgram._Enabled

[Yuanhan Liu]

Module: Mesa
Branch: 8.0
Commit: fae3a31bbbefb2ac795ba0d5df613343a5a9e119
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fae3a31bbbefb2ac795ba0d5df613343a5a9e119

Author: Yuanhan Liu <yuanhan.liu at linux.intel.com>
Date:   Thu Feb 23 14:19:18 2012 +0800

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 <yuanhan.liu at linux.intel.com>
Reviewed-by: Brian Paul <brianp at vmware.com>
(cherry picked from commit 9962280c332aba4b945b73ae19862041a7053a71)

---

 src/mesa/tnl/t_context.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c
index 1ded44c..e38c0a3 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 */