summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2008-05-29 18:28:02 +0900
committerJosé Fonseca <[email protected]>2008-05-29 18:28:02 +0900
commit6945bcb89370501e0a218bc656e68e30e4dadcda (patch)
treeb37696d75010f6c440a2babc7dbff38949cb1f1f
parent62628c4d3d497cbca73fde869c9069fa90e6453e (diff)
draw: Put PIPE_CDECL in the right places.
MSVC seems picky about this.
-rw-r--r--src/gallium/auxiliary/draw/draw_vs_aos.h4
-rw-r--r--src/gallium/auxiliary/draw/draw_vs_aos_machine.c4
-rw-r--r--src/gallium/auxiliary/draw/draw_vs_varient.c16
3 files changed, 12 insertions, 12 deletions
diff --git a/src/gallium/auxiliary/draw/draw_vs_aos.h b/src/gallium/auxiliary/draw/draw_vs_aos.h
index 89a9174151d..665b425e684 100644
--- a/src/gallium/auxiliary/draw/draw_vs_aos.h
+++ b/src/gallium/auxiliary/draw/draw_vs_aos.h
@@ -60,12 +60,12 @@ struct x86_function;
#define FPU_RND_NEAREST 2
struct aos_machine;
-typedef void PIPE_CDECL (*lit_func)( struct aos_machine *,
+typedef void (PIPE_CDECL *lit_func)( struct aos_machine *,
float *result,
const float *in,
unsigned count );
-PIPE_CDECL void aos_do_lit( struct aos_machine *machine,
+void PIPE_CDECL aos_do_lit( struct aos_machine *machine,
float *result,
const float *in,
unsigned count );
diff --git a/src/gallium/auxiliary/draw/draw_vs_aos_machine.c b/src/gallium/auxiliary/draw/draw_vs_aos_machine.c
index 53e999b191e..b7864e9f2f0 100644
--- a/src/gallium/auxiliary/draw/draw_vs_aos_machine.c
+++ b/src/gallium/auxiliary/draw/draw_vs_aos_machine.c
@@ -57,7 +57,7 @@
#define X87_CW_INFINITY (1<<12)
-PIPE_CDECL void aos_do_lit( struct aos_machine *machine,
+void PIPE_CDECL aos_do_lit( struct aos_machine *machine,
float *result,
const float *in,
unsigned count )
@@ -91,7 +91,7 @@ PIPE_CDECL void aos_do_lit( struct aos_machine *machine,
}
-static PIPE_CDECL void do_lit_lut( struct aos_machine *machine,
+static void PIPE_CDECL do_lit_lut( struct aos_machine *machine,
float *result,
const float *in,
unsigned count )
diff --git a/src/gallium/auxiliary/draw/draw_vs_varient.c b/src/gallium/auxiliary/draw/draw_vs_varient.c
index 18cb06e3742..4a155251b53 100644
--- a/src/gallium/auxiliary/draw/draw_vs_varient.c
+++ b/src/gallium/auxiliary/draw/draw_vs_varient.c
@@ -118,10 +118,10 @@ static void do_viewport( struct draw_vs_varient_generic *vsvg,
}
-static void vsvg_run_elts( struct draw_vs_varient *varient,
- const unsigned *elts,
- unsigned count,
- void *output_buffer)
+static void PIPE_CDECL vsvg_run_elts( struct draw_vs_varient *varient,
+ const unsigned *elts,
+ unsigned count,
+ void *output_buffer)
{
struct draw_vs_varient_generic *vsvg = (struct draw_vs_varient_generic *)varient;
@@ -174,10 +174,10 @@ static void vsvg_run_elts( struct draw_vs_varient *varient,
}
-static void vsvg_run_linear( struct draw_vs_varient *varient,
- unsigned start,
- unsigned count,
- void *output_buffer )
+static void PIPE_CDECL vsvg_run_linear( struct draw_vs_varient *varient,
+ unsigned start,
+ unsigned count,
+ void *output_buffer )
{
struct draw_vs_varient_generic *vsvg = (struct draw_vs_varient_generic *)varient;