diff options
| author | XTra.KrazzY <XTra.KrazzY@gmail.com> | 2009-10-12 17:39:09 +0000 |
|---|---|---|
| committer | XTra.KrazzY <XTra.KrazzY@gmail.com> | 2009-10-12 17:39:09 +0000 |
| commit | a887a475e3a6700f7d0cfbc6d6df5c634a953351 (patch) | |
| tree | 6e289b636a7dc8101db5805ac354b60b82621291 /Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp | |
| parent | c2ae2e8d588223d34571e96071ae3a64a43ea926 (diff) | |
SWV: Software Video now compiles and runs on x64
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4411 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp index dbbb0e3a87..226679fb86 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp @@ -30,11 +30,17 @@ inline int iround(float x) {
int t;
- __asm volatile
+#if defined(_WIN32) && !defined(_M_X64)
+ __asm
{
fld x
fistp t
}
+#else
+ t = (int)x;
+ if((x - t) >= 0.5)
+ return t + 1;
+#endif
return t;
}
|