From: Plamena Manolova <plamena.manolova@intel.com>
Date: Tue, 15 Mar 2016 18:39:49 +0000 (+0200)
Subject: mesa: Ignore glPointSize when GL_POINT_SIZE_ARRAY_OES is enabled
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9d9965c06f18f7d609933e511b98514570e85909;p=mesa.git

mesa: Ignore glPointSize when GL_POINT_SIZE_ARRAY_OES is enabled

When a user defines a point size array and enables it, the point
size value set via glPointSize should be ignored. To achieve this,
we can simply toggle ctx->VertexProgram.PointSizeEnabled.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=42187
Signed-off-by: Plamena Manolova <plamena.manolova@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 3985457f21a..b90a60ba03f 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -105,6 +105,8 @@ client_state(struct gl_context *ctx, GLenum cap, GLboolean state)
       case GL_POINT_SIZE_ARRAY_OES:
          var = &vao->VertexAttrib[VERT_ATTRIB_POINT_SIZE].Enabled;
          flag = VERT_BIT_POINT_SIZE;
+         FLUSH_VERTICES(ctx, _NEW_PROGRAM);
+         ctx->VertexProgram.PointSizeEnabled = state;
          break;
 
       /* GL_NV_primitive_restart */