Mesa (master): dri/nouveau: Avoid mask overflow on nv04_surface_fill.

Francisco Jerez currojerez at kemper.freedesktop.org
Thu Feb 25 18:33:38 UTC 2010


Module: Mesa
Branch: master
Commit: 1e4c0618a8e5f251b68e98af498a2a8ff787cc61
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1e4c0618a8e5f251b68e98af498a2a8ff787cc61

Author: Francisco Jerez <currojerez at riseup.net>
Date:   Sun Feb 21 14:35:56 2010 +0100

dri/nouveau: Avoid mask overflow on nv04_surface_fill.

---

 src/mesa/drivers/dri/nouveau/nv04_surface.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/nouveau/nv04_surface.c b/src/mesa/drivers/dri/nouveau/nv04_surface.c
index 86fa1dc..a219779 100644
--- a/src/mesa/drivers/dri/nouveau/nv04_surface.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_surface.c
@@ -369,7 +369,7 @@ nv04_surface_fill(GLcontext *ctx,
 	BEGIN_RING(chan, patt, NV04_IMAGE_PATTERN_COLOR_FORMAT, 1);
 	OUT_RING  (chan, rect_format(dst->format));
 	BEGIN_RING(chan, patt, NV04_IMAGE_PATTERN_MONOCHROME_COLOR1, 1);
-	OUT_RING  (chan, mask | ~0 << (8 * dst->cpp));
+	OUT_RING  (chan, mask | ~0ll << (8 * dst->cpp));
 
 	BEGIN_RING(chan, rect, NV04_GDI_RECTANGLE_TEXT_COLOR_FORMAT, 1);
 	OUT_RING  (chan, rect_format(dst->format));




More information about the mesa-commit mailing list