diff options
| author | Alan Hourihane <alanh@tungstengraphics.com> | 2004-04-26 10:10:22 +0000 |
|---|---|---|
| committer | Alan Hourihane <alanh@tungstengraphics.com> | 2004-04-26 10:10:22 +0000 |
| commit | 462183fe4cb6df6d90632d9e2cee881c8d26b1cb (patch) | |
| tree | 0fb5d1c17d80026bec0fe3c2e0449fe30ea9e69e /src/mesa/main | |
| parent | 08fa6de85035c428d77cb88b11a4638b706794b5 (diff) | |
bring over build fixes from stable branch
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/imports.h | 7 | ||||
| -rw-r--r-- | src/mesa/main/texstore.c | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h index f26907eeb7..d4df749f50 100644 --- a/src/mesa/main/imports.h +++ b/src/mesa/main/imports.h @@ -223,9 +223,10 @@ extern void _ext_mesa_free_pixelbuffer( void *pb ); *** USE_IEEE: Determine if we're using IEEE floating point ***/ #if defined(__i386__) || defined(__386__) || defined(__sparc__) || \ - defined(__s390x__) || defined(__powerpc__) || defined(__AMD64__) || \ - defined(__ia64__) || \ - ( defined(__alpha__) && ( defined(__IEEE_FLOAT) || !defined(VMS) ) ) + defined(__s390x__) || defined(__powerpc__) || \ + defined(__AMD64__) || defined(__amd64__) || \ + defined(ia64) || defined(__ia64__) || \ + (defined(__alpha__) && (defined(__IEEE_FLOAT) || !defined(VMS))) #define USE_IEEE #define IEEE_ONE 0x3f800000 #endif diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index cd23f3c77d..ef81dd654a 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -3553,9 +3553,7 @@ make_2d_mipmap(const struct gl_texture_format *format, GLint border, const GLint dstRowStride = bpt * dstWidth; const GLubyte *srcA, *srcB; GLubyte *dst; - GLint row, colStride; - - colStride = (srcWidth == dstWidth) ? 1 : 2; + GLint row; /* Compute src and dst pointers, skipping any border */ srcA = srcPtr + border * ((srcWidth + 1) * bpt); |