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

Timestamp:

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

Author:

jeroen

Message:

* empty log message *

File:

• trunk/src/opengl/mesa/vector.c (modified) (10 diffs)

trunk/src/opengl/mesa/vector.c

@@ -1 @@
-/* $Id: vector.c,v 1.1 2000-02-29 00:50:15 sandervl Exp $ */
+/* $Id: vector.c,v 1.2 2000-05-23 20:41:03 jeroen Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  *
  * Copyright (C) 1999  Brian Paul   All Rights Reserved.
@@ -30 +30 @@
 
 
-#ifndef XFree86Server
-#include <stdlib.h>
-#include <stdio.h>
-#else
-#include "GL/xf86glx.h"
-#endif
+#include "glheader.h"
 #include "config.h"
 #include "macros.h"
 #include "vector.h"
+#include "mem.h"
 
 static const GLubyte elem_bits[4] = {
@@ -116 +112 @@
 
 
-#define ALIGN_MALLOC(vec, type, bytes, alignment)                       \
-do {                                                                    \
-   vec->storage = MALLOC( bytes + alignment - 1 );                      \
-   vec->start = type (((unsigned long)vec->storage + alignment - 1)     \
-                                 & ~(unsigned long)(alignment - 1));    \
+#define ALIGN_MALLOC(vec, type, bytes, alignment)                       \
+do {                                                                    \
+   vec->storage = MALLOC( bytes + alignment - 1 );                      \
+   vec->start = type (((unsigned long)vec->storage + alignment - 1)     \
+                                 & ~(unsigned long)(alignment - 1));    \
 } while (0)
 
 
 void gl_vector4f_alloc( GLvector4f *v, GLuint sz, GLuint flags, GLuint count,
-                        GLuint alignment )
+                        GLuint alignment )
 {
    (void) sz;
@@ -138 +134 @@
 
 void gl_vector3f_alloc( GLvector3f *v, GLuint flags, GLuint count,
-                        GLuint alignment )
+                        GLuint alignment )
 {
    v->stride = 3*sizeof(GLfloat);
@@ -148 +144 @@
 
 void gl_vector4ub_alloc( GLvector4ub *v, GLuint flags, GLuint count,
-                         GLuint alignment )
+                         GLuint alignment )
 {
    v->stride = 4*sizeof(GLubyte);
@@ -158 +154 @@
 
 void gl_vector1ub_alloc( GLvector1ub *v, GLuint flags, GLuint count,
-                         GLuint alignment )
+                         GLuint alignment )
 {
    v->stride = 1*sizeof(GLubyte);
@@ -168 +164 @@
 
 void gl_vector1ui_alloc( GLvector1ui *v, GLuint flags, GLuint count,
-                         GLuint alignment )
+                         GLuint alignment )
 {
    v->stride = 1*sizeof(GLuint);
@@ -258 +254 @@
    if (culling) {
       for ( ; i < count ; STRIDE_F(d, v->stride), i++)
-         if (cullmask[i])
-            printf( t, i, d[0], d[1], d[2], d[3]);
+         if (cullmask[i])
+            printf( t, i, d[0], d[1], d[2], d[3]);
    } else {
       for ( ; i < count ; STRIDE_F(d, v->stride), i++)
-         printf( t, i, d[0], d[1], d[2], d[3]);
+         printf( t, i, d[0], d[1], d[2], d[3]);
    }
 
@@ -268 +264 @@
       if ((v->flags & (1<<j)) == 0) {
 
-         printf("checking col %u is clean as advertised ", j);
-
-         for (i = 0, d = (GLfloat *) v->data ;
-              i < count && d[j] == c[j] ;
-              i++, STRIDE_F(d, v->stride)) {};
-
-         if (i == count)
-            printf(" --> ok\n");
-         else
-            printf(" --> Failed at %u ******\n", i);
+         printf("checking col %u is clean as advertised ", j);
+
+         for (i = 0, d = (GLfloat *) v->data ;
+              i < count && d[j] == c[j] ;
+              i++, STRIDE_F(d, v->stride)) {};
+
+         if (i == count)
+            printf(" --> ok\n");
+         else
+            printf(" --> Failed at %u ******\n", i);
       }
    }
@@ -297 +293 @@
    if (culling) {
       for ( ; i < count ; STRIDE_F(d,v->stride), i++)
-         if (cullmask[i])
-            printf( "%u:\t%f, %f, %f\n", i, d[0], d[1], d[2]);
+         if (cullmask[i])
+            printf( "%u:\t%f, %f, %f\n", i, d[0], d[1], d[2]);
    } else {
       for ( ; i < count ; STRIDE_F(d,v->stride), i++)
-         printf( "%u:\t%f, %f, %f\n", i, d[0], d[1], d[2]);
-   }
-}
+         printf( "%u:\t%f, %f, %f\n", i, d[0], d[1], d[2]);
+   }
+}