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(cr.width(), 1); + int h = std::max(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(cr.width(), 1); + int h = std::max(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(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(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 @@ /> @@ -183,7 +182,6 @@ /> @@ -310,7 +308,6 @@ /> @@ -436,7 +433,6 @@ /> @@ -561,7 +557,6 @@ /> @@ -688,7 +683,6 @@ /> 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 @@ + - @@ -261,9 +261,9 @@ + - @@ -271,47 +271,47 @@ + - + - + - + - + - + - + - + - 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 $(SolutionDir)\bin\$(PcsxSubsection)\ $(PlatformName)\$(Configuration)\ + $(ProjectName)-$(SSEtype) @@ -15,9 +16,9 @@ 4995;4324;%(DisableSpecificWarnings) - 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) + 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) ./vtune;%(AdditionalLibraryDirectories) - d3d9.dll;d3dx9_41.dll;d3d10.dll;d3dx10_41.dll;d3d11.dll;d3d11_beta.dll;d3dx11_41.dll;%(DelayLoadDLLs) + d3d9.dll;d3dx9_41.dll;d3d10.dll;d3d10_1.dll;d3dx10_41.dll;d3d11.dll;d3d11_beta.dll;d3dx11_41.dll;%(DelayLoadDLLs) true Windows false 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 @@ + + SSE2 + <_PropertySheetDisplayName>sse2 @@ -8,4 +11,9 @@ _M_SSE=0x200;%(PreprocessorDefinitions) + + + $(SSEtype) + + \ 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 @@  + + SSE4 + <_PropertySheetDisplayName>sse4 @@ -8,4 +11,9 @@ StreamingSIMDExtensions2 + + + $(SSEtype) + + \ 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 @@  + + SSSE3 + <_PropertySheetDisplayName>sse3 @@ -8,4 +11,9 @@ _M_SSE=0x301;%(PreprocessorDefinitions) + + + $(SSEtype) + + \ No newline at end of file