Merge vtx-0-2-branch

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

diff --git a/src/mesa/main/histogram.h b/src/mesa/main/histogram.h
index 99683d1244bc04a8888d437ffd99e470010cdf6d..67ddce01cfc857f154d412d62c564c26755bc93c 100644 (file)
--- a/src/mesa/main/histogram.h
+++ b/src/mesa/main/histogram.h
@@ -1,10 +1,18 @@
-/* $Id: histogram.h,v 1.1 2000/11/10 18:06:14 brianp Exp $ */
+/**
+ * \file histogram.h
+ * Histogram.
+ * 
+ * \if subset
+ * (No-op)
+ *
+ * \endif
+ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  5.1
  *
- * Copyright (C) 1999-2000  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"),
@@ -28,35 +36,47 @@
 #ifndef HISTOGRAM_H
 #define HISTOGRAM_H
 
-
-#ifdef PC_HEADER
-#include "all.h"
-#else
 #include "glheader.h"
-#include "types.h"
-#endif
+#include "mtypes.h"
+
+#if _HAVE_FULL_GL
+
+extern void
+_mesa_update_minmax(GLcontext *ctx, GLuint n, const GLfloat rgba[][4]);
 
+extern void
+_mesa_update_histogram(GLcontext *ctx, GLuint n, const GLfloat rgba[][4]);
 
 
-extern void _mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values);
+extern void GLAPIENTRY 
+_mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values);
 
-extern void _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
+extern void GLAPIENTRY 
+_mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
 
-extern void _mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params);
+extern void GLAPIENTRY 
+_mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params);
 
-extern void _mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params);
+extern void GLAPIENTRY 
+_mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params);
 
-extern void _mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params);
+extern void GLAPIENTRY 
+_mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params);
 
-extern void _mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params);
+extern void GLAPIENTRY 
+_mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params);
 
-extern void _mesa_Histogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
+extern void GLAPIENTRY 
+_mesa_Histogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
 
-extern void _mesa_Minmax(GLenum target, GLenum internalformat, GLboolean sink);
+extern void GLAPIENTRY 
+_mesa_Minmax(GLenum target, GLenum internalformat, GLboolean sink);
 
-extern void _mesa_ResetHistogram(GLenum target);
+extern void GLAPIENTRY 
+_mesa_ResetHistogram(GLenum target);
 
-extern void _mesa_ResetMinmax(GLenum target);
+extern void GLAPIENTRY 
+_mesa_ResetMinmax(GLenum target);
 
 extern void
 _mesa_update_minmax(GLcontext *ctx, GLuint n, const GLfloat rgba[][4]);
@@ -64,5 +84,13 @@ _mesa_update_minmax(GLcontext *ctx, GLuint n, const GLfloat rgba[][4]);
 extern void
 _mesa_update_histogram(GLcontext *ctx, GLuint n, const GLfloat rgba[][4]);
 
+extern void _mesa_init_histogram( GLcontext * ctx );
+
+#else
+
+/** No-op */
+#define _mesa_init_histogram( c ) ((void) 0)
+
+#endif
 
 #endif