fix Intel C compiler warnings (Gerk Huisma)
This commit is contained in:
parent
f7c830e35c
commit
d0570646bd
|
@ -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);
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $Id: s_linetemp.h,v 1.12 2002/02/02 21:40:33 brianp Exp $ */
|
||||
/* $Id: s_linetemp.h,v 1.13 2002/03/19 15:22:50 brianp Exp $ */
|
||||
|
||||
/*
|
||||
* Mesa 3-D graphics library
|
||||
|
@ -271,7 +271,7 @@
|
|||
ystep = -1;
|
||||
#endif
|
||||
#if defined(INTERP_Z) && defined(DEPTH_TYPE)
|
||||
zPtrYstep = -ctx->DrawBuffer->Width * ((GLint)sizeof(DEPTH_TYPE));
|
||||
zPtrYstep = -((GLint) (ctx->DrawBuffer->Width * sizeof(DEPTH_TYPE)));
|
||||
#endif
|
||||
#ifdef PIXEL_ADDRESS
|
||||
pixelYstep = BYTES_PER_ROW;
|
||||
|
@ -282,7 +282,7 @@
|
|||
ystep = 1;
|
||||
#endif
|
||||
#if defined(INTERP_Z) && defined(DEPTH_TYPE)
|
||||
zPtrYstep = ctx->DrawBuffer->Width * ((GLint)sizeof(DEPTH_TYPE));
|
||||
zPtrYstep = (GLint) (ctx->DrawBuffer->Width * sizeof(DEPTH_TYPE));
|
||||
#endif
|
||||
#ifdef PIXEL_ADDRESS
|
||||
pixelYstep = -(BYTES_PER_ROW);
|
||||
|
|
Loading…
Reference in New Issue