diff options
-rw-r--r-- | src/mesa/math/m_trans_tmp.h | 16 | ||||
-rw-r--r-- | src/mesa/math/m_translate.c | 34 | ||||
-rw-r--r-- | src/mesa/math/m_translate.h | 18 | ||||
-rw-r--r-- | src/mesa/math/m_xform.h | 16 |
4 files changed, 42 insertions, 42 deletions
diff --git a/src/mesa/math/m_trans_tmp.h b/src/mesa/math/m_trans_tmp.h index 08fb4d1e9c4..76ed8320972 100644 --- a/src/mesa/math/m_trans_tmp.h +++ b/src/mesa/math/m_trans_tmp.h @@ -29,7 +29,7 @@ #ifdef DEST_4F static void DEST_4F( GLfloat (*t)[4], - CONST void *ptr, + const void *ptr, GLuint stride, ARGS ) { @@ -55,7 +55,7 @@ static void DEST_4F( GLfloat (*t)[4], #ifdef DEST_4FN static void DEST_4FN( GLfloat (*t)[4], - CONST void *ptr, + const void *ptr, GLuint stride, ARGS ) { @@ -80,7 +80,7 @@ static void DEST_4FN( GLfloat (*t)[4], #ifdef DEST_3FN static void DEST_3FN( GLfloat (*t)[3], - CONST void *ptr, + const void *ptr, GLuint stride, ARGS ) { @@ -102,7 +102,7 @@ static void DEST_3FN( GLfloat (*t)[3], #ifdef DEST_1F static void DEST_1F( GLfloat *t, - CONST void *ptr, + const void *ptr, GLuint stride, ARGS ) { @@ -122,7 +122,7 @@ static void DEST_1F( GLfloat *t, #ifdef DEST_4UB static void DEST_4UB( GLubyte (*t)[4], - CONST void *ptr, + const void *ptr, GLuint stride, ARGS ) { @@ -146,7 +146,7 @@ static void DEST_4UB( GLubyte (*t)[4], #ifdef DEST_4US static void DEST_4US( GLushort (*t)[4], - CONST void *ptr, + const void *ptr, GLuint stride, ARGS ) { @@ -170,7 +170,7 @@ static void DEST_4US( GLushort (*t)[4], #ifdef DEST_1UB static void DEST_1UB( GLubyte *t, - CONST void *ptr, + const void *ptr, GLuint stride, ARGS ) { @@ -191,7 +191,7 @@ static void DEST_1UB( GLubyte *t, #ifdef DEST_1UI static void DEST_1UI( GLuint *t, - CONST void *ptr, + const void *ptr, GLuint stride, ARGS ) { diff --git a/src/mesa/math/m_translate.c b/src/mesa/math/m_translate.c index 51daf7bfd37..1da4de372cc 100644 --- a/src/mesa/math/m_translate.c +++ b/src/mesa/math/m_translate.c @@ -37,43 +37,43 @@ typedef void (*trans_1f_func)(GLfloat *to, - CONST void *ptr, + const void *ptr, GLuint stride, GLuint start, GLuint n ); typedef void (*trans_1ui_func)(GLuint *to, - CONST void *ptr, + const void *ptr, GLuint stride, GLuint start, GLuint n ); typedef void (*trans_1ub_func)(GLubyte *to, - CONST void *ptr, + const void *ptr, GLuint stride, GLuint start, GLuint n ); typedef void (*trans_4ub_func)(GLubyte (*to)[4], - CONST void *ptr, + const void *ptr, GLuint stride, GLuint start, GLuint n ); typedef void (*trans_4us_func)(GLushort (*to)[4], - CONST void *ptr, + const void *ptr, GLuint stride, GLuint start, GLuint n ); typedef void (*trans_4f_func)(GLfloat (*to)[4], - CONST void *ptr, + const void *ptr, GLuint stride, GLuint start, GLuint n ); typedef void (*trans_3fn_func)(GLfloat (*to)[3], - CONST void *ptr, + const void *ptr, GLuint stride, GLuint start, GLuint n ); @@ -530,7 +530,7 @@ static trans_4f_func _math_trans_4fn_tab[5][MAX_TYPES]; static void trans_4_GLubyte_4ub_raw(GLubyte (*t)[4], - CONST void *Ptr, + const void *Ptr, GLuint stride, ARGS ) { @@ -625,7 +625,7 @@ void _math_init_translate( void ) * Translate vector of values to GLfloat [1]. */ void _math_trans_1f(GLfloat *to, - CONST void *ptr, + const void *ptr, GLuint stride, GLenum type, GLuint start, @@ -638,7 +638,7 @@ void _math_trans_1f(GLfloat *to, * Translate vector of values to GLuint [1]. */ void _math_trans_1ui(GLuint *to, - CONST void *ptr, + const void *ptr, GLuint stride, GLenum type, GLuint start, @@ -651,7 +651,7 @@ void _math_trans_1ui(GLuint *to, * Translate vector of values to GLubyte [1]. */ void _math_trans_1ub(GLubyte *to, - CONST void *ptr, + const void *ptr, GLuint stride, GLenum type, GLuint start, @@ -665,7 +665,7 @@ void _math_trans_1ub(GLubyte *to, * Translate vector of values to GLubyte [4]. */ void _math_trans_4ub(GLubyte (*to)[4], - CONST void *ptr, + const void *ptr, GLuint stride, GLenum type, GLuint size, @@ -679,7 +679,7 @@ void _math_trans_4ub(GLubyte (*to)[4], * Translate vector of values to GLchan [4]. */ void _math_trans_4chan( GLchan (*to)[4], - CONST void *ptr, + const void *ptr, GLuint stride, GLenum type, GLuint size, @@ -699,7 +699,7 @@ void _math_trans_4chan( GLchan (*to)[4], * Translate vector of values to GLushort [4]. */ void _math_trans_4us(GLushort (*to)[4], - CONST void *ptr, + const void *ptr, GLuint stride, GLenum type, GLuint size, @@ -713,7 +713,7 @@ void _math_trans_4us(GLushort (*to)[4], * Translate vector of values to GLfloat [4]. */ void _math_trans_4f(GLfloat (*to)[4], - CONST void *ptr, + const void *ptr, GLuint stride, GLenum type, GLuint size, @@ -727,7 +727,7 @@ void _math_trans_4f(GLfloat (*to)[4], * Translate vector of values to GLfloat[4], normalized to [-1, 1]. */ void _math_trans_4fn(GLfloat (*to)[4], - CONST void *ptr, + const void *ptr, GLuint stride, GLenum type, GLuint size, @@ -741,7 +741,7 @@ void _math_trans_4fn(GLfloat (*to)[4], * Translate vector of values to GLfloat[3], normalized to [-1, 1]. */ void _math_trans_3fn(GLfloat (*to)[3], - CONST void *ptr, + const void *ptr, GLuint stride, GLenum type, GLuint start, diff --git a/src/mesa/math/m_translate.h b/src/mesa/math/m_translate.h index bf7485c8c12..8fec6f14b06 100644 --- a/src/mesa/math/m_translate.h +++ b/src/mesa/math/m_translate.h @@ -48,28 +48,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, @@ -77,7 +77,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, @@ -85,7 +85,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, @@ -94,7 +94,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, @@ -103,7 +103,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, @@ -111,7 +111,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, diff --git a/src/mesa/math/m_xform.h b/src/mesa/math/m_xform.h index 14ac956a7bc..28024888392 100644 --- a/src/mesa/math/m_xform.h +++ b/src/mesa/math/m_xform.h @@ -108,21 +108,21 @@ typedef GLvector4f * (_XFORMAPIP clip_func)( GLvector4f *vClip, typedef void (*dotprod_func)( GLfloat *out, GLuint out_stride, - CONST GLvector4f *coord_vec, - CONST GLfloat plane[4] ); + const GLvector4f *coord_vec, + const GLfloat plane[4] ); typedef void (*vec_copy_func)( GLvector4f *to, - CONST GLvector4f *from ); + const GLvector4f *from ); /* * Functions for transformation of normals in the VB. */ -typedef void (_NORMAPIP normal_func)( CONST GLmatrix *mat, +typedef void (_NORMAPIP normal_func)( const GLmatrix *mat, GLfloat scale, - CONST GLvector4f *in, - CONST GLfloat lengths[], + const GLvector4f *in, + const GLfloat lengths[], GLvector4f *dest ); @@ -142,8 +142,8 @@ typedef void (_NORMAPIP normal_func)( CONST GLmatrix *mat, * parameter, to allow a unified interface. */ typedef void (_XFORMAPIP transform_func)( GLvector4f *to_vec, - CONST GLfloat m[16], - CONST GLvector4f *from_vec ); + const GLfloat m[16], + const GLvector4f *from_vec ); extern dotprod_func _mesa_dotprod_tab[5]; |