From: Daniel Borca <dborca@users.sourceforge.net>
Date: Fri, 2 Apr 2004 09:12:42 +0000 (+0000)
Subject: disabled naughty cheats and protected the choosers behind AllowCodeGen
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=94922b9d2d801b780b00b030d4ec60381c2eef26;p=mesa.git

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 18fa46951d0..3236e14e421 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 f47114cf623..26403fc8ef2 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 ea03dff05bd..323dca5cd7f 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) )