Enable codegen based whenever __i386__ is defined.

diff --git a/src/mesa/pipe/draw/draw_vertex_shader.c b/src/mesa/pipe/draw/draw_vertex_shader.c
index fe4f124dd2f0f3e59b914bb015a8faad05f1475d..a2e1cdc472d24342c17f696724382563047cfd9e 100644 (file)
--- a/src/mesa/pipe/draw/draw_vertex_shader.c
+++ b/src/mesa/pipe/draw/draw_vertex_shader.c
@@ -64,13 +64,11 @@ compute_clipmask(float cx, float cy, float cz, float cw)
 #endif
 #endif
 
-#if defined(USE_X86_ASM) || defined(SLANG_X86)
-typedef void (XSTDCALL *sse2_function)(
+typedef void (XSTDCALL *codegen_function) (
    const struct tgsi_exec_vector *input,
    struct tgsi_exec_vector *output,
    float (*constant)[4],
    struct tgsi_exec_vector *temporary );
-#endif
 
 /**
  * Transform vertices with the current vertex program/shader
@@ -117,16 +115,12 @@ run_vertex_program(struct draw_context *draw,
 
    /* run shader */
    if( draw->vertex_shader.executable != NULL ) {
-#if defined(USE_X86_ASM) || defined(SLANG_X86)
-      sse2_function func = (sse2_function) draw->vertex_shader.executable;
+      codegen_function func = (codegen_function) draw->vertex_shader.executable;
       func(
          machine.Inputs,
          machine.Outputs,
          machine.Consts,
          machine.Temps );
-#else
-      assert( 0 );
-#endif
    }
    else {
       tgsi_exec_machine_run( &machine );

diff --git a/src/mesa/pipe/softpipe/sp_quad_fs.c b/src/mesa/pipe/softpipe/sp_quad_fs.c
index bff5525b0fc6cd1ec5d0b4691421261409ed4686..673d339f4128d749a07029c372d28d57533c1877 100755 (executable)
--- a/src/mesa/pipe/softpipe/sp_quad_fs.c
+++ b/src/mesa/pipe/softpipe/sp_quad_fs.c
@@ -64,14 +64,12 @@ quad_shade_stage(struct quad_stage *qs)
 #endif
 #endif
 
-#if defined(USE_X86_ASM) || defined(SLANG_X86)
-typedef void (XSTDCALL *sse2_function)(
+typedef void (XSTDCALL *codegen_function)(
    const struct tgsi_exec_vector *input,
    struct tgsi_exec_vector *output,
    float (*constant)[4],
    struct tgsi_exec_vector *temporary,
    const struct tgsi_interp_coef *coef );
-#endif
 
 /* This should be done by the fragment shader execution unit (code
  * generated from the decl instructions).  Do it here for now.
@@ -121,17 +119,13 @@ shade_quad(
 
    /* run shader */
    if( softpipe->fs->executable != NULL ) {
-#if defined(USE_X86_ASM) || defined(SLANG_X86)
-      sse2_function func = (sse2_function) softpipe->fs->executable;
+      codegen_function func = (codegen_function) softpipe->fs->executable;
       func(
          machine.Inputs,
          machine.Outputs,
          machine.Consts,
          machine.Temps,
          machine.InterpCoefs );
-#else
-      assert( 0 );
-#endif
    }
    else {
       tgsi_exec_machine_run( &machine );

diff --git a/src/mesa/pipe/tgsi/exec/tgsi_sse2.c b/src/mesa/pipe/tgsi/exec/tgsi_sse2.c
index cf5e386ddfab6a043ac4be272248f5280a385824..e7a6112e6e8799b52c2af08f580b5152337e493f 100755 (executable)
--- a/src/mesa/pipe/tgsi/exec/tgsi_sse2.c
+++ b/src/mesa/pipe/tgsi/exec/tgsi_sse2.c
@@ -2,7 +2,7 @@
 #include "tgsi_core.h"
 #include "x86/rtasm/x86sse.h"
 
-#if defined(USE_X86_ASM) || defined(SLANG_X86)
+#if defined(__i386__) || defined(__386__)
 
 #define FOR_EACH_CHANNEL( CHAN )\
    for( CHAN = 0; CHAN < 4; CHAN++ )

diff --git a/src/mesa/state_tracker/st_cb_program.c b/src/mesa/state_tracker/st_cb_program.c
index f57d22652fc641d63d642250d4de426625683f70..25dbc2c24424199eef91c4b83e11644b4b077ee8 100644 (file)
--- a/src/mesa/state_tracker/st_cb_program.c
+++ b/src/mesa/state_tracker/st_cb_program.c
@@ -86,7 +86,7 @@ static struct gl_program *st_new_program( GLcontext *ctx,
 
       prog->serialNo = 1;
 
-#if defined(USE_X86_ASM) || defined(SLANG_X86)
+#if defined(__i386__) || defined(__386__)
       x86_init_func( &prog->sse2_program );
 #endif
 
@@ -102,7 +102,7 @@ static struct gl_program *st_new_program( GLcontext *ctx,
 
       prog->serialNo = 1;
 
-#if defined(USE_X86_ASM) || defined(SLANG_X86)
+#if defined(__i386__) || defined(__386__)
       x86_init_func( &prog->sse2_program );
 #endif
 
@@ -129,7 +129,7 @@ static void st_delete_program( GLcontext *ctx,
    case GL_VERTEX_PROGRAM_ARB:
       {
          struct st_vertex_program *stvp = (struct st_vertex_program *) prog;
-#if defined(USE_X86_ASM) || defined(SLANG_X86)
+#if defined(__i386__) || defined(__386__)
          x86_release_func( &stvp->sse2_program );
 #endif
          st_remove_vertex_program(st, stvp);
@@ -139,7 +139,7 @@ static void st_delete_program( GLcontext *ctx,
       {
          struct st_fragment_program *stfp
             = (struct st_fragment_program *) prog;
-#if defined(USE_X86_ASM) || defined(SLANG_X86)
+#if defined(__i386__) || defined(__386__)
          x86_release_func( &stfp->sse2_program );
 #endif
          st_remove_fragment_program(st, stfp);

diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 9f363adc5c75c0eae003c5cc437c5a40a68aaa83..44cc33b09fb6828dc21b83203c92ade60bf1de3e 100644 (file)
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -253,7 +253,7 @@ st_translate_vertex_program(struct st_context *st,
    if (TGSI_DEBUG)
       tgsi_dump( tokensOut, 0 );
 
-#if defined(USE_X86_ASM) || defined(SLANG_X86)
+#if defined(__i386__) || defined(__386__)
    if (stvp->sse2_program.csr == stvp->sse2_program.store)
       tgsi_emit_sse2( tokensOut, &stvp->sse2_program );
 
@@ -398,7 +398,7 @@ st_translate_fragment_program(struct st_context *st,
    if (TGSI_DEBUG)
       tgsi_dump( tokensOut, 0/*TGSI_DUMP_VERBOSE*/ );
 
-#if defined(USE_X86_ASM) || defined(SLANG_X86)
+#if defined(__i386__) || defined(__386__)
    if (stfp->sse2_program.csr == stfp->sse2_program.store)
       tgsi_emit_sse2_fs( tokensOut, &stfp->sse2_program );
 

diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h
index 355dee574bd69d416cb44070700df128087c3658..6e106c16b020fb89d5f41dccd4eb3a4bfc74551e 100644 (file)
--- a/src/mesa/state_tracker/st_program.h
+++ b/src/mesa/state_tracker/st_program.h
@@ -53,7 +53,7 @@ struct st_fragment_program
    /** The program in TGSI format */
    struct tgsi_token tokens[ST_FP_MAX_TOKENS];
 
-#if defined(USE_X86_ASM) || defined(SLANG_X86)
+#if defined(__i386__) || defined(__386__)
    struct x86_function  sse2_program;
 #endif
 
@@ -79,7 +79,7 @@ struct st_vertex_program
    /** The program in TGSI format */
    struct tgsi_token tokens[ST_FP_MAX_TOKENS];
 
-#if defined(USE_X86_ASM) || defined(SLANG_X86)
+#if defined(__i386__) || defined(__386__)
    struct x86_function  sse2_program;
 #endif
 

diff --git a/src/mesa/x86/rtasm/x86sse.c b/src/mesa/x86/rtasm/x86sse.c
index f5b0ccdb9bb0bfcc52ff6a4c72c2e65a87ddccf5..96c1301d7f5b3d0b6737b6ea0c99988fbf0d61da 100644 (file)
--- a/src/mesa/x86/rtasm/x86sse.c
+++ b/src/mesa/x86/rtasm/x86sse.c
@@ -1,4 +1,4 @@
-#if defined(USE_X86_ASM) || defined(SLANG_X86)
+#if defined(__i386__) || defined(__386__)
 
 #include "imports.h"
 #include "x86sse.h"

diff --git a/src/mesa/x86/rtasm/x86sse.h b/src/mesa/x86/rtasm/x86sse.h
index c6236395b2c134782a500842543f7a6abd4aca15..4816bd2ad2ce1741a24cb5bfe49b35a01dd71a85 100644 (file)
--- a/src/mesa/x86/rtasm/x86sse.h
+++ b/src/mesa/x86/rtasm/x86sse.h
@@ -2,7 +2,7 @@
 #ifndef _X86SSE_H_
 #define _X86SSE_H_
 
-#if defined(USE_X86_ASM) || defined(SLANG_X86)
+#if defined(__i386__) || defined(__386__)
 
 #include "glheader.h"