From 65996f27f48e2212bf36e515aba82b6876398bfd Mon Sep 17 00:00:00 2001 From: Brian Date: Wed, 3 Oct 2007 13:49:31 -0600 Subject: Move XSTDCALL definition to p_compiler.h --- src/mesa/pipe/draw/draw_vertex_shader.c | 10 ---------- src/mesa/pipe/p_compiler.h | 10 ++++++++++ src/mesa/pipe/softpipe/sp_quad_fs.c | 8 -------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/mesa/pipe/draw/draw_vertex_shader.c b/src/mesa/pipe/draw/draw_vertex_shader.c index e99537f16c..ea3fc2128d 100644 --- a/src/mesa/pipe/draw/draw_vertex_shader.c +++ b/src/mesa/pipe/draw/draw_vertex_shader.c @@ -55,16 +55,6 @@ compute_clipmask(const float *clip, const float (*plane)[4], unsigned nr) } - - -#if !defined(XSTDCALL) -#if defined(WIN32) -#define XSTDCALL __stdcall -#else -#define XSTDCALL -#endif -#endif - typedef void (XSTDCALL *codegen_function) ( const struct tgsi_exec_vector *input, struct tgsi_exec_vector *output, diff --git a/src/mesa/pipe/p_compiler.h b/src/mesa/pipe/p_compiler.h index 3dd6bc5c5a..020977b05b 100644 --- a/src/mesa/pipe/p_compiler.h +++ b/src/mesa/pipe/p_compiler.h @@ -80,4 +80,14 @@ typedef unsigned long long uint64; +/** For calling code-gen'd functions */ +#if !defined(XSTDCALL) +#if defined(WIN32) +#define XSTDCALL __stdcall +#else +#define XSTDCALL +#endif +#endif + + #endif /* P_COMPILER_H */ diff --git a/src/mesa/pipe/softpipe/sp_quad_fs.c b/src/mesa/pipe/softpipe/sp_quad_fs.c index d9a2e6b9cf..d9349a2280 100755 --- a/src/mesa/pipe/softpipe/sp_quad_fs.c +++ b/src/mesa/pipe/softpipe/sp_quad_fs.c @@ -58,14 +58,6 @@ quad_shade_stage(struct quad_stage *qs) } -#if !defined(XSTDCALL) -#if defined(WIN32) -#define XSTDCALL __stdcall -#else -#define XSTDCALL -#endif -#endif - typedef void (XSTDCALL *codegen_function)( const struct tgsi_exec_vector *input, struct tgsi_exec_vector *output, -- cgit v1.2.3