summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaciej Cencora <[email protected]>2009-04-25 13:48:53 +0200
committerAlex Deucher <[email protected]>2009-04-27 14:33:23 -0400
commit78c0e6aefcef442f035494b6fc9f6b599fe75e7e (patch)
tree4ab22d55944c05ee2f0762e1cb01982860c6d78b
parent033d1365e6fa6e57bc11b47831af0cb4b7ad2edf (diff)
r300: fix point size clamping when point is not attenuated
-rw-r--r--src/mesa/drivers/dri/r300/r300_state.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 9c8b8adbe3b..99441a22fd6 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -728,7 +728,12 @@ static void r300ColorMask(GLcontext * ctx,
static void r300PointSize(GLcontext * ctx, GLfloat size)
{
r300ContextPtr r300 = R300_CONTEXT(ctx);
- /* same size limits for AA, non-AA points */
+
+ /* We need to clamp to user defined range here, because
+ * the HW clamping happens only for per vertex point size. */
+ size = CLAMP(size, ctx->Point.MinSize, ctx->Point.MaxSize);
+
+ /* same size limits for AA, non-AA points */
size = CLAMP(size, ctx->Const.MinPointSize, ctx->Const.MaxPointSize);
R300_STATECHANGE(r300, ps);