diff options
| -rw-r--r-- | src/mesa/tnl/t_save_api.c | 2 | ||||
| -rw-r--r-- | src/mesa/tnl/t_vtx_api.c | 4 | ||||
| -rw-r--r-- | src/mesa/tnl/t_vtx_generic.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/tnl/t_save_api.c b/src/mesa/tnl/t_save_api.c index 18fa46951d..3236e14e42 100644 --- a/src/mesa/tnl/t_save_api.c +++ b/src/mesa/tnl/t_save_api.c @@ -712,7 +712,7 @@ do { \ #define DISPATCH_ATTR1F( ATTR, S ) DISPATCH_ATTRFV( ATTR, 1, &(S) ) -#ifdef USE_X86_ASM +#if defined(USE_X86_ASM) && 0 /* will break register calling convention */ /* Naughty cheat: */ #define DISPATCH_ATTR2F( ATTR, S,T ) DISPATCH_ATTRFV( ATTR, 2, &(S) ) diff --git a/src/mesa/tnl/t_vtx_api.c b/src/mesa/tnl/t_vtx_api.c index f47114cf62..26403fc8ef 100644 --- a/src/mesa/tnl/t_vtx_api.c +++ b/src/mesa/tnl/t_vtx_api.c @@ -883,7 +883,9 @@ void _tnl_vtx_init( GLcontext *ctx ) choose[ERROR_ATTRIB][2] = error_attrib; choose[ERROR_ATTRIB][3] = error_attrib; - _tnl_x86choosers(choose, do_choose); /* x86 INIT_CHOOSERS */ + if (tnl->AllowCodegen) { + _tnl_x86choosers(choose, do_choose); /* x86 INIT_CHOOSERS */ + } _tnl_generic_attr_table_init( generic_attr_func ); } diff --git a/src/mesa/tnl/t_vtx_generic.c b/src/mesa/tnl/t_vtx_generic.c index ea03dff05b..323dca5cd7 100644 --- a/src/mesa/tnl/t_vtx_generic.c +++ b/src/mesa/tnl/t_vtx_generic.c @@ -151,7 +151,7 @@ do { \ #define DISPATCH_ATTR1F( ATTR, S ) DISPATCH_ATTRFV( ATTR, 1, &(S) ) -#ifdef USE_X86_ASM +#if defined(USE_X86_ASM) && 0 /* will break register calling convention */ /* Naughty cheat: */ #define DISPATCH_ATTR2F( ATTR, S,T ) DISPATCH_ATTRFV( ATTR, 2, &(S) ) |