diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2002-03-19 15:22:50 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2002-03-19 15:22:50 +0000 |
| commit | d0570646bd67eae8152b63ccaf5c73970b1f56ea (patch) | |
| tree | 56c9eef627a5083063a99103e9735f60b83a27f6 /src/mesa/main/convolve.c | |
| parent | f7c830e35ca243c391bde1bfd0ae059c292ac649 (diff) | |
fix Intel C compiler warnings (Gerk Huisma)
Diffstat (limited to 'src/mesa/main/convolve.c')
| -rw-r--r-- | src/mesa/main/convolve.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c index 1ec5993572..cf88bbcb7d 100644 --- a/src/mesa/main/convolve.c +++ b/src/mesa/main/convolve.c @@ -1,10 +1,10 @@ -/* $Id: convolve.c,v 1.25 2001/09/19 20:30:44 kschultz Exp $ */ +/* $Id: convolve.c,v 1.26 2002/03/19 15:22:50 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.5 + * Version: 4.0.2 * - * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2002 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"), @@ -110,7 +110,7 @@ base_filter_format( GLenum format ) void _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *image) { - GLenum baseFormat; + GLint baseFormat; GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); @@ -183,7 +183,7 @@ _mesa_ConvolutionFilter1D(GLenum target, GLenum internalFormat, GLsizei width, G void _mesa_ConvolutionFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image) { - GLenum baseFormat; + GLint baseFormat; GLint i, components; GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); @@ -477,7 +477,7 @@ _mesa_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params) void _mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width) { - GLenum baseFormat; + GLint baseFormat; GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); @@ -505,7 +505,7 @@ _mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalFormat, GLint x, GLi void _mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height) { - GLenum baseFormat; + GLint baseFormat; GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); @@ -778,7 +778,7 @@ void _mesa_SeparableFilter2D(GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column) { const GLint colStart = MAX_CONVOLUTION_WIDTH * 4; - GLenum baseFormat; + GLint baseFormat; GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx); |