projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
radeon/r600: Fix remaining warnings when building 64 bit binary.
[mesa.git]
/
src
/
mesa
/
swrast
/
s_depth.c
diff --git
a/src/mesa/swrast/s_depth.c
b/src/mesa/swrast/s_depth.c
index cb584b5de8f50b54081ef71cebb54d3b3bde2c45..26e23f02d597e62503aba443f5ce4e3f845d09b0 100644
(file)
--- a/
src/mesa/swrast/s_depth.c
+++ b/
src/mesa/swrast/s_depth.c
@@
-1,8
+1,8
@@
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
- * Version:
6.5
.1
+ * Version:
7.2
.1
*
*
- * Copyright (C) 1999-200
6
Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-200
8
Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@
-23,11
+23,11
@@
*/
*/
-#include "glheader.h"
-#include "context.h"
-#include "macros.h"
-#include "imports.h"
-#include "fbobject.h"
+#include "
main/
glheader.h"
+#include "
main/
context.h"
+#include "ma
in/ma
cros.h"
+#include "
main/
imports.h"
+#include "
main/
fbobject.h"
#include "s_depth.h"
#include "s_context.h"
#include "s_depth.h"
#include "s_context.h"
@@
-534,15
+534,15
@@
depth_test_span( GLcontext *ctx, SWspan *span)
if (rb->DataType == GL_UNSIGNED_SHORT) {
GLushort zbuffer[MAX_WIDTH];
rb->GetRow(ctx, rb, count, x, y, zbuffer);
if (rb->DataType == GL_UNSIGNED_SHORT) {
GLushort zbuffer[MAX_WIDTH];
rb->GetRow(ctx, rb, count, x, y, zbuffer);
- passed = depth_test_span16(ctx, count, zbuffer, zValues, mask
);
- rb->PutRow(ctx, rb, count, x, y, zbuffer,
NULL
);
+ passed = depth_test_span16(ctx, count, zbuffer, zValues, mask);
+ rb->PutRow(ctx, rb, count, x, y, zbuffer,
mask
);
}
else {
GLuint zbuffer[MAX_WIDTH];
ASSERT(rb->DataType == GL_UNSIGNED_INT);
rb->GetRow(ctx, rb, count, x, y, zbuffer);
}
else {
GLuint zbuffer[MAX_WIDTH];
ASSERT(rb->DataType == GL_UNSIGNED_INT);
rb->GetRow(ctx, rb, count, x, y, zbuffer);
- passed = depth_test_span32(ctx, count, zbuffer, zValues, mask
);
- rb->PutRow(ctx, rb, count, x, y, zbuffer,
NULL
);
+ passed = depth_test_span32(ctx, count, zbuffer, zValues, mask);
+ rb->PutRow(ctx, rb, count, x, y, zbuffer,
mask
);
}
}
}
}
@@
-1080,15
+1080,15
@@
depth_test_pixels( GLcontext *ctx, SWspan *span )
if (rb->DataType == GL_UNSIGNED_SHORT) {
GLushort zbuffer[MAX_WIDTH];
_swrast_get_values(ctx, rb, count, x, y, zbuffer, sizeof(GLushort));
if (rb->DataType == GL_UNSIGNED_SHORT) {
GLushort zbuffer[MAX_WIDTH];
_swrast_get_values(ctx, rb, count, x, y, zbuffer, sizeof(GLushort));
- depth_test_span16(ctx, count, zbuffer, z, mask
);
- rb->PutValues(ctx, rb, count, x, y, zbuffer,
NULL
);
+ depth_test_span16(ctx, count, zbuffer, z, mask);
+ rb->PutValues(ctx, rb, count, x, y, zbuffer,
mask
);
}
else {
GLuint zbuffer[MAX_WIDTH];
ASSERT(rb->DataType == GL_UNSIGNED_INT);
_swrast_get_values(ctx, rb, count, x, y, zbuffer, sizeof(GLuint));
}
else {
GLuint zbuffer[MAX_WIDTH];
ASSERT(rb->DataType == GL_UNSIGNED_INT);
_swrast_get_values(ctx, rb, count, x, y, zbuffer, sizeof(GLuint));
- depth_test_span32(ctx, count, zbuffer, z, mask
);
- rb->PutValues(ctx, rb, count, x, y, zbuffer,
NULL
);
+ depth_test_span32(ctx, count, zbuffer, z, mask);
+ rb->PutValues(ctx, rb, count, x, y, zbuffer,
mask
);
}
}
}
}
@@
-1289,7
+1289,7
@@
_swrast_read_depth_span_uint( GLcontext *ctx, struct gl_renderbuffer *rb,
GLint dx = -x;
GLint i;
for (i = 0; i < dx; i++)
GLint dx = -x;
GLint i;
for (i = 0; i < dx; i++)
- depth[i] = 0
.0
;
+ depth[i] = 0;
x = 0;
n -= dx;
depth += dx;
x = 0;
n -= dx;
depth += dx;
@@
-1298,7
+1298,7
@@
_swrast_read_depth_span_uint( GLcontext *ctx, struct gl_renderbuffer *rb,
GLint dx = x + n - (GLint) rb->Width;
GLint i;
for (i = 0; i < dx; i++)
GLint dx = x + n - (GLint) rb->Width;
GLint i;
for (i = 0; i < dx; i++)
- depth[n - i - 1] = 0
.0
;
+ depth[n - i - 1] = 0;
n -= dx;
}
if (n <= 0) {
n -= dx;
}
if (n <= 0) {