From 95517a9741175f15124dc11e132620a23bec7a19 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Mon, 5 Sep 2011 09:43:23 -0700
Subject: vs2010: Disable LTCG for realz

---
 Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Source/Plugins/Plugin_VideoSoftware')

diff --git a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj
index 26ccad4175..db6f072f20 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj
+++ b/Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj
@@ -46,13 +46,12 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='DebugFast|Win32'">
     <ConfigurationType>StaticLibrary</ConfigurationType>
-- 
cgit v1.2.3


From dabb35afce2539b312935d2fcfe264018d24dbec Mon Sep 17 00:00:00 2001
From: NeoBrainX <NeoBrainX@googlemail.com>
Date: Sun, 29 Jan 2012 21:17:22 +0100
Subject: Prepare texture preloading support

---
 Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Source/Plugins/Plugin_VideoSoftware')

diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp
index 404424f634..95ec555181 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp
@@ -101,14 +101,14 @@ void SWBPWritten(int address, int newvalue)
 
             // TODO - figure out a cleaner way.
 			if (Core::g_CoreStartupParameter.bWii)
-				ptr = Memory::GetPointer(bpmem.tlutXferSrc << 5);
+				ptr = Memory::GetPointer(bpmem.tmem_config.tlut_src << 5);
 			else
-				ptr = Memory::GetPointer((bpmem.tlutXferSrc & 0xFFFFF) << 5);
+				ptr = Memory::GetPointer((bpmem.tmem_config.tlut_src & 0xFFFFF) << 5);
 
 			if (ptr)
 				memcpy_gc(texMem + tlutTMemAddr, ptr, tlutXferCount);
 			else
-				PanicAlert("Invalid palette pointer %08x %08x %08x", bpmem.tlutXferSrc, bpmem.tlutXferSrc << 5, (bpmem.tlutXferSrc & 0xFFFFF)<< 5);
+				PanicAlert("Invalid palette pointer %08x %08x %08x", bpmem.tmem_config.tlut_src, bpmem.tmem_config.tlut_src << 5, (bpmem.tmem_config.tlut_src & 0xFFFFF)<< 5);
 			break;
         }
 	
-- 
cgit v1.2.3


From b0f75f17ae19484735675fea348f7e95740f597f Mon Sep 17 00:00:00 2001
From: marcosvitali <marcosvitali@gmail.com>
Date: Mon, 5 Mar 2012 02:40:10 -0300
Subject: This release still fixed the hangs produced by fifo overflow without
 sacrifice performance. For example you can test Tutorial moves at the
 beginning of The last history now is fluid 30/60. Shuffle2: I've delete the
 hacky line, I think is not necessary anymore. Additional some clean in
 CommandProcessor. Please test The Last Story and others games affected in the
 previous commits and give me a feedback.

---
 Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp     | 6 ++++++
 Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'Source/Plugins/Plugin_VideoSoftware')

diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
index abfd9155f5..c591bd0957 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
@@ -215,6 +215,12 @@ bool VideoSoftware::Video_IsPossibleWaitingSetDrawDone(void)
 	return false;
 }
 
+bool VideoSoftware::Video_IsHiWatermarkActive(void)
+{
+	return false;
+}
+
+
 void VideoSoftware::Video_AbortFrame(void)
 {
 }
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h b/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h
index 08b4c155ad..7c52e34291 100644
--- a/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h
+++ b/Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h
@@ -36,7 +36,7 @@ class VideoSoftware : public VideoBackend
 	void Video_SetRendering(bool bEnabled);
 
 	void Video_GatherPipeBursted();
-
+	bool Video_IsHiWatermarkActive();
 	bool Video_IsPossibleWaitingSetDrawDone();
 	void Video_AbortFrame();
 
-- 
cgit v1.2.3