summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/blend.c
diff options
context:
space:
mode:
authorGareth Hughes <[email protected]>2000-10-23 00:16:28 +0000
committerGareth Hughes <[email protected]>2000-10-23 00:16:28 +0000
commitfc2427e81b1c648550d0368652d6a475df785027 (patch)
tree92da699f07610ef4dc07ae4e0add4693c192040d /src/mesa/main/blend.c
parente188b6e1f1d1e5e72985fdc3d69d26eeab26e987 (diff)
Major audit of all Mesa's x86 assembly code. This round is basically
general cleanups - more to come. Added P6 architecture timing to debug_xform routines. Still need to add test_all_vertex_functions test for the v16 asm. Dynamic reconfiguration of counter overhead for more accurate benchmarking.
Diffstat (limited to 'src/mesa/main/blend.c')
-rw-r--r--src/mesa/main/blend.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c
index c4e8e86bba5..8ea3297b7d0 100644
--- a/src/mesa/main/blend.c
+++ b/src/mesa/main/blend.c
@@ -1,4 +1,4 @@
-/* $Id: blend.c,v 1.19 2000/10/19 18:08:05 brianp Exp $ */
+/* $Id: blend.c,v 1.20 2000/10/23 00:16:28 gareth Exp $ */
/*
* Mesa 3-D graphics library
@@ -826,7 +826,7 @@ blend_general( GLcontext *ctx, GLuint n, const GLubyte mask[],
#if defined(USE_MMX_ASM)
#include "X86/mmx.h"
-#include "X86/common_x86asm.h"
+#include "X86/common_x86_asm.h"
#endif
@@ -846,8 +846,8 @@ static void set_blend_function( GLcontext *ctx )
/* Hmm. A table here would have 12^4 == way too many entries.
* Provide a hook for MMX instead.
*/
- if (gl_x86_cpu_features & GL_CPU_MMX) {
- gl_mmx_set_blend_function (ctx);
+ if ( cpu_has_mmx ) {
+ gl_mmx_set_blend_function( ctx );
}
else
#endif