summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-02-06 13:44:55 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-02-06 13:44:55 +0000
commit7d0522e16a73dcd356526fa37ead82ad4ad02c31 (patch)
treed559ccfa1a40fd5368f53a8d67ee53362c2c643e /src
parent66dce0875ee6ed61fcfca56f23b367e75f1c9584 (diff)
replace | with & (Laurent Desnogues)
Diffstat (limited to 'src')
-rw-r--r--src/mesa/swrast/s_texture.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/swrast/s_texture.c b/src/mesa/swrast/s_texture.c
index 190c701b2c..00d0f3f5d2 100644
--- a/src/mesa/swrast/s_texture.c
+++ b/src/mesa/swrast/s_texture.c
@@ -1,10 +1,10 @@
-/* $Id: s_texture.c,v 1.78 2003/01/26 14:37:16 brianp Exp $ */
+/* $Id: s_texture.c,v 1.79 2003/02/06 13:44:55 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 5.0
+ * Version: 5.1
*
- * Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2003 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -4148,7 +4148,7 @@ _swrast_texture_span( GLcontext *ctx, struct sw_span *span )
(swrast->TexelBuffer + unit * (span->end * 4 * sizeof(GLchan)));
/* adjust texture lod (lambda) */
- if (span->arrayMask | SPAN_LAMBDA) {
+ if (span->arrayMask & SPAN_LAMBDA) {
if (texUnit->LodBias != 0.0F) {
/* apply LOD bias, but don't clamp yet */
GLuint i;