From 92a204b493b447b1cbb06a3d2d350a1e6d2c6887 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 20 Feb 2013 12:58:47 -0800 Subject: [PATCH] mesa: Fix setup of ctx->Point.PointSprite for GLES2. The recent change for GL core broke the older setup, which broke gl_PointCoord on pre-gen6 (where gl_PointCoord is undefined if point sprites are disabled). Fixes the new piglit GLES-2.0/glsl-fs-pointcoord test. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32429 Note: This is a candidate for the stable branches. Reviewed-by: Kenneth Graunke --- src/mesa/main/context.c | 1 - src/mesa/main/points.c | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index e5ed97f..02acfc2 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1073,7 +1073,6 @@ _mesa_initialize_context(struct gl_context *ctx, case API_OPENGLES2: ctx->FragmentProgram._MaintainTexEnvProgram = GL_TRUE; ctx->VertexProgram._MaintainTnlProgram = GL_TRUE; - ctx->Point.PointSprite = GL_TRUE; /* always on for ES 2.x */ break; } diff --git a/src/mesa/main/points.c b/src/mesa/main/points.c index 1778640..c925d4c 100644 --- a/src/mesa/main/points.c +++ b/src/mesa/main/points.c @@ -253,7 +253,8 @@ _mesa_init_point(struct gl_context *ctx) * In a core context, the state will default to true, and the setters and * getters are disabled. */ - ctx->Point.PointSprite = (ctx->API == API_OPENGL_CORE); + ctx->Point.PointSprite = (ctx->API == API_OPENGL_CORE || + ctx->API == API_OPENGLES2); ctx->Point.SpriteRMode = GL_ZERO; /* GL_NV_point_sprite (only!) */ ctx->Point.SpriteOrigin = GL_UPPER_LEFT; /* GL_ARB_point_sprite */ -- 2.7.4