Hook-up SSE2 to VS.

3 files changed, 3 insertions, 37 deletions

diff --git a/src/mesa/pipe/tgsi/exec/tgsi_exec.c b/src/mesa/pipe/tgsi/exec/tgsi_exec.c
index a1f46712b4f..793f8bc0f68 100644
--- a/src/mesa/pipe/tgsi/exec/tgsi_exec.c
+++ b/src/mesa/pipe/tgsi/exec/tgsi_exec.c
@@ -85,11 +85,6 @@ tgsi_exec_machine_init(
    mach->Temps = (struct tgsi_exec_vector *) tgsi_align_128bit( mach->_Temps);
    mach->Addrs = &mach->Temps[TGSI_EXEC_NUM_TEMPS];
 
-#if XXX_SSE
-    tgsi_emit_sse (tokens,
-                   &mach->Function);
-#endif
-
    /* Setup constants. */
    for( i = 0; i < 4; i++ ) {
       mach->Temps[TEMP_0_I].xyzw[TEMP_0_C].u[i] = 0x00000000;
@@ -967,6 +962,7 @@ store_dest(
 
    default:
       assert( 0 );
+      return;
    }
 
    switch (inst->Instruction.Saturate)
@@ -2226,20 +2222,6 @@ exec_instruction(
    }
 }
 
-
-#if !defined(XSTDCALL) 
-#if defined(WIN32)
-#define XSTDCALL __stdcall
-#else
-#define XSTDCALL
-#endif
-#endif
-
-typedef void (XSTDCALL *fp_function) (const struct tgsi_exec_vector *input,
-				     struct tgsi_exec_vector *output,
-				     GLfloat (*constant)[4],
-				     struct tgsi_exec_vector *temporary);
-
 void
 tgsi_exec_machine_run2(
    struct tgsi_exec_machine *mach,
@@ -2251,16 +2233,7 @@ tgsi_exec_machine_run2(
 #endif
 
 #if XXX_SSE
-   fp_function function;
-
    mach->Temps[TEMP_KILMASK_I].xyzw[TEMP_KILMASK_C].u[0] = 0;
-    
-   function = (fp_function) x86_get_func (&mach->Function);
-
-   function (mach->Inputs,
-             mach->Outputs,
-             mach->Consts,
-             mach->Temps);
 #else
    struct tgsi_parse_context parse;
    GLuint k;
diff --git a/src/mesa/pipe/tgsi/exec/tgsi_exec.h b/src/mesa/pipe/tgsi/exec/tgsi_exec.h
index e5e8c3608ed..d50f7860292 100644
--- a/src/mesa/pipe/tgsi/exec/tgsi_exec.h
+++ b/src/mesa/pipe/tgsi/exec/tgsi_exec.h
@@ -3,10 +3,6 @@
 
 #include "pipe/p_compiler.h"
 
-#if 0
-#include "x86/rtasm/x86sse.h"
-#endif
-
 #if defined __cplusplus
 extern "C" {
 #endif // defined __cplusplus
@@ -157,9 +153,6 @@ struct tgsi_exec_machine
    const struct tgsi_interp_coef *InterpCoefs;
 
    struct tgsi_exec_cond_stack   CondStack;
-#if XXX_SSE
-   struct x86_function           Function;
-#endif
 };
 
 void
diff --git a/src/mesa/pipe/tgsi/exec/tgsi_sse2.c b/src/mesa/pipe/tgsi/exec/tgsi_sse2.c
index 359775fdfb5..d89bb199709 100755
--- a/src/mesa/pipe/tgsi/exec/tgsi_sse2.c
+++ b/src/mesa/pipe/tgsi/exec/tgsi_sse2.c
@@ -1659,13 +1659,13 @@ emit_instruction(
 }
 
 unsigned
-tgsi_emit_sse(
+tgsi_emit_sse2(
    struct tgsi_token *tokens,
    struct x86_function *func )
 {
    struct tgsi_parse_context parse;
 
-   x86_init_func( func );
+   func->csr = func->store;
 
    x86_mov(
       func,