summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2009-04-07 13:28:10 -0600
committerBrian Paul <[email protected]>2009-04-07 13:44:13 -0600
commit228f20e324249ef25beed725a6a821e0bd0cc232 (patch)
tree107026ce05189b4190d5d4d8e632b570597e7caf
parentd03053688f7370064ded6dfc4912841eae39a4a9 (diff)
swrast: fix point rendering function selection
Need to clamp default point size to min/max range before checking if it's one. Fixes glean pointAtten test.
-rw-r--r--src/mesa/swrast/s_points.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/swrast/s_points.c b/src/mesa/swrast/s_points.c
index 61ff4d0b84c..0a3ad97a71b 100644
--- a/src/mesa/swrast/s_points.c
+++ b/src/mesa/swrast/s_points.c
@@ -570,6 +570,9 @@ void
_swrast_choose_point(GLcontext *ctx)
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
+ const GLfloat size = CLAMP(ctx->Point.Size,
+ ctx->Point.MinSize,
+ ctx->Point.MaxSize);
if (ctx->RenderMode == GL_RENDER) {
if (ctx->Point.PointSprite) {
@@ -578,7 +581,7 @@ _swrast_choose_point(GLcontext *ctx)
else if (ctx->Point.SmoothFlag) {
swrast->Point = smooth_point;
}
- else if (ctx->Point.Size > 1.0 ||
+ else if (size > 1.0 ||
ctx->Point._Attenuated ||
ctx->VertexProgram.PointSizeEnabled) {
swrast->Point = large_point;