disabled naughty cheats and protected the choosers behind AllowCodeGen

diff --git a/src/mesa/tnl/t_save_api.c b/src/mesa/tnl/t_save_api.c
index 18fa46951d0a1b9b19cec6a52cff69ce0612265a..3236e14e4213c35060ec8b0a1545148c7c0e4069 100644 (file)
--- 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 f47114cf6239149d80252a8367a5236330b722db..26403fc8ef2bcdbdd5764fa5b6132aaacad63698 100644 (file)
--- 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 ea03dff05bd2b3fbec6080b8763ac2661709b79e..323dca5cd7fb43753f0bd22131ea3d3fa0c6fb62 100644 (file)
--- 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) )