summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-06-02 22:31:02 +0900
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-06-02 22:31:02 +0900
commite0860518dfb5a5c6ba6584e3c1b5d7b203277dac (patch)
treecb3937f94d13e3fcc0db22107663e80c06906d6c
parent8d9a96386a5be7f15968bed63ca8b3e5555bbeeb (diff)
gallium: Replace XSTDCALL by PIPE_CDECL.
-rw-r--r--src/gallium/auxiliary/draw/draw_vs_sse.c2
-rwxr-xr-xsrc/gallium/auxiliary/tgsi/exec/tgsi_sse2.c38
-rw-r--r--src/gallium/drivers/softpipe/sp_fs_sse.c2
-rw-r--r--src/gallium/include/pipe/p_compiler.h16
4 files changed, 12 insertions, 46 deletions
diff --git a/src/gallium/auxiliary/draw/draw_vs_sse.c b/src/gallium/auxiliary/draw/draw_vs_sse.c
index f638208bf5..0aa0c9a76b 100644
--- a/src/gallium/auxiliary/draw/draw_vs_sse.c
+++ b/src/gallium/auxiliary/draw/draw_vs_sse.c
@@ -50,7 +50,7 @@
#define SSE_MAX_VERTICES 4
-typedef void (XSTDCALL *codegen_function) (
+typedef void (PIPE_CDECL *codegen_function) (
const struct tgsi_exec_vector *input, /* 1 */
struct tgsi_exec_vector *output, /* 2 */
float (*constant)[4], /* 3 */
diff --git a/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.c b/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.c
index cdce5ea9c5..cdbdf5c882 100755
--- a/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.c
+++ b/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.c
@@ -194,22 +194,12 @@ get_coef(
}
-#ifdef WIN32
-static void
-emit_retw(
- struct x86_function *func,
- unsigned short size )
-{
- x86_retw( func, size );
-}
-#else
static void
emit_ret(
struct x86_function *func )
{
x86_ret( func );
}
-#endif
/**
@@ -475,7 +465,7 @@ static void
emit_func_call_dst(
struct x86_function *func,
unsigned xmm_dst,
- void (*code)() )
+ void (PIPE_CDECL *code)() )
{
sse_movaps(
func,
@@ -496,9 +486,7 @@ emit_func_call_dst(
x86_push( func, ecx );
x86_mov_reg_imm( func, ecx, (unsigned long) code );
x86_call( func, ecx );
-#ifndef WIN32
x86_pop(func, ecx );
-#endif
}
@@ -516,7 +504,7 @@ emit_func_call_dst_src(
struct x86_function *func,
unsigned xmm_dst,
unsigned xmm_src,
- void (*code)() )
+ void (PIPE_CDECL *code)() )
{
sse_movaps(
func,
@@ -558,7 +546,7 @@ emit_add(
make_xmm( xmm_src ) );
}
-static void XSTDCALL
+static void PIPE_CDECL
cos4f(
float *store )
{
@@ -581,7 +569,7 @@ emit_cos(
cos4f );
}
-static void XSTDCALL
+static void PIPE_CDECL
ex24f(
float *store )
{
@@ -615,7 +603,7 @@ emit_f2it(
make_xmm( xmm ) );
}
-static void XSTDCALL
+static void PIPE_CDECL
flr4f(
float *store )
{
@@ -638,7 +626,7 @@ emit_flr(
flr4f );
}
-static void XSTDCALL
+static void PIPE_CDECL
frc4f(
float *store )
{
@@ -661,7 +649,7 @@ emit_frc(
frc4f );
}
-static void XSTDCALL
+static void PIPE_CDECL
lg24f(
float *store )
{
@@ -720,7 +708,7 @@ emit_neg(
TGSI_EXEC_TEMP_80000000_C ) );
}
-static void XSTDCALL
+static void PIPE_CDECL
pow4f(
float *store )
{
@@ -820,7 +808,7 @@ emit_setsign(
TGSI_EXEC_TEMP_80000000_C ) );
}
-static void XSTDCALL
+static void PIPE_CDECL
sin4f(
float *store )
{
@@ -1736,11 +1724,7 @@ emit_instruction(
break;
case TGSI_OPCODE_RET:
-#ifdef WIN32
- emit_retw( func, 16 );
-#else
emit_ret( func );
-#endif
break;
case TGSI_OPCODE_END:
@@ -2281,11 +2265,7 @@ tgsi_emit_sse2(
func,
get_immediate_base() );
-#ifdef WIN32
- emit_retw( func, 16 );
-#else
emit_ret( func );
-#endif
tgsi_parse_free( &parse );
diff --git a/src/gallium/drivers/softpipe/sp_fs_sse.c b/src/gallium/drivers/softpipe/sp_fs_sse.c
index 55741cc1df..69f7f960aa 100644
--- a/src/gallium/drivers/softpipe/sp_fs_sse.c
+++ b/src/gallium/drivers/softpipe/sp_fs_sse.c
@@ -46,7 +46,7 @@
/* Surely this should be defined somewhere in a tgsi header:
*/
-typedef void (XSTDCALL *codegen_function)(
+typedef void (PIPE_CDECL *codegen_function)(
const struct tgsi_exec_vector *input,
struct tgsi_exec_vector *output,
const float (*constant)[4],
diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
index f6707385cd..b14260dd90 100644
--- a/src/gallium/include/pipe/p_compiler.h
+++ b/src/gallium/include/pipe/p_compiler.h
@@ -128,7 +128,7 @@ typedef unsigned char boolean;
/* This should match linux gcc cdecl semantics everywhere, so that we
* just codegen one calling convention on all platforms.
*/
-#ifdef WIN32
+#ifdef _MSC_VER
#define PIPE_CDECL __cdecl
#else
#define PIPE_CDECL
@@ -148,18 +148,4 @@ typedef unsigned char boolean;
-/**
- * For calling code-gen'd functions, phase out in favor of
- * PIPE_CDECL, above, which really means cdecl on all platforms, not
- * like the below...
- */
-#if !defined(XSTDCALL)
-#if defined(WIN32)
-#define XSTDCALL __stdcall /* phase this out */
-#else
-#define XSTDCALL /* XXX: NOTE! not STDCALL! */
-#endif
-#endif
-
-
#endif /* P_COMPILER_H */