diff options
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/blend.c | 8 | ||||
| -rw-r--r-- | src/mesa/main/context.c | 7 |
2 files changed, 8 insertions, 7 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 diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index c57f37c5791..8a5bf559e8c 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1,4 +1,4 @@ -/* $Id: context.c,v 1.94 2000/10/21 00:02:47 brianp Exp $ */ +/* $Id: context.c,v 1.95 2000/10/23 00:16:28 gareth Exp $ */ /* * Mesa 3-D graphics library @@ -454,6 +454,7 @@ one_time_init( void ) gl_init_translate(); gl_init_vbrender(); gl_init_vbxform(); + gl_init_vertices(); if (getenv("MESA_DEBUG")) { _glapi_noop_enable_warnings(GL_TRUE); @@ -884,7 +885,7 @@ init_attrib_groups( GLcontext *ctx ) ctx->Current.Primitive = (GLenum) (GL_POLYGON + 1); ctx->Current.Flag = (VERT_NORM | - VERT_INDEX | + VERT_INDEX | VERT_RGBA | VERT_EDGE | VERT_TEX0_1 | @@ -2114,4 +2115,4 @@ GLenum gl_reduce_prim[GL_POLYGON+1] = { GL_TRIANGLES, GL_TRIANGLES, GL_TRIANGLES, -}; +}; |