summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-02-06 13:47:32 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-02-06 13:47:32 +0000
commit69a4ff186a415b68e8d5c7763199aa000ca1d776 (patch)
tree6bb1891c488a630d50698cff70489bc1e93074b7 /src
parentd16d5fb06a770eeb7ec1ff8e57ea59657a0d070a (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 60091e3743e..6cf42d3dcbc 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.75 2002/11/12 19:27:24 brianp Exp $ */
+/* $Id: s_texture.c,v 1.75.2.1 2003/02/06 13:47:32 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 5.0
+ * Version: 5.0.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"),
@@ -3680,7 +3680,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;