summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/sis
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-11-09 16:30:50 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-11-09 16:30:50 +0000
commita8717180d9805de3bf1ca30eff5487575fcfb384 (patch)
tree2d05b0de5082c397acd208587c7c766df05ef557 /src/mesa/drivers/dri/sis
parentcfca72cfb19367d824a3254b40566b3fc01723ea (diff)
Bug 4996.
Replace use of FLOAT_TO_USHORT with either CLAMPED_FLOAT_TO_USHORT or UNCLAMPED_FLOAT_TO_USHORT. Same should be done for UBYTE, UINT, etc.
Diffstat (limited to 'src/mesa/drivers/dri/sis')
-rw-r--r--src/mesa/drivers/dri/sis/sis6326_clear.c2
-rw-r--r--src/mesa/drivers/dri/sis/sis_clear.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/sis/sis6326_clear.c b/src/mesa/drivers/dri/sis/sis6326_clear.c
index 29b95f94d9..be5addb7cf 100644
--- a/src/mesa/drivers/dri/sis/sis6326_clear.c
+++ b/src/mesa/drivers/dri/sis/sis6326_clear.c
@@ -65,7 +65,7 @@ set_color_pattern( sisContextPtr smesa, GLubyte red, GLubyte green,
void
sis6326UpdateZPattern(sisContextPtr smesa, GLclampd z)
{
- smesa->clearZStencilPattern = FLOAT_TO_USHORT(z * 65535.0);
+ CLAMPED_FLOAT_TO_USHORT(smesa->clearZStencilPattern, z * 65535.0);
}
void
diff --git a/src/mesa/drivers/dri/sis/sis_clear.c b/src/mesa/drivers/dri/sis/sis_clear.c
index f24454641d..d7807b157e 100644
--- a/src/mesa/drivers/dri/sis/sis_clear.c
+++ b/src/mesa/drivers/dri/sis/sis_clear.c
@@ -78,7 +78,7 @@ sisUpdateZStencilPattern( sisContextPtr smesa, GLclampd z, GLint stencil )
switch (smesa->zFormat)
{
case SiS_ZFORMAT_Z16:
- zPattern = FLOAT_TO_USHORT(z);
+ CLAMPED_FLOAT_TO_USHORT(zPattern, z);
zPattern |= zPattern << 16;
break;
case SiS_ZFORMAT_S8Z24: