X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmath%2Fm_vector.c;h=b757f24498516725714aa50c7364a7ad6171ae26;hb=ef11d5fc8bb7be56d6afa3f980323cf082ee5c16;hp=4cbab11a35808abd1f9555528be66f30af10c459;hpb=4b1cbfcbe66161a7b56d56cd9e2c35ce49b3a91d;p=mesa.git

diff --git a/src/mesa/math/m_vector.c b/src/mesa/math/m_vector.c
index 4cbab11a358..b757f244985 100644
--- a/src/mesa/math/m_vector.c
+++ b/src/mesa/math/m_vector.c
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
  *
  * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
  *
@@ -17,23 +16,26 @@
  * 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.
  */
 
 /*
  * New (3.1) transformation code written by Keith Whitwell.
  */
 
+#include <stdio.h>
+#include <stddef.h>
 
 #include "main/glheader.h"
-#include "main/imports.h"
 #include "main/macros.h"
-#include "main/imports.h"
 
 #include "m_vector.h"
 
+#include "util/u_memory.h"
+
 
 
 /**
@@ -79,6 +81,13 @@ static const GLubyte size_bits[5] = {
 void
 _mesa_vector4f_init( GLvector4f *v, GLbitfield flags, GLfloat (*storage)[4] )
 {
+   STATIC_ASSERT(V4F_DATA == offsetof(GLvector4f, data));
+   STATIC_ASSERT(V4F_START == offsetof(GLvector4f, start));
+   STATIC_ASSERT(V4F_COUNT == offsetof(GLvector4f, count));
+   STATIC_ASSERT(V4F_STRIDE == offsetof(GLvector4f, stride));
+   STATIC_ASSERT(V4F_SIZE == offsetof(GLvector4f, size));
+   STATIC_ASSERT(V4F_FLAGS == offsetof(GLvector4f, flags));
+
    v->stride = 4 * sizeof(GLfloat);
    v->size = 2;   /* may change: 2-4 for vertices and 1-4 for texcoords */
    v->data = storage;
@@ -101,7 +110,7 @@ _mesa_vector4f_alloc( GLvector4f *v, GLbitfield flags, GLuint count,
 {
    v->stride = 4 * sizeof(GLfloat);
    v->size = 2;
-   v->storage = ALIGN_MALLOC( count * 4 * sizeof(GLfloat), alignment );
+   v->storage = align_malloc( count * 4 * sizeof(GLfloat), alignment );
    v->storage_count = count;
    v->start = (GLfloat *) v->storage;
    v->data = (GLfloat (*)[4]) v->storage;
@@ -119,7 +128,7 @@ void
 _mesa_vector4f_free( GLvector4f *v )
 {
    if (v->flags & VEC_MALLOC) {
-      ALIGN_FREE( v->storage );
+      align_free( v->storage );
       v->data = NULL;
       v->start = NULL;
       v->storage = NULL;
@@ -148,27 +157,27 @@ _mesa_vector4f_print( const GLvector4f *v, const GLubyte *cullmask,
    GLfloat *d = (GLfloat *)v->data;
    GLuint j, i = 0, count;
 
-   _mesa_printf("data-start\n");
+   printf("data-start\n");
    for (; d != v->start; STRIDE_F(d, v->stride), i++)
-      _mesa_printf(t, i, d[0], d[1], d[2], d[3]);
+      printf(t, i, d[0], d[1], d[2], d[3]);
 
-   _mesa_printf("start-count(%u)\n", v->count);
+   printf("start-count(%u)\n", v->count);
    count = i + v->count;
 
    if (culling) {
       for (; i < count; STRIDE_F(d, v->stride), i++)
 	 if (cullmask[i])
-	    _mesa_printf(t, i, d[0], d[1], d[2], d[3]);
+	    printf(t, i, d[0], d[1], d[2], d[3]);
    }
    else {
       for (; i < count; STRIDE_F(d, v->stride), i++)
-	 _mesa_printf(t, i, d[0], d[1], d[2], d[3]);
+	 printf(t, i, d[0], d[1], d[2], d[3]);
    }
 
    for (j = v->size; j < 4; j++) {
       if ((v->flags & (1<<j)) == 0) {
 
-	 _mesa_printf("checking col %u is clean as advertised ", j);
+	 printf("checking col %u is clean as advertised ", j);
 
 	 for (i = 0, d = (GLfloat *) v->data;
 	      i < count && d[j] == c[j];
@@ -177,9 +186,9 @@ _mesa_vector4f_print( const GLvector4f *v, const GLubyte *cullmask,
          }
 
 	 if (i == count)
-	    _mesa_printf(" --> ok\n");
+	    printf(" --> ok\n");
 	 else
-	    _mesa_printf(" --> Failed at %u ******\n", i);
+	    printf(" --> Failed at %u ******\n", i);
       }
    }
 }