projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
[mesa.git]
/
src
/
mesa
/
x86
/
rtasm
/
x86sse.c
diff --git
a/src/mesa/x86/rtasm/x86sse.c
b/src/mesa/x86/rtasm/x86sse.c
index 39c0e9b851ab747e4c4cbb2db268d30c2ea86f9e..5c4bab733128285978668013ef72f7cc41edf6a2 100644
(file)
--- a/
src/mesa/x86/rtasm/x86sse.c
+++ b/
src/mesa/x86/rtasm/x86sse.c
@@
-1,6
+1,7
@@
+#ifdef USE_X86_ASM
#if defined(__i386__) || defined(__386__)
#if defined(__i386__) || defined(__386__)
-#include "imports.h"
+#include "
main/
imports.h"
#include "x86sse.h"
#define DISASSEM 0
#include "x86sse.h"
#define DISASSEM 0
@@
-290,7
+291,7
@@
void x86_call( struct x86_function *p, void (*label)())
void x86_call( struct x86_function *p, struct x86_reg reg)
{
emit_1ub(p, 0xff);
void x86_call( struct x86_function *p, struct x86_reg reg)
{
emit_1ub(p, 0xff);
- emit_modrm
(p, reg
, reg);
+ emit_modrm
_noreg(p, 2
, reg);
}
#endif
}
#endif
@@
-1191,3
+1192,9
@@
void x86sse_dummy( void )
}
#endif
}
#endif
+
+#else /* USE_X86_ASM */
+
+int x86sse_c_dummy_var; /* silence warning */
+
+#endif /* USE_X86_ASM */