From f2a33a63f1f41681375baa2a9ad261cb60db2a85 Mon Sep 17 00:00:00 2001
From: Zack Rusin <zack@tungstengraphics.com>
Date: Fri, 28 Sep 2007 12:28:06 -0400
Subject: Revert "Use sse only if GALLIUM_SSE is defined"

This reverts commit 57b5d3605745c96ddc2b6de7d50c93db65ba1257.
---
 src/mesa/pipe/draw/draw_context.c       | 11 -----------
 src/mesa/pipe/draw/draw_context.h       |  1 -
 src/mesa/pipe/draw/draw_private.h       |  2 --
 src/mesa/pipe/draw/draw_vertex_shader.c |  9 ++++-----
 src/mesa/state_tracker/st_program.c     | 11 ++++-------
 5 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/src/mesa/pipe/draw/draw_context.c b/src/mesa/pipe/draw/draw_context.c
index 3fb667ab1a9..5efb173228f 100644
--- a/src/mesa/pipe/draw/draw_context.c
+++ b/src/mesa/pipe/draw/draw_context.c
@@ -41,12 +41,6 @@ struct draw_context *draw_create( void )
 {
    struct draw_context *draw = CALLOC_STRUCT( draw_context );
 
-#if defined(__i386__) || defined(__386__)
-   draw->use_sse = getenv("GALLIUM_SSE") != NULL;
-#else
-   draw->use_sse = false;
-#endif
-
    /* create pipeline stages */
    draw->pipeline.unfilled  = draw_unfilled_stage( draw );
    draw->pipeline.twoside   = draw_twoside_stage( draw );
@@ -250,9 +244,4 @@ void draw_free_tmps( struct draw_stage *stage )
    }
 }
 
-boolean draw_use_sse(struct draw_context *draw)
-{
-   return draw->use_sse;
-}
-
 
diff --git a/src/mesa/pipe/draw/draw_context.h b/src/mesa/pipe/draw/draw_context.h
index 8e2232244cc..398e96d94d2 100644
--- a/src/mesa/pipe/draw/draw_context.h
+++ b/src/mesa/pipe/draw/draw_context.h
@@ -99,7 +99,6 @@ void draw_bind_vertex_shader(struct draw_context *draw,
 void draw_delete_vertex_shader(struct draw_context *draw,
                                void *vcso);
 
-boolean draw_use_sse(struct draw_context *draw);
 
 void
 draw_set_vertex_buffer(struct draw_context *draw,
diff --git a/src/mesa/pipe/draw/draw_private.h b/src/mesa/pipe/draw/draw_private.h
index 12a970a6711..2f52299f74a 100644
--- a/src/mesa/pipe/draw/draw_private.h
+++ b/src/mesa/pipe/draw/draw_private.h
@@ -220,8 +220,6 @@ struct draw_context
       struct prim_header queue[PRIM_QUEUE_LENGTH];
       unsigned queue_nr;
    } pq;
-
-   int use_sse : 1;
 };
 
 
diff --git a/src/mesa/pipe/draw/draw_vertex_shader.c b/src/mesa/pipe/draw/draw_vertex_shader.c
index 3518bd52a3f..f7ddbd19093 100644
--- a/src/mesa/pipe/draw/draw_vertex_shader.c
+++ b/src/mesa/pipe/draw/draw_vertex_shader.c
@@ -220,11 +220,10 @@ draw_create_vertex_shader(struct draw_context *draw,
 #if defined(__i386__) || defined(__386__)
    x86_init_func(&vs->sse2_program);
 
-   if (draw->use_sse) {
-      tgsi_emit_sse2(shader->tokens, &vs->sse2_program);
-      ((struct pipe_shader_state*)(vs->state))->executable =
-         x86_get_func(&vs->sse2_program);
-   }
+   tgsi_emit_sse2(shader->tokens, &vs->sse2_program);
+
+   ((struct pipe_shader_state*)(vs->state))->executable =
+      x86_get_func(&vs->sse2_program);
 #endif
 
    return vs;
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index a41b953a21d..116b59a067a 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -36,7 +36,6 @@
 
 #include "pipe/p_context.h"
 #include "pipe/p_defines.h"
-#include "pipe/draw/draw_context.h"
 #include "pipe/tgsi/mesa/mesa_to_tgsi.h"
 #include "pipe/tgsi/exec/tgsi_core.h"
 
@@ -392,13 +391,11 @@ st_translate_fragment_program(struct st_context *st,
       tgsi_dump( tokensOut, 0/*TGSI_DUMP_VERBOSE*/ );
 
 #if defined(__i386__) || defined(__386__)
-   if (draw_use_sse(st->draw)) {
-      if (stfp->sse2_program.csr == stfp->sse2_program.store)
-         tgsi_emit_sse2_fs( tokensOut, &stfp->sse2_program );
+   if (stfp->sse2_program.csr == stfp->sse2_program.store)
+      tgsi_emit_sse2_fs( tokensOut, &stfp->sse2_program );
 
-      if (!cso->state.executable)
-         ((struct cso_fragment_shader*)cso)->state.executable = (void *) x86_get_func( &stfp->sse2_program );
-   }
+   if (!cso->state.executable)
+      ((struct cso_fragment_shader*)cso)->state.executable = (void *) x86_get_func( &stfp->sse2_program );
 #endif
 
    return cso;
-- 
cgit v1.2.3