mesa: Change "BRIAN PAUL" to "THE AUTHORS" in license text.

[mesa.git] / src / mesa / math / m_translate.c

diff --git a/src/mesa/math/m_translate.c b/src/mesa/math/m_translate.c
index 4a20f45ee434f2f96f2f7a77cc114771be4d2fc8..2e9ee901eed11c356a823d045dc24d5252dc13d2 100644 (file)
--- a/src/mesa/math/m_translate.c
+++ b/src/mesa/math/m_translate.c
@@ -17,7 +17,7 @@
  * 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
+ * THE AUTHORS 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.
  */
@@ -29,51 +29,51 @@
 
 
 #include "main/glheader.h"
+#include "main/macros.h"
 #include "main/mtypes.h"               /* GLchan hack */
-#include "main/colormac.h"
 
 #include "m_translate.h"
 
 
 
 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 )
 {
@@ -556,13 +556,13 @@ static void trans_4_GLubyte_4ub_raw(GLubyte (*t)[4],
 
 static void init_translate_raw(void)
 {
-   MEMSET( TAB(_1ui), 0, sizeof(TAB(_1ui)) );
-   MEMSET( TAB(_1ub), 0, sizeof(TAB(_1ub)) );
-   MEMSET( TAB(_3fn),  0, sizeof(TAB(_3fn)) );
-   MEMSET( TAB(_4ub), 0, sizeof(TAB(_4ub)) );
-   MEMSET( TAB(_4us), 0, sizeof(TAB(_4us)) );
-   MEMSET( TAB(_4f),  0, sizeof(TAB(_4f)) );
-   MEMSET( TAB(_4fn),  0, sizeof(TAB(_4fn)) );
+   memset( TAB(_1ui), 0, sizeof(TAB(_1ui)) );
+   memset( TAB(_1ub), 0, sizeof(TAB(_1ub)) );
+   memset( TAB(_3fn),  0, sizeof(TAB(_3fn)) );
+   memset( TAB(_4ub), 0, sizeof(TAB(_4ub)) );
+   memset( TAB(_4us), 0, sizeof(TAB(_4us)) );
+   memset( TAB(_4f),  0, sizeof(TAB(_4f)) );
+   memset( TAB(_4fn),  0, sizeof(TAB(_4fn)) );
 
    init_trans_4_GLbyte_raw();
    init_trans_3_GLbyte_raw();
@@ -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,