diff options
| author | Jakob Bornecrantz <[email protected]> | 2008-05-30 13:46:18 +0200 |
|---|---|---|
| committer | Jakob Bornecrantz <[email protected]> | 2008-05-30 13:46:18 +0200 |
| commit | 3869c3c87a40d9f41414082ad8dd3d747e6b34d8 (patch) | |
| tree | 04d493660504d59b7e2d3c8b2a5178b3865b84ec /src/gallium/auxiliary/translate/translate_sse.c | |
| parent | 2ade5268dca67a73d3f5f8cc41ea86d1e48de9f0 (diff) | |
| parent | 012c0dd6321e858af22389f98201c8dcb8f8780c (diff) | |
Merge branch 'gallium-tex-surfaces' into gallium-0.1
Conflicts:
src/gallium/drivers/i915simple/i915_context.h
Diffstat (limited to 'src/gallium/auxiliary/translate/translate_sse.c')
| -rw-r--r-- | src/gallium/auxiliary/translate/translate_sse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/translate/translate_sse.c b/src/gallium/auxiliary/translate/translate_sse.c index af86260725a..18a212ac1cf 100644 --- a/src/gallium/auxiliary/translate/translate_sse.c +++ b/src/gallium/auxiliary/translate/translate_sse.c @@ -310,7 +310,7 @@ static void get_src_ptr( struct translate_sse *p, static void emit_swizzle( struct translate_sse *p, struct x86_reg dest, struct x86_reg src, - unsigned shuffle ) + unsigned char shuffle ) { sse_shufps(p->func, dest, src, shuffle); } @@ -535,7 +535,7 @@ static void translate_sse_release( struct translate *translate ) FREE(p); } -static void translate_sse_run_elts( struct translate *translate, +static void PIPE_CDECL translate_sse_run_elts( struct translate *translate, const unsigned *elts, unsigned count, void *output_buffer ) @@ -548,7 +548,7 @@ static void translate_sse_run_elts( struct translate *translate, output_buffer ); } -static void translate_sse_run( struct translate *translate, +static void PIPE_CDECL translate_sse_run( struct translate *translate, unsigned start, unsigned count, void *output_buffer ) |