summaryrefslogtreecommitdiffstats
path: root/src/mesa/pipe
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2007-09-26 12:46:45 +0100
committerKeith Whitwell <[email protected]>2007-09-27 07:56:23 +0100
commit65e3af51efc9d688ef8face0a44429a90c5dd4c9 (patch)
tree1da21d6a80d339f6bc0545d14b56dc591065a748 /src/mesa/pipe
parent035a824730ae3804b2bfaadec94015aac5c6ebcc (diff)
Enable codegen based whenever __i386__ is defined.
Diffstat (limited to 'src/mesa/pipe')
-rw-r--r--src/mesa/pipe/draw/draw_vertex_shader.c10
-rwxr-xr-xsrc/mesa/pipe/softpipe/sp_quad_fs.c10
-rwxr-xr-xsrc/mesa/pipe/tgsi/exec/tgsi_sse2.c2
3 files changed, 5 insertions, 17 deletions
diff --git a/src/mesa/pipe/draw/draw_vertex_shader.c b/src/mesa/pipe/draw/draw_vertex_shader.c
index fe4f124dd2f..a2e1cdc472d 100644
--- 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 bff5525b0fc..673d339f412 100755
--- 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 cf5e386ddfa..e7a6112e6e8 100755
--- 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++ )