X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmath%2Fm_translate.h;h=eeb947f292aca2718cea7d195bc36dea2d341e31;hb=3d8d5b298a268b119d840bc9bae0ee9e0c9244a9;hp=c677682d5060d616f8777b384d68190284fc2339;hpb=bb1b01616b6cb9b0a1cab74e10940ce346cb8a3d;p=mesa.git

diff --git a/src/mesa/math/m_translate.h b/src/mesa/math/m_translate.h
index c677682d506..eeb947f292a 100644
--- a/src/mesa/math/m_translate.h
+++ b/src/mesa/math/m_translate.h
@@ -17,18 +17,20 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 
 #ifndef _M_TRANSLATE_H_
 #define _M_TRANSLATE_H_
 
-#include "main/config.h"
+#include "main/compiler.h"
+#include "main/glheader.h"
 #include "main/mtypes.h"		/* hack for GLchan */
-
+#include "swrast/s_chan.h"
 
 /**
  * Array translation.
@@ -47,28 +49,28 @@
 
 
 extern void _math_trans_1f(GLfloat *to,
-			   CONST void *ptr,
+			   const void *ptr,
 			   GLuint stride,
 			   GLenum type,
 			   GLuint start,
 			   GLuint n );
 
 extern void _math_trans_1ui(GLuint *to,
-			    CONST void *ptr,
+			    const void *ptr,
 			    GLuint stride,
 			    GLenum type,
 			    GLuint start,
 			    GLuint n );
 
 extern void _math_trans_1ub(GLubyte *to,
-			    CONST void *ptr,
+			    const void *ptr,
 			    GLuint stride,
 			    GLenum type,
 			    GLuint start,
 			    GLuint n );
 
 extern void _math_trans_4ub(GLubyte (*to)[4],
-			    CONST void *ptr,
+			    const void *ptr,
 			    GLuint stride,
 			    GLenum type,
 			    GLuint size,
@@ -76,7 +78,7 @@ extern void _math_trans_4ub(GLubyte (*to)[4],
 			    GLuint n );
 
 extern void _math_trans_4chan( GLchan (*to)[4],
-			       CONST void *ptr,
+			       const void *ptr,
 			       GLuint stride,
 			       GLenum type,
 			       GLuint size,
@@ -84,7 +86,7 @@ extern void _math_trans_4chan( GLchan (*to)[4],
 			       GLuint n );
 
 extern void _math_trans_4us(GLushort (*to)[4],
-			    CONST void *ptr,
+			    const void *ptr,
 			    GLuint stride,
 			    GLenum type,
 			    GLuint size,
@@ -93,7 +95,7 @@ extern void _math_trans_4us(GLushort (*to)[4],
 
 /** Convert to floats w/out normalization (i.e. just cast) */
 extern void _math_trans_4f(GLfloat (*to)[4],
-			   CONST void *ptr,
+			   const void *ptr,
 			   GLuint stride,
 			   GLenum type,
 			   GLuint size,
@@ -102,7 +104,7 @@ extern void _math_trans_4f(GLfloat (*to)[4],
 
 /** Convert to normalized floats in [0,1] or [-1, 1] */
 extern void _math_trans_4fn(GLfloat (*to)[4],
-			    CONST void *ptr,
+			    const void *ptr,
 			    GLuint stride,
 			    GLenum type,
 			    GLuint size,
@@ -110,7 +112,7 @@ extern void _math_trans_4fn(GLfloat (*to)[4],
 			    GLuint n );
 
 extern void _math_trans_3fn(GLfloat (*to)[3],
-			   CONST void *ptr,
+			   const void *ptr,
 			   GLuint stride,
 			   GLenum type,
 			   GLuint start,