3 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/state_tracker/st_cb_program.c b/src/mesa/state_tracker/st_cb_program.c
index f57d22652f..25dbc2c244 100644
--- 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 9f363adc5c..44cc33b09f 100644
--- 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 355dee574b..6e106c16b0 100644
--- 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