summaryrefslogtreecommitdiff
path: root/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp
diff options
context:
space:
mode:
authorXTra.KrazzY <XTra.KrazzY@gmail.com>2009-10-12 16:29:32 +0000
committerXTra.KrazzY <XTra.KrazzY@gmail.com>2009-10-12 16:29:32 +0000
commitc2ae2e8d588223d34571e96071ae3a64a43ea926 (patch)
treebf5f99f966923af4035ce18785f3da30c835bc6e /Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp
parent34e887527c1226638a9fa3187ab48547104d7249 (diff)
Started fixing SW video compilation for linux, must go home now
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4410 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp')
-rw-r--r--Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp
index 0ac592ac74..dbbb0e3a87 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp
@@ -16,7 +16,7 @@
#include "TextureSampler.h"
-#include "Main.h"
+#include "main.h"
#include "BPMemLoader.h"
#include "../../../Core/VideoCommon/Src/TextureDecoder.h"
@@ -30,7 +30,7 @@ inline int iround(float x)
{
int t;
- __asm
+ __asm volatile
{
fld x
fistp t
@@ -147,4 +147,4 @@ void Sample(float s, float t, float lod, u8 texmap, u8 *sample)
}
}
-} \ No newline at end of file
+}