Changeset 3598 for trunk/src/opengl/mesa/translate.c

Timestamp:

May 23, 2000, 10:41:28 PM (25 years ago)

Author:

jeroen

Message:

* empty log message *

File:

• trunk/src/opengl/mesa/translate.c (modified) (15 diffs)

trunk/src/opengl/mesa/translate.c

@@ -1 @@
-/* $Id: translate.c,v 1.1 2000-02-29 00:50:12 sandervl Exp $ */
+/* $Id: translate.c,v 1.2 2000-05-23 20:40:58 jeroen Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  *
  * Copyright (C) 1999  Brian Paul   All Rights Reserved.
@@ -30 +30 @@
 
 
+#include "glheader.h"
 #include "types.h"
 #include "translate.h"
 #include "mmath.h"
+#include "mem.h"
+
+#undef CHECK
 
 trans_1ui_func gl_trans_1ui_tab[MAX_TYPES];
@@ -50 +54 @@
 
 
-#define TAB(x) gl_trans_##x##_tab
+#define TAB(x) gl_trans##x##_tab
 #define ARGS   GLuint start, GLuint n
 #define SRC_START  start
@@ -108 +112 @@
 #define SRC GLubyte
 #define SRC_IDX TYPE_IDX(GL_UNSIGNED_BYTE)
-#define TRX_3F(f,n)             /* unused */
-#define TRX_4F(f,n)             /* unused */
-#define TRX_UB(ub, f,n)      ub = PTR_ELT(f,n)
+#define TRX_3F(f,n)             /* unused */
+#define TRX_4F(f,n)             /* unused */
+#define TRX_UB(ub, f,n)      ub = PTR_ELT(f,n)
 #define TRX_UI(f,n)          (GLuint)PTR_ELT(f,n)
 
@@ -274 +278 @@
 #define TRX_4F(f,n)   (GLfloat)( PTR_ELT(f,n) )
 #define TRX_UB(ub, f,n)  ub = (GLubyte) (PTR_ELT(f,n) >> 24)
-#define TRX_UI(f,n)             PTR_ELT(f,n)
+#define TRX_UI(f,n)             PTR_ELT(f,n)
 
 
@@ -387 +391 @@
 
 static void trans_4_GLubyte_4ub_raw (GLubyte (*t)[4],
-                                     const struct gl_client_array *from,
-                                     ARGS )
+                                     const struct gl_client_array *from,
+                                     ARGS )
 {
    GLuint stride = from->StrideB;
@@ -398 +402 @@
        */
       for (i = DST_START ; i < n ; i++, f += stride) {
-         COPY_4UBV( t[i], f );
+         COPY_4UBV( t[i], f );
       }
    } else {
       for (i = DST_START ; i < n ; i++, f += stride) {
-         t[i][0] = f[0];
-         t[i][1] = f[1];
-         t[i][2] = f[2];
-         t[i][3] = f[3];
+         t[i][0] = f[0];
+         t[i][1] = f[1];
+         t[i][2] = f[2];
+         t[i][3] = f[3];
       }
    }
@@ -413 +417 @@
 static void init_translate_raw(void)
 {
-   MEMSET( TAB(1ui), 0, sizeof(TAB(1ui)) );
-   MEMSET( TAB(1ub), 0, sizeof(TAB(1ub)) );
-   MEMSET( TAB(3f),  0, sizeof(TAB(3f)) );
-   MEMSET( TAB(4ub), 0, sizeof(TAB(4ub)) );
-   MEMSET( TAB(4f),  0, sizeof(TAB(4f)) );
-
-   TAB(4ub)[4][TYPE_IDX(GL_UNSIGNED_BYTE)] = trans_4_GLubyte_4ub_raw;
+   MEMSET( TAB(_1ui), 0, sizeof(TAB(_1ui)) );
+   MEMSET( TAB(_1ub), 0, sizeof(TAB(_1ub)) );
+   MEMSET( TAB(_3f),  0, sizeof(TAB(_3f)) );
+   MEMSET( TAB(_4ub), 0, sizeof(TAB(_4ub)) );
+   MEMSET( TAB(_4f),  0, sizeof(TAB(_4f)) );
+
+   TAB(_4ub)[4][TYPE_IDX(GL_UNSIGNED_BYTE)] = trans_4_GLubyte_4ub_raw;
 
    init_trans_4_GLbyte_raw();
@@ -476 +480 @@
  * That the correct value for normal is used.
  */
-#define TAB(x) gl_trans_elt_##x##_tab
+#define TAB(x) gl_trans_elt##x##_tab
 #define ARGS   GLuint *flags, GLuint *elts, GLuint match, \
                GLuint start, GLuint n
@@ -482 +486 @@
 #define DST_START  start
 #define CHECK  if ((flags[i]&match) == VERT_ELT)
-#define NEXT_F  1
+#define NEXT_F  (void)1
 #define NEXT_F2 f = first + elts[i] * stride;
 
@@ -532 +536 @@
 #define SRC GLubyte
 #define SRC_IDX TYPE_IDX(GL_UNSIGNED_BYTE)
-#define TRX_3F(f,n)             /* unused */
-#define TRX_4F(f,n)             /* unused */
-#define TRX_UB(ub, f,n)      ub = PTR_ELT(f,n)
+#define TRX_3F(f,n)             /* unused */
+#define TRX_4F(f,n)             /* unused */
+#define TRX_UB(ub, f,n)      ub = PTR_ELT(f,n)
 #define TRX_UI(f,n)          (GLuint)PTR_ELT(f,n)
 
@@ -698 +702 @@
 #define TRX_4F(f,n)   (GLfloat)( PTR_ELT(f,n) )
 #define TRX_UB(ub, f,n)  ub = (GLubyte) (PTR_ELT(f,n) >> 24)
-#define TRX_UI(f,n)             PTR_ELT(f,n)
+#define TRX_UI(f,n)             PTR_ELT(f,n)
 
 
@@ -810 +814 @@
 
 static void trans_4_GLubyte_4ub(GLubyte (*t)[4],
-                                const struct gl_client_array *from,
-                                ARGS )
+                                const struct gl_client_array *from,
+                                ARGS )
 {
    GLuint stride = from->StrideB;
@@ -822 +826 @@
        */
       for (i = DST_START ; i < n ; i++, NEXT_F) {
-         CHECK {
-            NEXT_F2;
-            COPY_4UBV( t[i], f );
-         }
+         CHECK {
+            NEXT_F2;
+            COPY_4UBV( t[i], f );
+         }
       }
    } else {
       for (i = DST_START ; i < n ; i++, NEXT_F) {
-         CHECK {
-            NEXT_F2;
-            t[i][0] = f[0];
-            t[i][1] = f[1];
-            t[i][2] = f[2];
-            t[i][3] = f[3];
-         }
+         CHECK {
+            NEXT_F2;
+            t[i][0] = f[0];
+            t[i][1] = f[1];
+            t[i][2] = f[2];
+            t[i][3] = f[3];
+         }
       }
    }
@@ -843 +847 @@
 static void init_translate_elt(void)
 {
-   MEMSET( TAB(1ui), 0, sizeof(TAB(1ui)) );
-   MEMSET( TAB(1ub), 0, sizeof(TAB(1ub)) );
-   MEMSET( TAB(3f),  0, sizeof(TAB(3f)) );
-   MEMSET( TAB(4ub), 0, sizeof(TAB(4ub)) );
-   MEMSET( TAB(4f),  0, sizeof(TAB(4f)) );
-
-   TAB(4ub)[4][TYPE_IDX(GL_UNSIGNED_BYTE)] = trans_4_GLubyte_4ub;
+   MEMSET( TAB(_1ui), 0, sizeof(TAB(_1ui)) );
+   MEMSET( TAB(_1ub), 0, sizeof(TAB(_1ub)) );
+   MEMSET( TAB(_3f),  0, sizeof(TAB(_3f)) );
+   MEMSET( TAB(_4ub), 0, sizeof(TAB(_4ub)) );
+   MEMSET( TAB(_4f),  0, sizeof(TAB(_4f)) );
+
+   TAB(_4ub)[4][TYPE_IDX(GL_UNSIGNED_BYTE)] = trans_4_GLubyte_4ub;
 
    init_trans_4_GLbyte_elt();