projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'llvm-cliptest-viewport'
[mesa.git]
/
src
/
mesa
/
math
/
m_vector.c
diff --git
a/src/mesa/math/m_vector.c
b/src/mesa/math/m_vector.c
index 4cbab11a35808abd1f9555528be66f30af10c459..4bded31e096dfe9f2cf2e091d3c66e05dbbfe127 100644
(file)
--- a/
src/mesa/math/m_vector.c
+++ b/
src/mesa/math/m_vector.c
@@
-30,7
+30,6
@@
#include "main/glheader.h"
#include "main/imports.h"
#include "main/macros.h"
#include "main/glheader.h"
#include "main/imports.h"
#include "main/macros.h"
-#include "main/imports.h"
#include "m_vector.h"
#include "m_vector.h"
@@
-101,7
+100,7
@@
_mesa_vector4f_alloc( GLvector4f *v, GLbitfield flags, GLuint count,
{
v->stride = 4 * sizeof(GLfloat);
v->size = 2;
{
v->stride = 4 * sizeof(GLfloat);
v->size = 2;
- v->storage =
ALIGN_MALLOC
( count * 4 * sizeof(GLfloat), alignment );
+ v->storage =
_mesa_align_malloc
( count * 4 * sizeof(GLfloat), alignment );
v->storage_count = count;
v->start = (GLfloat *) v->storage;
v->data = (GLfloat (*)[4]) v->storage;
v->storage_count = count;
v->start = (GLfloat *) v->storage;
v->data = (GLfloat (*)[4]) v->storage;
@@
-119,7
+118,7
@@
void
_mesa_vector4f_free( GLvector4f *v )
{
if (v->flags & VEC_MALLOC) {
_mesa_vector4f_free( GLvector4f *v )
{
if (v->flags & VEC_MALLOC) {
-
ALIGN_FREE
( v->storage );
+
_mesa_align_free
( v->storage );
v->data = NULL;
v->start = NULL;
v->storage = NULL;
v->data = NULL;
v->start = NULL;
v->storage = NULL;
@@
-148,27
+147,27
@@
_mesa_vector4f_print( const GLvector4f *v, const GLubyte *cullmask,
GLfloat *d = (GLfloat *)v->data;
GLuint j, i = 0, count;
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++)
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])
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++)
}
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) {
}
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];
for (i = 0, d = (GLfloat *) v->data;
i < count && d[j] == c[j];
@@
-177,9
+176,9
@@
_mesa_vector4f_print( const GLvector4f *v, const GLubyte *cullmask,
}
if (i == count)
}
if (i == count)
-
_mesa_
printf(" --> ok\n");
+ printf(" --> ok\n");
else
else
-
_mesa_
printf(" --> Failed at %u ******\n", i);
+ printf(" --> Failed at %u ******\n", i);
}
}
}
}
}
}