r600g: pad the DMA CS to a multiple of 8 dwords

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

diff --git a/src/mesa/main/histogram.h b/src/mesa/main/histogram.h
index f929b0513c2d509d3204030c798c9f065e2dbf21..06781e732a1ecb427afc79c3af54c472d5384215 100644 (file)
--- a/src/mesa/main/histogram.h
+++ b/src/mesa/main/histogram.h
@@ -1,4 +1,12 @@
-/* $Id: histogram.h,v 1.5 2003/03/25 02:26:29 brianp Exp $ */
+/**
+ * \file histogram.h
+ * Histogram.
+ * 
+ * \if subset
+ * (No-op)
+ *
+ * \endif
+ */
 
 /*
  * Mesa 3-D graphics library
@@ -28,35 +36,40 @@
 #ifndef HISTOGRAM_H
 #define HISTOGRAM_H
 
-#include "glheader.h"
-#include "mtypes.h"
-
-
-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 _mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values);
-
-extern void _mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params);
-
-extern void _mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params);
-
-extern void _mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params);
-
-extern void _mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params);
-
-extern void _mesa_Histogram(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink);
-
-extern void _mesa_Minmax(GLenum target, GLenum internalformat, GLboolean sink);
-
-extern void _mesa_ResetHistogram(GLenum target);
-
-extern void _mesa_ResetMinmax(GLenum target);
-
-#endif
+#include "compiler.h"
+#include "mfeatures.h"
+
+struct _glapi_table;
+
+void GLAPIENTRY
+_mesa_GetnMinmaxARB(GLenum target, GLboolean reset, GLenum format,
+                    GLenum type, GLsizei bufSize, GLvoid *values);
+void GLAPIENTRY
+_mesa_GetMinmax(GLenum target, GLboolean reset, GLenum format, GLenum type,
+                GLvoid *values);
+void GLAPIENTRY
+_mesa_GetnHistogramARB(GLenum target, GLboolean reset, GLenum format,
+                       GLenum type, GLsizei bufSize, GLvoid *values);
+void GLAPIENTRY
+_mesa_GetHistogram(GLenum target, GLboolean reset, GLenum format, GLenum type,
+                   GLvoid *values);
+void GLAPIENTRY
+_mesa_GetHistogramParameterfv(GLenum target, GLenum pname, GLfloat *params);
+void GLAPIENTRY
+_mesa_GetHistogramParameteriv(GLenum target, GLenum pname, GLint *params);
+void GLAPIENTRY
+_mesa_GetMinmaxParameterfv(GLenum target, GLenum pname, GLfloat *params);
+void GLAPIENTRY
+_mesa_GetMinmaxParameteriv(GLenum target, GLenum pname, GLint *params);
+void GLAPIENTRY
+_mesa_Histogram(GLenum target, GLsizei width, GLenum internalFormat,
+                GLboolean sink);
+void GLAPIENTRY
+_mesa_Minmax(GLenum target, GLenum internalFormat, GLboolean sink);
+void GLAPIENTRY
+_mesa_ResetHistogram(GLenum target);
+void GLAPIENTRY
+_mesa_ResetMinmax(GLenum target);
+
+
+#endif /* HISTOGRAM_H */