Merge branch 'register-negate'

[mesa.git] / src / mesa / main / convolve.h

diff --git a/src/mesa/main/convolve.h b/src/mesa/main/convolve.h
index 7d8acc3d58a61212ada083b62f5adca2b106e8ba..4505cdae01ec40c1b4d4e4d7ae97822db36f3f0e 100644 (file)
--- a/src/mesa/main/convolve.h
+++ b/src/mesa/main/convolve.h
@@ -1,10 +1,9 @@
-/* $Id: convolve.h,v 1.3 2000/11/22 07:32:16 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.5
  *
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2001  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"),
@@ -32,51 +31,52 @@
 #include "mtypes.h"
 
 
-extern void
+#if _HAVE_FULL_GL
+extern void GLAPIENTRY
 _mesa_ConvolutionFilter1D(GLenum target, GLenum internalformat, GLsizei width,
                           GLenum format, GLenum type, const GLvoid *image);
 
-extern void
+extern void GLAPIENTRY
 _mesa_ConvolutionFilter2D(GLenum target, GLenum internalformat, GLsizei width,
                           GLsizei height, GLenum format, GLenum type,
                           const GLvoid *image);
 
-extern void
+extern void GLAPIENTRY
 _mesa_ConvolutionParameterf(GLenum target, GLenum pname, GLfloat params);
 
-extern void
+extern void GLAPIENTRY
 _mesa_ConvolutionParameterfv(GLenum target, GLenum pname,
                              const GLfloat *params);
 
-extern void
+extern void GLAPIENTRY
 _mesa_ConvolutionParameteri(GLenum target, GLenum pname, GLint params);
 
-extern void
+extern void GLAPIENTRY
 _mesa_ConvolutionParameteriv(GLenum target, GLenum pname, const GLint *params);
 
-extern void
+extern void GLAPIENTRY
 _mesa_CopyConvolutionFilter1D(GLenum target, GLenum internalformat,
                               GLint x, GLint y, GLsizei width);
 
-extern void
+extern void GLAPIENTRY
 _mesa_CopyConvolutionFilter2D(GLenum target, GLenum internalformat,
                               GLint x, GLint y, GLsizei width, GLsizei height);
 
-extern void
+extern void GLAPIENTRY
 _mesa_GetConvolutionFilter(GLenum target, GLenum format, GLenum type,
                            GLvoid *image);
 
-extern void
+extern void GLAPIENTRY
 _mesa_GetConvolutionParameterfv(GLenum target, GLenum pname, GLfloat *params);
 
-extern void
+extern void GLAPIENTRY
 _mesa_GetConvolutionParameteriv(GLenum target, GLenum pname, GLint *params);
 
-extern void
+extern void GLAPIENTRY
 _mesa_GetSeparableFilter(GLenum target, GLenum format, GLenum type,
                          GLvoid *row, GLvoid *column, GLvoid *span);
 
-extern void
+extern void GLAPIENTRY
 _mesa_SeparableFilter2D(GLenum target, GLenum internalformat,
                         GLsizei width, GLsizei height,
                         GLenum format, GLenum type,
@@ -100,4 +100,15 @@ _mesa_convolve_sep_image(const GLcontext *ctx,
                          const GLfloat *srcImage, GLfloat *dstImage);
 
 
+extern void
+_mesa_adjust_image_for_convolution(const GLcontext *ctx, GLuint dimensions,
+                                   GLsizei *width, GLsizei *height);
+
+#else
+#define _mesa_adjust_image_for_convolution(c, d, w, h) ((void)0)
+#define _mesa_convolve_1d_image(c,w,s,d) ((void)0)
+#define _mesa_convolve_2d_image(c,w,h,s,d) ((void)0)
+#define _mesa_convolve_sep_image(c,w,h,s,d) ((void)0)
+#endif
+
 #endif