From 319782cf39348522b2614c83c5600e6e9f2773e2 Mon Sep 17 00:00:00 2001
From: gabest11 <gabest11@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Fri, 24 Jul 2009 09:24:09 +0000
Subject: [PATCH] GSdx: just updating vs2010 project files

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1564 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 plugins/GSdx/GSDevice.cpp           |  4 ++--
 plugins/GSdx/GSDevice10.cpp         |  2 +-
 plugins/GSdx/GSDevice11.cpp         |  2 +-
 plugins/GSdx/GSDevice7.cpp          |  4 ++--
 plugins/GSdx/GSTextureCache.cpp     |  2 +-
 plugins/GSdx/GSTextureCacheSW.cpp   |  2 +-
 plugins/GSdx/GSdx_vs2008.vcproj     |  6 ------
 plugins/GSdx/GSdx_vs2010.vcxproj    | 20 ++++++++++----------
 plugins/GSdx/vsprops/common.props   |  5 +++--
 plugins/GSdx/vsprops/common.vsprops |  1 +
 plugins/GSdx/vsprops/sse2.props     |  8 ++++++++
 plugins/GSdx/vsprops/sse4.props     |  8 ++++++++
 plugins/GSdx/vsprops/ssse3.props    |  8 ++++++++
 13 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/plugins/GSdx/GSDevice.cpp b/plugins/GSdx/GSDevice.cpp
index 648b44216b..d023f45649 100644
--- a/plugins/GSdx/GSDevice.cpp
+++ b/plugins/GSdx/GSDevice.cpp
@@ -79,8 +79,8 @@ void GSDevice::Present(const GSVector4i& r, int shader, bool limit)
 {
 	GSVector4i cr = m_wnd->GetClientRect();
 
-	int w = std::max(cr.width(), 1);
-	int h = std::max(cr.height(), 1);
+	int w = std::max<int>(cr.width(), 1);
+	int h = std::max<int>(cr.height(), 1);
 
 	if(!m_backbuffer || m_backbuffer->m_size.x != w || m_backbuffer->m_size.y != h)
 	{
diff --git a/plugins/GSdx/GSDevice10.cpp b/plugins/GSdx/GSDevice10.cpp
index a8d832631b..8f5d709387 100644
--- a/plugins/GSdx/GSDevice10.cpp
+++ b/plugins/GSdx/GSDevice10.cpp
@@ -420,7 +420,7 @@ void GSDevice10::CopyRect(GSTexture* st, GSTexture* dt, const GSVector4i& r)
 {
 	D3D10_BOX box = {r.left, r.top, 0, r.right, r.bottom, 1};
 
-	m_dev->CopySubresourceRegion(*(GSTexture10*)dt, 0, 0, 0, 0, *(GSTexture10*)st, 0, &box);
+	m_dev->CopySubresourceRegion(*(GSTexture10*)dt, 0, r.left, r.top, 0, *(GSTexture10*)st, 0, &box);
 }
 
 void GSDevice10::StretchRect(GSTexture* st, const GSVector4& sr, GSTexture* dt, const GSVector4& dr, int shader, bool linear)
diff --git a/plugins/GSdx/GSDevice11.cpp b/plugins/GSdx/GSDevice11.cpp
index aa6547dd45..4ab7429375 100644
--- a/plugins/GSdx/GSDevice11.cpp
+++ b/plugins/GSdx/GSDevice11.cpp
@@ -417,7 +417,7 @@ void GSDevice11::CopyRect(GSTexture* st, GSTexture* dt, const GSVector4i& r)
 {
 	D3D11_BOX box = {r.left, r.top, 0, r.right, r.bottom, 1};
 
-	m_ctx->CopySubresourceRegion(*(GSTexture11*)dt, 0, 0, 0, 0, *(GSTexture11*)st, 0, &box);
+	m_ctx->CopySubresourceRegion(*(GSTexture11*)dt, 0, r.left, r.top, 0, *(GSTexture11*)st, 0, &box);
 }
 
 void GSDevice11::StretchRect(GSTexture* st, const GSVector4& sr, GSTexture* dt, const GSVector4& dr, int shader, bool linear)
diff --git a/plugins/GSdx/GSDevice7.cpp b/plugins/GSdx/GSDevice7.cpp
index 1f769ec92d..aa3c42abdd 100644
--- a/plugins/GSdx/GSDevice7.cpp
+++ b/plugins/GSdx/GSDevice7.cpp
@@ -142,8 +142,8 @@ void GSDevice7::Present(const GSVector4i& r, int shader, bool limit)
 
 	GSVector4i cr = m_wnd->GetClientRect();
 
-	int w = std::max(cr.width(), 1);
-	int h = std::max(cr.height(), 1);
+	int w = std::max<int>(cr.width(), 1);
+	int h = std::max<int>(cr.height(), 1);
 
 	if(!m_backbuffer || m_backbuffer->m_size.x != w || m_backbuffer->m_size.y != h)
 	{
diff --git a/plugins/GSdx/GSTextureCache.cpp b/plugins/GSdx/GSTextureCache.cpp
index a2d88f39a7..9c70530e9c 100644
--- a/plugins/GSdx/GSTextureCache.cpp
+++ b/plugins/GSdx/GSTextureCache.cpp
@@ -951,7 +951,7 @@ void GSTextureCache::Target::Update()
 
 		if(GSTexture* t = m_renderer->m_dev->CreateTexture(w, h))
 		{
-			const GSOffset* o = m_renderer->m_mem.GetOffset(m_TEX0.TBP0, m_TEX0.TBW, m_TEX0.PSM); // TODO: m_renderer->m_context->bo.tex;
+			const GSOffset* o = m_renderer->m_mem.GetOffset(m_TEX0.TBP0, m_TEX0.TBW, m_TEX0.PSM);
 
 			GIFRegTEXA TEXA;
 
diff --git a/plugins/GSdx/GSTextureCacheSW.cpp b/plugins/GSdx/GSTextureCacheSW.cpp
index 7c548f6672..df8bfb7762 100644
--- a/plugins/GSdx/GSTextureCacheSW.cpp
+++ b/plugins/GSdx/GSTextureCacheSW.cpp
@@ -260,7 +260,7 @@ bool GSTextureCacheSW::GSTexture::Update(const GIFRegTEX0& TEX0, const GIFRegTEX
 			return false;
 		}
 
-		m_tw = std::max<int>(psm.pal > 0 ? 5 : 3, TEX0.TW); // makes one row 32 bytes at least, matches the smallest block size that is allocated above for m_buff
+		m_tw = std::max<int>(TEX0.TW, psm.pal > 0 ? 5 : 3); // makes one row 32 bytes at least, matches the smallest block size that is allocated above for m_buff
 	}
 
 	GSLocalMemory& mem = m_state->m_mem;
diff --git a/plugins/GSdx/GSdx_vs2008.vcproj b/plugins/GSdx/GSdx_vs2008.vcproj
index b6ae9a9c48..1273ff6d0a 100644
--- a/plugins/GSdx/GSdx_vs2008.vcproj
+++ b/plugins/GSdx/GSdx_vs2008.vcproj
@@ -56,7 +56,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(ProjectName)-$(SSEtype).dll"
 				ModuleDefinitionFile=".\GSdx.def"
 				TargetMachine="1"
 			/>
@@ -183,7 +182,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(ProjectName)-$(SSEtype).dll"
 				ModuleDefinitionFile=".\GSdx.def"
 				TargetMachine="1"
 			/>
@@ -310,7 +308,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(ProjectName)-$(SSEtype).dll"
 				ModuleDefinitionFile=".\GSdx.def"
 				TargetMachine="1"
 			/>
@@ -436,7 +433,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(ProjectName)-$(SSEtype).dll"
 				ModuleDefinitionFile=".\GSdx.def"
 				TargetMachine="1"
 			/>
@@ -561,7 +557,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(ProjectName)-$(SSEtype).dll"
 				ModuleDefinitionFile=".\GSdx.def"
 				TargetMachine="1"
 			/>
@@ -688,7 +683,6 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(ProjectName)-$(SSEtype).dll"
 				ModuleDefinitionFile=".\GSdx.def"
 				TargetMachine="1"
 			/>
diff --git a/plugins/GSdx/GSdx_vs2010.vcxproj b/plugins/GSdx/GSdx_vs2010.vcxproj
index a926859248..d6fe2960c1 100644
--- a/plugins/GSdx/GSdx_vs2010.vcxproj
+++ b/plugins/GSdx/GSdx_vs2010.vcxproj
@@ -251,9 +251,9 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug SSE2|Win32'">
     <Import Project="vsprops\ProjectRootDir.props" Condition="exists('.\vsprops\ProjectRootDir.props')" />
+    <Import Project="vsprops\sse2.props" Condition="exists('.\vsprops\sse2.props')" />
     <Import Project="vsprops\common.props" Condition="exists('.\vsprops\common.props')" />
     <Import Project="vsprops\debug.props" Condition="exists('.\vsprops\debug.props')" />
-    <Import Project="vsprops\sse2.props" Condition="exists('.\vsprops\sse2.props')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug SSE2|X64'">
     <Import Project="vsprops\common.props" Condition="exists('.\vsprops\common.props')" />
@@ -261,9 +261,9 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release SSE2|Win32'">
     <Import Project="vsprops\ProjectRootDir.props" Condition="exists('.\vsprops\ProjectRootDir.props')" />
+    <Import Project="vsprops\sse2.props" Condition="exists('.\vsprops\sse2.props')" />
     <Import Project="vsprops\common.props" Condition="exists('.\vsprops\common.props')" />
     <Import Project="vsprops\release.props" Condition="exists('.\vsprops\release.props')" />
-    <Import Project="vsprops\sse2.props" Condition="exists('.\vsprops\sse2.props')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release SSE2|X64'">
     <Import Project="vsprops\common.props" Condition="exists('.\vsprops\common.props')" />
@@ -271,47 +271,47 @@
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release SSSE3|Win32'">
     <Import Project="vsprops\ProjectRootDir.props" Condition="exists('.\vsprops\ProjectRootDir.props')" />
+    <Import Project="vsprops\ssse3.props" Condition="exists('.\vsprops\ssse3.props')" />
     <Import Project="vsprops\common.props" Condition="exists('.\vsprops\common.props')" />
     <Import Project="vsprops\release.props" Condition="exists('.\vsprops\release.props')" />
-    <Import Project="vsprops\ssse3.props" Condition="exists('.\vsprops\ssse3.props')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release SSSE3|X64'">
+    <Import Project="vsprops\ssse3.props" Condition="exists('.\vsprops\ssse3.props')" />
     <Import Project="vsprops\common.props" Condition="exists('.\vsprops\common.props')" />
     <Import Project="vsprops\release.props" Condition="exists('.\vsprops\release.props')" />
-    <Import Project="vsprops\ssse3.props" Condition="exists('.\vsprops\ssse3.props')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug SSSE3|Win32'">
     <Import Project="vsprops\ProjectRootDir.props" Condition="exists('.\vsprops\ProjectRootDir.props')" />
+    <Import Project="vsprops\ssse3.props" Condition="exists('.\vsprops\ssse3.props')" />
     <Import Project="vsprops\common.props" Condition="exists('.\vsprops\common.props')" />
     <Import Project="vsprops\debug.props" Condition="exists('.\vsprops\debug.props')" />
-    <Import Project="vsprops\ssse3.props" Condition="exists('.\vsprops\ssse3.props')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug SSSE3|X64'">
+    <Import Project="vsprops\ssse3.props" Condition="exists('.\vsprops\ssse3.props')" />
     <Import Project="vsprops\common.props" Condition="exists('.\vsprops\common.props')" />
     <Import Project="vsprops\debug.props" Condition="exists('.\vsprops\debug.props')" />
-    <Import Project="vsprops\ssse3.props" Condition="exists('.\vsprops\ssse3.props')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug SSE4|Win32'">
     <Import Project="vsprops\ProjectRootDir.props" Condition="exists('.\vsprops\ProjectRootDir.props')" />
+    <Import Project="vsprops\sse4.props" Condition="exists('.\vsprops\sse4.props')" />
     <Import Project="vsprops\common.props" Condition="exists('.\vsprops\common.props')" />
     <Import Project="vsprops\debug.props" Condition="exists('.\vsprops\debug.props')" />
-    <Import Project="vsprops\sse4.props" Condition="exists('.\vsprops\sse4.props')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug SSE4|X64'">
+    <Import Project="vsprops\sse4.props" Condition="exists('.\vsprops\sse4.props')" />
     <Import Project="vsprops\common.props" Condition="exists('.\vsprops\common.props')" />
     <Import Project="vsprops\debug.props" Condition="exists('.\vsprops\debug.props')" />
-    <Import Project="vsprops\sse4.props" Condition="exists('.\vsprops\sse4.props')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release SSE4|Win32'">
     <Import Project="vsprops\ProjectRootDir.props" Condition="exists('.\vsprops\ProjectRootDir.props')" />
+    <Import Project="vsprops\sse4.props" Condition="exists('.\vsprops\sse4.props')" />
     <Import Project="vsprops\common.props" Condition="exists('.\vsprops\common.props')" />
     <Import Project="vsprops\release.props" Condition="exists('.\vsprops\release.props')" />
-    <Import Project="vsprops\sse4.props" Condition="exists('.\vsprops\sse4.props')" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release SSE4|X64'">
+    <Import Project="vsprops\sse4.props" Condition="exists('.\vsprops\sse4.props')" />
     <Import Project="vsprops\common.props" Condition="exists('.\vsprops\common.props')" />
     <Import Project="vsprops\release.props" Condition="exists('.\vsprops\release.props')" />
-    <Import Project="vsprops\sse4.props" Condition="exists('.\vsprops\sse4.props')" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
diff --git a/plugins/GSdx/vsprops/common.props b/plugins/GSdx/vsprops/common.props
index 0edc67dee6..f2b3e7153f 100644
--- a/plugins/GSdx/vsprops/common.props
+++ b/plugins/GSdx/vsprops/common.props
@@ -3,6 +3,7 @@
     <_PropertySheetDisplayName>common</_PropertySheetDisplayName>
     <OutDir>$(SolutionDir)\bin\$(PcsxSubsection)\</OutDir>
     <IntDir>$(PlatformName)\$(Configuration)\</IntDir>
+    <TargetName>$(ProjectName)-$(SSEtype)</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -15,9 +16,9 @@
       <DisableSpecificWarnings>4995;4324;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>JITProfiling.lib;d3d11_beta.lib;d3dx11.lib;d3d10.lib;d3dx10.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;winmm.lib;strmiids.lib;xinput.lib;cg.lib;cgGL.lib;glut32.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>JITProfiling.lib;d3d11_beta.lib;d3dx11.lib;d3d10.lib;d3d10_1.lib;d3dx10.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;winmm.lib;strmiids.lib;xinput.lib;cg.lib;cgGL.lib;glut32.lib;glew32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>./vtune;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <DelayLoadDLLs>d3d9.dll;d3dx9_41.dll;d3d10.dll;d3dx10_41.dll;d3d11.dll;d3d11_beta.dll;d3dx11_41.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+      <DelayLoadDLLs>d3d9.dll;d3dx9_41.dll;d3d10.dll;d3d10_1.dll;d3dx10_41.dll;d3d11.dll;d3d11_beta.dll;d3dx11_41.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
diff --git a/plugins/GSdx/vsprops/common.vsprops b/plugins/GSdx/vsprops/common.vsprops
index 100fa0e3aa..e88afb9883 100644
--- a/plugins/GSdx/vsprops/common.vsprops
+++ b/plugins/GSdx/vsprops/common.vsprops
@@ -19,6 +19,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		AdditionalDependencies="JITProfiling.lib d3d11_beta.lib d3dx11.lib d3d10_1.lib d3dx10.lib d3d9.lib d3dx9.lib ddraw.lib dxguid.lib winmm.lib strmiids.lib xinput.lib cg.lib cgGL.lib glut32.lib glew32.lib"
+		OutputFile="$(OutDir)\$(ProjectName)-$(SSEtype).dll"
 		AdditionalLibraryDirectories="./vtune"
 		DelayLoadDLLs="d3d9.dll;d3dx9_41.dll;d3d10.dll;d3d10_1.dll;d3dx10_41.dll;d3d11.dll;d3d11_beta.dll;d3dx11_41.dll;cg.dll;cgGL.dll;glut32.dll"
 		GenerateDebugInformation="true"
diff --git a/plugins/GSdx/vsprops/sse2.props b/plugins/GSdx/vsprops/sse2.props
index 593107b5a9..69fb4e9982 100644
--- a/plugins/GSdx/vsprops/sse2.props
+++ b/plugins/GSdx/vsprops/sse2.props
@@ -1,4 +1,7 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+    <SSEtype>SSE2</SSEtype>
+  </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>sse2</_PropertySheetDisplayName>
   </PropertyGroup>
@@ -8,4 +11,9 @@
       <PreprocessorDefinitions>_M_SSE=0x200;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="SSEtype">
+      <Value>$(SSEtype)</Value>
+    </BuildMacro>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/plugins/GSdx/vsprops/sse4.props b/plugins/GSdx/vsprops/sse4.props
index 273b626cee..6f6036ae28 100644
--- a/plugins/GSdx/vsprops/sse4.props
+++ b/plugins/GSdx/vsprops/sse4.props
@@ -1,4 +1,7 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+    <SSEtype>SSE4</SSEtype>
+  </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>sse4</_PropertySheetDisplayName>
   </PropertyGroup>
@@ -8,4 +11,9 @@
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="SSEtype">
+      <Value>$(SSEtype)</Value>
+    </BuildMacro>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/plugins/GSdx/vsprops/ssse3.props b/plugins/GSdx/vsprops/ssse3.props
index 0d1131f6a8..622cdf6ddf 100644
--- a/plugins/GSdx/vsprops/ssse3.props
+++ b/plugins/GSdx/vsprops/ssse3.props
@@ -1,4 +1,7 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="UserMacros">
+    <SSEtype>SSSE3</SSEtype>
+  </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>sse3</_PropertySheetDisplayName>
   </PropertyGroup>
@@ -8,4 +11,9 @@
       <PreprocessorDefinitions>_M_SSE=0x301;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <BuildMacro Include="SSEtype">
+      <Value>$(SSEtype)</Value>
+    </BuildMacro>
+  </ItemGroup>
 </Project>
\ No newline at end of file