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

[mesa.git] / src / mesa / main / querymatrix.c

diff --git a/src/mesa/main/querymatrix.c b/src/mesa/main/querymatrix.c
index 2843d5589c95707f67731854791c3d3f0f356b81..aee8aef129ea25cf2e50a6fca8ff2a3637b5bc29 100644 (file)
--- a/src/mesa/main/querymatrix.c
+++ b/src/mesa/main/querymatrix.c
@@ -14,8 +14,9 @@
 
 #include <stdlib.h>
 #include <math.h>
-#include "GLES/gl.h"
-#include "GLES/glext.h"
+#include "glheader.h"
+#include "querymatrix.h"
+#include "main/get.h"
 
 
 /**
@@ -88,13 +89,7 @@ fpclassify(double x)
 
 #endif
 
-extern GLbitfield GL_APIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]);
-
-/* The Mesa functions we'll need */
-extern void GL_APIENTRY _mesa_GetIntegerv(GLenum pname, GLint *params);
-extern void GL_APIENTRY _mesa_GetFloatv(GLenum pname, GLfloat *params);
-
-GLbitfield GL_APIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16])
+GLbitfield GLAPIENTRY _mesa_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16])
 {
     GLfloat matrix[16];
     GLint tmp;