projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
swrast: Reduce header file inclusion in s_aatriangle.h.
[mesa.git]
/
src
/
mesa
/
swrast
/
s_alpha.c
diff --git
a/src/mesa/swrast/s_alpha.c
b/src/mesa/swrast/s_alpha.c
index 3c55d3e9e339d5c77bc6c90777b4afc62af29ccb..509477433a535f7a147558fe057e9e1274d59cd0 100644
(file)
--- a/
src/mesa/swrast/s_alpha.c
+++ b/
src/mesa/swrast/s_alpha.c
@@
-27,10
+27,10
@@
* \brief Functions to apply alpha test.
*/
* \brief Functions to apply alpha test.
*/
-#include "glheader.h"
-#include "context.h"
-#include "colormac.h"
-#include "macros.h"
+#include "
main/
glheader.h"
+#include "
main/
context.h"
+#include "
main/
colormac.h"
+#include "ma
in/ma
cros.h"
#include "s_alpha.h"
#include "s_context.h"
#include "s_alpha.h"
#include "s_context.h"
@@
-146,8
+146,8
@@
_swrast_alpha_test(const GLcontext *ctx, SWspan *span)
ALPHA_TEST(FixedToInt(alpha), alpha += alphaStep);
}
else {
ALPHA_TEST(FixedToInt(alpha), alpha += alphaStep);
}
else {
- const GLfloat alphaStep =
span->alphaStep
;
- GLfloat alpha =
span->alpha
;
+ const GLfloat alphaStep =
FixedToFloat(span->alphaStep)
;
+ GLfloat alpha =
FixedToFloat(span->alpha)
;
const GLfloat ref = ctx->Color.AlphaRef;
ALPHA_TEST(alpha, alpha += alphaStep);
}
const GLfloat ref = ctx->Color.AlphaRef;
ALPHA_TEST(alpha, alpha += alphaStep);
}