From ddaa8927264e26edf5e04fe94436c8b7440daba5 Mon Sep 17 00:00:00 2001 From: gabest11 Date: Mon, 1 Jul 2013 21:28:58 +0000 Subject: [PATCH] Removed ATL/MFC dependencies from every project, the free version of visual studio does not have those. It compiles with vs2012 express now, will fix others later, in case they are broken. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5692 96395faa-99c1-11dd-bbfe-3dabce05a288 --- plugins/CDVDolio/cdvd.rc | 11 +- plugins/CDVDolio/resource.h | 5 + plugins/CDVDolio/stdafx.h | 1 - plugins/CDVDolio/vsprops/common.props | 3 +- plugins/GSdx/GSBlock.h | 4 +- plugins/GSdx/GSCaptureDlg.cpp | 6 +- plugins/GSdx/GSCaptureDlg.h | 2 +- plugins/GSdx/GSClut.cpp | 19 ++ plugins/GSdx/GSRasterizer.cpp | 194 ++++++++++++++++++ plugins/GSdx/GSRasterizer.h | 4 + plugins/GSdx/GSRendererHW.cpp | 11 + plugins/GSdx/GSRendererSW.cpp | 32 ++- plugins/GSdx/GSState.cpp | 1 + plugins/GSdx/GSVector.h | 26 +-- plugins/GSdx/GSVertexArrayOGL.h | 2 +- plugins/GSdx/GSVertexSW.h | 34 ++- plugins/GSdx/GSdx.rc | 20 +- plugins/GSdx/GSdx_vs11.vcxproj | 2 + plugins/GSdx/GSdx_vs11.vcxproj.filters | 6 + plugins/GSdx/baseclasses/streams.h | 2 +- plugins/GSdx/resource.h | 4 + plugins/GSdx/stdafx.h | 27 +-- plugins/GSdx/targetver.h | 35 ++++ plugins/GSdx/vsprops/common.props | 6 +- plugins/SSSPSXPAD/PadSSSPSX.rc | 9 +- plugins/SSSPSXPAD/PadSSSPSXres.h | 5 + plugins/USBqemu/Win32/USBqemu.rc | 9 +- plugins/USBqemu/Win32/resource.h | 5 + .../cdvdGigaherz/src/Windows/cdvdGigaherz.rc | 9 +- plugins/cdvdGigaherz/src/Windows/resource.h | 5 + plugins/dev9ghzdrk/Win32/DEV9ghzdrk.rc | 9 +- plugins/dev9ghzdrk/Win32/resource.h | 5 + plugins/spu2-x/src/Windows/SndOut_XAudio2.cpp | 2 +- .../spu2-x/src/Windows/Spu2-X_vs11.vcxproj | 8 +- plugins/xpad/resource.h | 3 + plugins/xpad/stdafx.h | 1 - plugins/xpad/vsprops/common.props | 2 + plugins/xpad/xpad.rc | 11 +- plugins/zerogs/dx/Windows/zerogs_vs11.vcxproj | 12 +- plugins/zzogl-pg-cg/opengl/Win32/resource.h | 5 + plugins/zzogl-pg-cg/opengl/Win32/zerogs.rc | 8 +- .../opengl/Win32/zerogsogl-cg_vs11.vcxproj | 12 +- plugins/zzogl-pg/opengl/Win32/resource.h | 5 + plugins/zzogl-pg/opengl/Win32/zerogs.rc | 8 +- .../opengl/Win32/zerogsogl_vs11.vcxproj | 12 +- 45 files changed, 469 insertions(+), 133 deletions(-) create mode 100644 plugins/GSdx/targetver.h diff --git a/plugins/CDVDolio/cdvd.rc b/plugins/CDVDolio/cdvd.rc index 9df8f32b41..d8052fb412 100644 --- a/plugins/CDVDolio/cdvd.rc +++ b/plugins/CDVDolio/cdvd.rc @@ -7,8 +7,9 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" - +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +35,9 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" "\0" END @@ -49,7 +52,6 @@ BEGIN "LANGUAGE 9, 1\r\n" "#pragma code_page(1252)\r\n" "#include ""res\\cdvd.rc2"" // non-Microsoft Visual C++ edited resources\r\n" - "#include ""afxres.rc"" // Standard components\r\n" "#endif\r\n" "\0" END @@ -166,7 +168,6 @@ END LANGUAGE 9, 1 #pragma code_page(1252) #include "res\cdvd.rc2" // non-Microsoft Visual C++ edited resources -#include "afxres.rc" // Standard components #endif ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/CDVDolio/resource.h b/plugins/CDVDolio/resource.h index 3a3bb1572d..511e71dce7 100644 --- a/plugins/CDVDolio/resource.h +++ b/plugins/CDVDolio/resource.h @@ -2,6 +2,11 @@ // Microsoft Visual C++ generated include file. // Used by cdvd.rc // + +#ifndef IDC_STATIC +#define IDC_STATIC -1 +#endif + #define IDC_COMBO1 2000 #define IDC_RADIO1 2001 #define IDC_EDIT1 2003 diff --git a/plugins/CDVDolio/stdafx.h b/plugins/CDVDolio/stdafx.h index 99852e9541..09b72ee6b9 100644 --- a/plugins/CDVDolio/stdafx.h +++ b/plugins/CDVDolio/stdafx.h @@ -38,7 +38,6 @@ #include #include #include -#include #include #endif diff --git a/plugins/CDVDolio/vsprops/common.props b/plugins/CDVDolio/vsprops/common.props index cffce2ea80..fc08aac80e 100644 --- a/plugins/CDVDolio/vsprops/common.props +++ b/plugins/CDVDolio/vsprops/common.props @@ -16,9 +16,8 @@ 4995;4324;%(DisableSpecificWarnings) - d3d10.lib;d3dx10.lib;d3d9.lib;d3dx9.lib;dxguid.lib;winmm.lib;strmiids.lib;xinput.lib;%(AdditionalDependencies) + winmm.lib;%(AdditionalDependencies) ..\..\bin\plugins\$(ProjectName).dll - d3d9.dll;d3dx9_43.dll;d3d10.dll;d3dx10_43.dll;%(DelayLoadDLLs) true Windows false diff --git a/plugins/GSdx/GSBlock.h b/plugins/GSdx/GSBlock.h index 63cb348fe5..a18f597299 100644 --- a/plugins/GSdx/GSBlock.h +++ b/plugins/GSdx/GSBlock.h @@ -489,7 +489,7 @@ public: template __forceinline static void ReadColumn16(const uint8* RESTRICT src, uint8* RESTRICT dst, int dstpitch) { #if _M_SSE >= 0x501 - + const GSVector8i* s = (const GSVector8i*)src; GSVector8i v0 = s[i * 2 + 0].shuffle8(m_r16mask); @@ -1881,7 +1881,7 @@ public: d1[0] = Expand16to32(v1.upl16(v1), TA0, TA1); d1[1] = Expand16to32(v1.uph16(v1), TA0, TA1); } - + #elif 0 // not faster const GSVector4i* s = (const GSVector4i*)src; diff --git a/plugins/GSdx/GSCaptureDlg.cpp b/plugins/GSdx/GSCaptureDlg.cpp index beab58e430..c7b1415448 100644 --- a/plugins/GSdx/GSCaptureDlg.cpp +++ b/plugins/GSdx/GSCaptureDlg.cpp @@ -99,9 +99,9 @@ void GSCaptureDlg::OnInit() if(FAILED(moniker->BindToStorage(0, 0, IID_IPropertyBag, (void**)&pPB))) continue; - CComVariant var; + _variant_t var; - if(FAILED(pPB->Read(CComBSTR(_T("FriendlyName")), &var, NULL))) + if(FAILED(pPB->Read(_bstr_t(_T("FriendlyName")), &var, NULL))) continue; c.FriendlyName = prefix + var.bstrVal; @@ -199,7 +199,7 @@ bool GSCaptureDlg::OnCommand(HWND hWnd, UINT id, UINT code) if (ris != 2) { - wstring s = wstring(c.DisplayName.m_str); + wstring s = wstring(c.DisplayName); theApp.SetConfig("CaptureVideoCodecDisplayName", string(s.begin(), s.end()).c_str()); } diff --git a/plugins/GSdx/GSCaptureDlg.h b/plugins/GSdx/GSCaptureDlg.h index eaa6fefbc4..58773750d8 100644 --- a/plugins/GSdx/GSCaptureDlg.h +++ b/plugins/GSdx/GSCaptureDlg.h @@ -32,7 +32,7 @@ class GSCaptureDlg : public GSDialog CComPtr moniker; CComPtr filter; wstring FriendlyName; - CComBSTR DisplayName; + _bstr_t DisplayName; }; list m_codecs; diff --git a/plugins/GSdx/GSClut.cpp b/plugins/GSdx/GSClut.cpp index 2526df48d9..cf913b3279 100644 --- a/plugins/GSdx/GSClut.cpp +++ b/plugins/GSdx/GSClut.cpp @@ -415,6 +415,23 @@ __forceinline void GSClut::WriteCLUT_T32_I4_CSM1(const uint32* RESTRICT src, uin { // 1 block + #if _M_SSE >= 0x501 + + GSVector8i* s = (GSVector8i*)src; + GSVector8i* d = (GSVector8i*)clut; + + GSVector8i v0 = s[0].acbd(); + GSVector8i v1 = s[1].acbd(); + + GSVector8i::sw16(v0, v1); + GSVector8i::sw16(v0, v1); + GSVector8i::sw16(v0, v1); + + d[0] = v0; + d[16] = v1; + + #else + GSVector4i* s = (GSVector4i*)src; GSVector4i* d = (GSVector4i*)clut; @@ -431,6 +448,8 @@ __forceinline void GSClut::WriteCLUT_T32_I4_CSM1(const uint32* RESTRICT src, uin d[1] = v2; d[32] = v1; d[33] = v3; + + #endif } void GSClut::WriteCLUT_T16_I8_CSM1(const uint16* RESTRICT src, uint16* RESTRICT clut) diff --git a/plugins/GSdx/GSRasterizer.cpp b/plugins/GSdx/GSRasterizer.cpp index 9a1416d784..3462ab4082 100644 --- a/plugins/GSdx/GSRasterizer.cpp +++ b/plugins/GSdx/GSRasterizer.cpp @@ -383,6 +383,198 @@ static const uint8 s_ysort[8][4] = {2, 1, 0, 0}, // y2 < y1 < y0 }; +#if _M_SSE >= 0x501 + +void GSRasterizer::DrawTriangle(const GSVertexSW* vertex, const uint32* index) +{ + GSVertexSW2 dv[3]; + GSVertexSW2 edge; + GSVertexSW2 dedge; + GSVertexSW2 dscan; + + GSVector4 y0011 = vertex[index[0]].p.yyyy(vertex[index[1]].p); + GSVector4 y1221 = vertex[index[1]].p.yyyy(vertex[index[2]].p).xzzx(); + + int m1 = (y0011 > y1221).mask() & 7; + + int i[3]; + + i[0] = index[s_ysort[m1][0]]; + i[1] = index[s_ysort[m1][1]]; + i[2] = index[s_ysort[m1][2]]; + + const GSVertexSW2* _v = (const GSVertexSW2*)vertex; + + const GSVertexSW2& v0 = _v[i[0]]; + const GSVertexSW2& v1 = _v[i[1]]; + const GSVertexSW2& v2 = _v[i[2]]; + + y0011 = v0.p.yyyy(v1.p); + y1221 = v1.p.yyyy(v2.p).xzzx(); + + m1 = (y0011 == y1221).mask() & 7; + + // if(i == 0) => y0 < y1 < y2 + // if(i == 1) => y0 == y1 < y2 + // if(i == 4) => y0 < y1 == y2 + + if(m1 == 7) return; // y0 == y1 == y2 + + GSVector4 tbf = y0011.xzxz(y1221).ceil(); + GSVector4 tbmax = tbf.max(m_fscissor_y); + GSVector4 tbmin = tbf.min(m_fscissor_y); + GSVector4i tb = GSVector4i(tbmax.xzyw(tbmin)); // max(y0, t) max(y1, t) min(y1, b) min(y2, b) + + dv[0] = v1 - v0; + dv[1] = v2 - v0; + dv[2] = v2 - v1; + + GSVector4 cross = dv[0].p * dv[1].p.yxwz(); + + cross = (cross - cross.yxwz()).yyyy(); // select the second component, the negated cross product + + // the longest horizontal span would be cross.x / dv[1].p.y, but we don't need its actual value + + int m2 = cross.upl(cross == GSVector4::zero()).mask(); + + if(m2 & 2) return; + + m2 &= 1; + + cross = cross.rcpnr(); + + GSVector4 dxy01 = dv[0].p.xyxy(dv[1].p); + + GSVector4 dx = dxy01.xzxy(dv[2].p); + GSVector4 dy = dxy01.ywyx(dv[2].p); + + GSVector4 ddx[3]; + + ddx[0] = dx / dy; + ddx[1] = ddx[0].yxzw(); + ddx[2] = ddx[0].xzyw(); + + GSVector8 _dxy01c(dxy01 * cross); + + /* + dscan = dv[1] * dxy01c.yyyy() - dv[0] * dxy01c.wwww(); + dedge = dv[0] * dxy01c.zzzz() - dv[1] * dxy01c.xxxx(); + */ + + dscan.p = dv[1].p * _dxy01c.yyyy().extract<0>() - dv[0].p * _dxy01c.wwww().extract<0>(); + dscan.tc = dv[1].tc * _dxy01c.yyyy() - dv[0].tc * _dxy01c.wwww(); + + dedge.p = dv[0].p * _dxy01c.zzzz().extract<0>() - dv[1].p * _dxy01c.xxxx().extract<0>(); + dedge.tc = dv[0].tc * _dxy01c.zzzz() - dv[1].tc * _dxy01c.xxxx(); + + if(m1 & 1) + { + if(tb.y < tb.w) + { + edge = _v[i[1 - m2]]; + + edge.p = edge.p.insert32<0, 1>(vertex[i[m2]].p); + dedge.p = ddx[2 - (m2 << 1)].yzzw(dedge.p); + + DrawTriangleSection(tb.x, tb.w, edge, dedge, dscan, vertex[i[1 - m2]].p); + } + } + else + { + if(tb.x < tb.z) + { + edge = v0; + + edge.p = edge.p.xxzw(); + dedge.p = ddx[m2].xyzw(dedge.p); + + DrawTriangleSection(tb.x, tb.z, edge, dedge, dscan, v0.p); + } + + if(tb.y < tb.w) + { + edge = v1; + + edge.p = (v0.p.xxxx() + ddx[m2] * dv[0].p.yyyy()).xyzw(edge.p); + dedge.p = ddx[2 - (m2 << 1)].yzzw(dedge.p); + + DrawTriangleSection(tb.y, tb.w, edge, dedge, dscan, v1.p); + } + } + + Flush(vertex, index, (GSVertexSW&)dscan); + + if(m_ds->HasEdge()) + { + GSVector4 a = dx.abs() < dy.abs(); // |dx| <= |dy| + GSVector4 b = dx < GSVector4::zero(); // dx < 0 + GSVector4 c = cross < GSVector4::zero(); // longest.p.x < 0 + + int orientation = a.mask(); + int side = ((a | b) ^ c).mask() ^ 2; // evil + + DrawEdge((GSVertexSW&)v0, (GSVertexSW&)v1, (GSVertexSW&)dv[0], orientation & 1, side & 1); + DrawEdge((GSVertexSW&)v0, (GSVertexSW&)v2, (GSVertexSW&)dv[1], orientation & 2, side & 2); + DrawEdge((GSVertexSW&)v1, (GSVertexSW&)v2, (GSVertexSW&)dv[2], orientation & 4, side & 4); + + Flush(vertex, index, GSVertexSW::zero(), true); + } +} + +void GSRasterizer::DrawTriangleSection(int top, int bottom, GSVertexSW2& edge, const GSVertexSW2& dedge, const GSVertexSW2& dscan, const GSVector4& p0) +{ + ASSERT(top < bottom); + ASSERT(edge.p.x <= edge.p.y); + + GSVertexSW* RESTRICT e = &m_edge.buff[m_edge.count]; + + GSVector4 scissor = m_fscissor_x; + + top = FindMyNextScanline(top); + + while(top < bottom) + { + GSVector8 dy(GSVector4(top) - p0.yyyy()); + + GSVertexSW2 scan; + + scan.p = edge.p + dedge.p * dy.extract<0>(); + + GSVector4 lrf = scan.p.ceil(); + GSVector4 l = lrf.max(scissor); + GSVector4 r = lrf.min(scissor); + GSVector4i lr = GSVector4i(l.xxyy(r)); + + int left = lr.extract32<0>(); + int right = lr.extract32<2>(); + + int pixels = right - left; + + if(pixels > 0) + { + scan.tc = edge.tc + dedge.tc * dy; + + GSVector8 prestep((l - p0).xxxx()); + + scan.p = scan.p + dscan.p * prestep.extract<0>(); + scan.tc = scan.tc + dscan.tc * prestep; + + AddScanline(e++, pixels, left, top, (GSVertexSW&)scan); + } + + top++; + + if(!IsOneOfMyScanlines(top)) + { + top += (m_threads - 1) << THREAD_HEIGHT; + } + } + + m_edge.count += e - &m_edge.buff[m_edge.count]; +} + +#else + void GSRasterizer::DrawTriangle(const GSVertexSW* vertex, const uint32* index) { GSVertexSW dv[3]; @@ -573,6 +765,8 @@ void GSRasterizer::DrawTriangleSection(int top, int bottom, GSVertexSW& edge, co m_edge.count += e - &m_edge.buff[m_edge.count]; } +#endif + void GSRasterizer::DrawSprite(const GSVertexSW* vertex, const uint32* index) { const GSVertexSW& v0 = vertex[index[0]]; diff --git a/plugins/GSdx/GSRasterizer.h b/plugins/GSdx/GSRasterizer.h index 63279c47d5..998a744512 100644 --- a/plugins/GSdx/GSRasterizer.h +++ b/plugins/GSdx/GSRasterizer.h @@ -144,7 +144,11 @@ protected: void DrawTriangle(const GSVertexSW* vertex, const uint32* index); void DrawSprite(const GSVertexSW* vertex, const uint32* index); + #if _M_SSE >= 0x501 + __forceinline void DrawTriangleSection(int top, int bottom, GSVertexSW2& edge, const GSVertexSW2& dedge, const GSVertexSW2& dscan, const GSVector4& p0); + #else __forceinline void DrawTriangleSection(int top, int bottom, GSVertexSW& edge, const GSVertexSW& dedge, const GSVertexSW& dscan, const GSVector4& p0); + #endif void DrawEdge(const GSVertexSW& v0, const GSVertexSW& v1, const GSVertexSW& dv, int orientation, int side); diff --git a/plugins/GSdx/GSRendererHW.cpp b/plugins/GSdx/GSRendererHW.cpp index 963fe0cd68..dcc5d94ea3 100644 --- a/plugins/GSdx/GSRendererHW.cpp +++ b/plugins/GSdx/GSRendererHW.cpp @@ -202,11 +202,17 @@ void GSRendererHW::Draw() if(PRIM->TME) { + /* + + // m_tc->LookupSource will mess with the palette, should not, but we do this after, until it is sorted out + if(GSLocalMemory::m_psm[context->TEX0.PSM].pal > 0) { m_mem.m_clut.Read32(context->TEX0, env.TEXA); } + */ + GSVector4i r; GetTextureMinMax(r, context->TEX0, context->CLAMP, m_vt.IsLinear()); @@ -214,6 +220,11 @@ void GSRendererHW::Draw() tex = m_tc->LookupSource(context->TEX0, env.TEXA, r); if(!tex) return; + + if(GSLocalMemory::m_psm[context->TEX0.PSM].pal > 0) + { + m_mem.m_clut.Read32(context->TEX0, env.TEXA); + } } if(s_dump) diff --git a/plugins/GSdx/GSRendererSW.cpp b/plugins/GSdx/GSRendererSW.cpp index deb4db37f5..8fa64358b9 100644 --- a/plugins/GSdx/GSRendererSW.cpp +++ b/plugins/GSdx/GSRendererSW.cpp @@ -309,30 +309,28 @@ void GSRendererSW::ConvertVertexBuffer(GSVertexSW* RESTRICT dst, const GSVertex* { t = t.insert32<1, 3>(GSVector8::cast(xyzuvf)); } -/* - if(tme || primclass == GS_SPRITE_CLASS) + + GSVector8::storel(&dst[0].p, p); + + if(tme || primclass == GS_SPRITE_CLASS) { - GSVector8::store(&dst[0].p, p.ac(t)); + GSVector8::store(&dst[0].t, t.ac(c)); } - else + else { - GSVector8::storel(&dst[0].p, p); + GSVector8::storel(&dst[0].c, c); } -*/ - GSVector8::store(&dst[0].p, p.ac(t)); - GSVector8::store(&dst[0].c, c.a_()); -/* - if(tme || primclass == GS_SPRITE_CLASS) + + GSVector8::storeh(&dst[1].p, p); + + if(tme || primclass == GS_SPRITE_CLASS) { - GSVector8::store(&dst[1].p, p.bd(t)); + GSVector8::store(&dst[1].t, t.bd(c)); } - else + else { - GSVector8::storeh(&dst[1].p, p); + GSVector8::storeh(&dst[1].c, c); } -*/ - GSVector8::store(&dst[1].p, p.bd(t)); - GSVector8::store(&dst[1].c, c.b_()); } #else @@ -419,7 +417,7 @@ void GSRendererSW::Draw() shared_ptr data(sd); sd->primclass = m_vt.m_primclass; - sd->buff = (uint8*)_aligned_malloc(sizeof(GSVertexSW) * ((m_vertex.next + 1) & ~1) + sizeof(uint32) * m_index.tail, 32); + sd->buff = (uint8*)_aligned_malloc(sizeof(GSVertexSW) * ((m_vertex.next + 1) & ~1) + sizeof(uint32) * m_index.tail, 64); sd->vertex = (GSVertexSW*)sd->buff; sd->vertex_count = m_vertex.next; sd->index = (uint32*)(sd->buff + sizeof(GSVertexSW) * ((m_vertex.next + 1) & ~1)); diff --git a/plugins/GSdx/GSState.cpp b/plugins/GSdx/GSState.cpp index ea4d4d9ce9..7f6f7bba60 100644 --- a/plugins/GSdx/GSState.cpp +++ b/plugins/GSdx/GSState.cpp @@ -1189,6 +1189,7 @@ template void GSState::GIFRegHandlerFRAME(const GIFReg* RESTRICT r) } m_env.CTXT[i].FRAME = (GSVector4i)r->FRAME; + #ifdef DISABLE_BITMASKING m_env.CTXT[i].FRAME.FBMSK = GSVector4i::store(GSVector4i::load((int)m_env.CTXT[i].FRAME.FBMSK).eq8(GSVector4i::xffffffff())); #endif diff --git a/plugins/GSdx/GSVector.h b/plugins/GSdx/GSVector.h index 82c4170ded..c7d28e63ae 100644 --- a/plugins/GSdx/GSVector.h +++ b/plugins/GSdx/GSVector.h @@ -3387,15 +3387,7 @@ public: __forceinline void operator = (__m128i m) { - #if 0 // _MSC_VER >= 1700 - - this->m = _mm256_permute2x128_si256(_mm256_castsi128_si256(m), _mm256_castsi128_si256(m), 0); - - #else - - *this = zero().insert<0>(m).aa(); - - #endif + this->m = _mm256_inserti128_si256(_mm256_castsi128_si256(m), m, 1); } __forceinline void operator = (__m256i m) @@ -5206,15 +5198,7 @@ public: __forceinline void operator = (__m128 m) { - #if 0 // _MSC_VER >= 1700 - - this->m = _mm256_permute2f128_ps(_mm256_castps128_ps256(m), _mm256_castps128_ps256(m), 0x20); - - #else - - this->m = zero().insert<0>(m).aa(); - - #endif + this->m = _mm256_insertf128_ps(_mm256_castps128_ps256(m), m, 1); } __forceinline void operator = (__m256 m) @@ -5803,10 +5787,14 @@ public: // z = v[95:64] / v[223:192] // w = v[127:96] / v[255:224] + #define VECTOR8_SHUFFLE_4(xs, xn, ys, yn, zs, zn, ws, wn) \ - __forceinline GSVector8 xs##ys##zs##ws() const {return GSVector8(_mm256_permute_ps(m, _MM_SHUFFLE(wn, zn, yn, xn)));} \ + __forceinline GSVector8 xs##ys##zs##ws() const {return GSVector8(_mm256_shuffle_ps(m, m, _MM_SHUFFLE(wn, zn, yn, xn)));} \ __forceinline GSVector8 xs##ys##zs##ws(const GSVector8& v) const {return GSVector8(_mm256_shuffle_ps(m, v.m, _MM_SHUFFLE(wn, zn, yn, xn)));} \ + // vs2012u3 cannot reuse the result of equivalent shuffles when it is done with _mm256_permute_ps (write v.xxxx() twice, and it will do it twice), but with _mm256_shuffle_ps it can. + //__forceinline GSVector8 xs##ys##zs##ws() const {return GSVector8(_mm256_permute_ps(m, _MM_SHUFFLE(wn, zn, yn, xn)));} \ + #define VECTOR8_SHUFFLE_3(xs, xn, ys, yn, zs, zn) \ VECTOR8_SHUFFLE_4(xs, xn, ys, yn, zs, zn, x, 0) \ VECTOR8_SHUFFLE_4(xs, xn, ys, yn, zs, zn, y, 1) \ diff --git a/plugins/GSdx/GSVertexArrayOGL.h b/plugins/GSdx/GSVertexArrayOGL.h index 1b7fb65058..827a049cbf 100644 --- a/plugins/GSdx/GSVertexArrayOGL.h +++ b/plugins/GSdx/GSVertexArrayOGL.h @@ -46,7 +46,7 @@ class GSBufferOGL { , m_count(0) , m_limit(0) , m_target(target) - , m_sub_data_config((bool)theApp.GetConfig("ogl_vertex_subdata", 1)) + , m_sub_data_config(theApp.GetConfig("ogl_vertex_subdata", 1) != 0) { gl_GenBuffers(1, &m_buffer); // Opengl works best with 1-4MB buffer. diff --git a/plugins/GSdx/GSVertexSW.h b/plugins/GSdx/GSVertexSW.h index 45de367d6c..0d977658d7 100644 --- a/plugins/GSdx/GSVertexSW.h +++ b/plugins/GSdx/GSVertexSW.h @@ -25,7 +25,7 @@ __aligned(struct, 32) GSVertexSW { - GSVector4 p, t, c, _pad; + GSVector4 p, _pad, t, c; __forceinline GSVertexSW() {} __forceinline GSVertexSW(const GSVertexSW& v) {*this = v;} @@ -233,4 +233,34 @@ __aligned(struct, 32) GSVertexSW #endif } -}; \ No newline at end of file +}; + +#if _M_SSE >= 0x501 + +__aligned(struct, 32) GSVertexSW2 +{ + GSVector4 p, _pad; + GSVector8 tc; + + __forceinline GSVertexSW2() {} + __forceinline GSVertexSW2(const GSVertexSW2& v) {*this = v;} + + __forceinline void operator = (const GSVertexSW2& v) + { + p = v.p; + tc = v.tc; + } + + __forceinline friend GSVertexSW2 operator - (const GSVertexSW2& a, const GSVertexSW2& b) + { + GSVertexSW2 v; + + v.p = a.p - b.p; + v.tc = a.tc - b.tc; + + return v; + } +}; + +#endif + diff --git a/plugins/GSdx/GSdx.rc b/plugins/GSdx/GSdx.rc index 0b293f825e..61f62a8b7b 100644 --- a/plugins/GSdx/GSdx.rc +++ b/plugins/GSdx/GSdx.rc @@ -7,17 +7,17 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" - +#ifndef APSTUDIO_INVOKED +#include "targetver.h" +#endif +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// English (United States) resources - #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -32,7 +32,13 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\0" + "#ifndef APSTUDIO_INVOKED\r\n" + "#include ""targetver.h""\r\n" + "#endif\r\n" + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "\0" END 3 TEXTINCLUDE diff --git a/plugins/GSdx/GSdx_vs11.vcxproj b/plugins/GSdx/GSdx_vs11.vcxproj index 5e11c30087..7f797fb92c 100644 --- a/plugins/GSdx/GSdx_vs11.vcxproj +++ b/plugins/GSdx/GSdx_vs11.vcxproj @@ -1925,6 +1925,7 @@ + @@ -2037,6 +2038,7 @@ + diff --git a/plugins/GSdx/GSdx_vs11.vcxproj.filters b/plugins/GSdx/GSdx_vs11.vcxproj.filters index 3bef440ea7..379a6a1773 100644 --- a/plugins/GSdx/GSdx_vs11.vcxproj.filters +++ b/plugins/GSdx/GSdx_vs11.vcxproj.filters @@ -692,6 +692,12 @@ Header Files + + Header Files + + + Header Files + diff --git a/plugins/GSdx/baseclasses/streams.h b/plugins/GSdx/baseclasses/streams.h index c0f34dbee4..35b2dee3d6 100644 --- a/plugins/GSdx/baseclasses/streams.h +++ b/plugins/GSdx/baseclasses/streams.h @@ -175,7 +175,7 @@ typedef struct { #include #define NO_SHLWAPI_STRFCNS -#include +//#include #include #ifndef NUMELMS diff --git a/plugins/GSdx/resource.h b/plugins/GSdx/resource.h index a4b56979f5..5c99b9c192 100644 --- a/plugins/GSdx/resource.h +++ b/plugins/GSdx/resource.h @@ -23,6 +23,10 @@ * */ +#ifndef IDC_STATIC +#define IDC_STATIC -1 +#endif + #define IDC_NATIVERES 2001 #define IDC_PALTEX 2003 #define IDC_LOGZ 2004 diff --git a/plugins/GSdx/stdafx.h b/plugins/GSdx/stdafx.h index 6be11e4b66..15a8c526e1 100644 --- a/plugins/GSdx/stdafx.h +++ b/plugins/GSdx/stdafx.h @@ -29,29 +29,7 @@ #ifdef _WINDOWS -// The following macros define the minimum required platform. The minimum required platform -// is the earliest version of Windows, Internet Explorer etc. that has the necessary features to run -// your application. The macros work by enabling all features available on platform versions up to and -// including the version specified. - -// Modify the following defines if you have to target a platform prior to the ones specified below. -// Refer to MSDN for the latest info on corresponding values for different platforms. - -#ifndef WINVER // Specifies that the minimum required platform is Windows Vista. -#define WINVER 0x0600 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINNT // Specifies that the minimum required platform is Windows Vista. -#define _WIN32_WINNT 0x0600 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINDOWS // Specifies that the minimum required platform is Windows 98. -#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later. -#endif - -#ifndef _WIN32_IE // Specifies that the minimum required platform is Internet Explorer 7.0. -#define _WIN32_IE 0x0700 // Change this to the appropriate value to target other versions of IE. -#endif +#include "targetver.h" #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers @@ -59,11 +37,12 @@ #include #include #include -#include #include #include #include #include +#include +#include "../../common/include/comptr.h" #define D3DCOLORWRITEENABLE_RGBA (D3DCOLORWRITEENABLE_RED | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_BLUE | D3DCOLORWRITEENABLE_ALPHA) #define D3D11_SHADER_MACRO D3D10_SHADER_MACRO diff --git a/plugins/GSdx/targetver.h b/plugins/GSdx/targetver.h new file mode 100644 index 0000000000..e89afe1a02 --- /dev/null +++ b/plugins/GSdx/targetver.h @@ -0,0 +1,35 @@ +#pragma once +/* +// Including SDKDDKVer.h defines the highest available Windows platform. + +// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and +// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h. + +#include +*/ + +// The following macros define the minimum required platform. The minimum required platform +// is the earliest version of Windows, Internet Explorer etc. that has the necessary features to run +// your application. The macros work by enabling all features available on platform versions up to and +// including the version specified. + +// Modify the following defines if you have to target a platform prior to the ones specified below. +// Refer to MSDN for the latest info on corresponding values for different platforms. + +#ifndef WINVER // Specifies that the minimum required platform is Windows Vista. +#define WINVER 0x0600 // Change this to the appropriate value to target other versions of Windows. +#endif + +#ifndef _WIN32_WINNT // Specifies that the minimum required platform is Windows Vista. +#define _WIN32_WINNT 0x0600 // Change this to the appropriate value to target other versions of Windows. +#endif + +#ifndef _WIN32_WINDOWS // Specifies that the minimum required platform is Windows 98. +#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later. +#endif + +#ifndef _WIN32_IE // Specifies that the minimum required platform is Internet Explorer 7.0. +#define _WIN32_IE 0x0700 // Change this to the appropriate value to target other versions of IE. +#endif + +#include diff --git a/plugins/GSdx/vsprops/common.props b/plugins/GSdx/vsprops/common.props index eeb8133a91..71bf73f281 100644 --- a/plugins/GSdx/vsprops/common.props +++ b/plugins/GSdx/vsprops/common.props @@ -13,12 +13,12 @@ false Level4 ProgramDatabase - 4996;4995;4324;4100;4101;4201;4556;%(DisableSpecificWarnings) + 4996;4995;4324;4100;4101;4201;4556;4127;4512;%(DisableSpecificWarnings) $(DXSDK_DIR)include;$(VTUNE_AMPLIFIER_XE_2013_DIR)include;$(SolutionDir)3rdparty;%(AdditionalIncludeDirectories) true - d3d11.lib;d3dx11.lib;d3d10_1.lib;d3dx10.lib;d3d9.lib;d3dx9.lib;dxgi.lib;dxguid.lib;winmm.lib;strmiids.lib;xinput.lib;opengl32.lib;%(AdditionalDependencies) + d3d11.lib;d3dx11.lib;d3d10_1.lib;d3dx10.lib;d3d9.lib;d3dx9.lib;dxgi.lib;dxguid.lib;winmm.lib;strmiids.lib;xinput.lib;opengl32.lib;comsuppw.lib;%(AdditionalDependencies) d3d9.dll;d3dx9_43.dll;d3d11.dll;d3dx11_43.dll;dxgi.dll;opengl32.dll;%(DelayLoadDLLs) true Windows @@ -32,4 +32,4 @@ "$(SvnCommonDir)\vsprops\preBuild.cmd" "$(ProjectRootDir)" - + \ No newline at end of file diff --git a/plugins/SSSPSXPAD/PadSSSPSX.rc b/plugins/SSSPSXPAD/PadSSSPSX.rc index 07ff433ba8..311ea56b70 100644 --- a/plugins/SSSPSXPAD/PadSSSPSX.rc +++ b/plugins/SSSPSXPAD/PadSSSPSX.rc @@ -7,8 +7,9 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" - +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +35,9 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" "\0" END diff --git a/plugins/SSSPSXPAD/PadSSSPSXres.h b/plugins/SSSPSXPAD/PadSSSPSXres.h index 0174832332..0345c8e76b 100644 --- a/plugins/SSSPSXPAD/PadSSSPSXres.h +++ b/plugins/SSSPSXPAD/PadSSSPSXres.h @@ -2,6 +2,11 @@ // Microsoft Visual C++ generated include file. // Used by PadSSSPSX.rc // + +#ifndef IDC_STATIC +#define IDC_STATIC -1 +#endif + #define IDD_DIALOG1 100 #define IDC_BSELECT 1000 #define IDC_BL3 1001 diff --git a/plugins/USBqemu/Win32/USBqemu.rc b/plugins/USBqemu/Win32/USBqemu.rc index ac4e99e066..88eb6f1bbf 100644 --- a/plugins/USBqemu/Win32/USBqemu.rc +++ b/plugins/USBqemu/Win32/USBqemu.rc @@ -7,8 +7,9 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" - +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +35,9 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" "\0" END diff --git a/plugins/USBqemu/Win32/resource.h b/plugins/USBqemu/Win32/resource.h index 890edd5a7a..943cfbe1c8 100644 --- a/plugins/USBqemu/Win32/resource.h +++ b/plugins/USBqemu/Win32/resource.h @@ -2,6 +2,11 @@ // Microsoft Visual C++ generated include file. // Used by USBqemu.rc // + +#ifndef IDC_STATIC +#define IDC_STATIC -1 +#endif + #define IDD_CONFDLG 101 #define IDD_CONFIG 101 #define IDD_ABOUT 103 diff --git a/plugins/cdvdGigaherz/src/Windows/cdvdGigaherz.rc b/plugins/cdvdGigaherz/src/Windows/cdvdGigaherz.rc index 4c1dd43508..d1d26c2897 100644 --- a/plugins/cdvdGigaherz/src/Windows/cdvdGigaherz.rc +++ b/plugins/cdvdGigaherz/src/Windows/cdvdGigaherz.rc @@ -7,8 +7,9 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" - +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +35,9 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" "\0" END diff --git a/plugins/cdvdGigaherz/src/Windows/resource.h b/plugins/cdvdGigaherz/src/Windows/resource.h index 30e178c529..64efd1e4d2 100644 --- a/plugins/cdvdGigaherz/src/Windows/resource.h +++ b/plugins/cdvdGigaherz/src/Windows/resource.h @@ -2,6 +2,11 @@ // Microsoft Visual C++ generated include file. // Used by cdvd.rc // + +#ifndef IDC_STATIC +#define IDC_STATIC -1 +#endif + #define IDD_CONFIG 101 #define IDC_PLUGINS 1000 #define IDC_CONFIGURE 1001 diff --git a/plugins/dev9ghzdrk/Win32/DEV9ghzdrk.rc b/plugins/dev9ghzdrk/Win32/DEV9ghzdrk.rc index 2013fd27cf..89ea6a9cf2 100644 --- a/plugins/dev9ghzdrk/Win32/DEV9ghzdrk.rc +++ b/plugins/dev9ghzdrk/Win32/DEV9ghzdrk.rc @@ -7,8 +7,9 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" - +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +35,9 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" "\0" END diff --git a/plugins/dev9ghzdrk/Win32/resource.h b/plugins/dev9ghzdrk/Win32/resource.h index c1a6c820e6..43cdef498b 100644 --- a/plugins/dev9ghzdrk/Win32/resource.h +++ b/plugins/dev9ghzdrk/Win32/resource.h @@ -2,6 +2,11 @@ // Microsoft Developer Studio generated include file. // Used by DEV9linuz.rc // + +#ifndef IDC_STATIC +#define IDC_STATIC -1 +#endif + #define IDD_CONFDLG 101 #define IDD_CONFIG 101 #define IDD_ABOUT 103 diff --git a/plugins/spu2-x/src/Windows/SndOut_XAudio2.cpp b/plugins/spu2-x/src/Windows/SndOut_XAudio2.cpp index 9ff9cc8a06..e695441635 100644 --- a/plugins/spu2-x/src/Windows/SndOut_XAudio2.cpp +++ b/plugins/spu2-x/src/Windows/SndOut_XAudio2.cpp @@ -20,8 +20,8 @@ #define _WIN32_DCOM #include "Dialogs.h" -#include #include +#include "../../common/include/comptr.h" namespace Exception { diff --git a/plugins/spu2-x/src/Windows/Spu2-X_vs11.vcxproj b/plugins/spu2-x/src/Windows/Spu2-X_vs11.vcxproj index d4808abcd2..a09ce66d2e 100644 --- a/plugins/spu2-x/src/Windows/Spu2-X_vs11.vcxproj +++ b/plugins/spu2-x/src/Windows/Spu2-X_vs11.vcxproj @@ -129,7 +129,7 @@ - $(SolutionDir)3rdparty\portaudio\include\;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)include;$(SolutionDir)3rdparty\portaudio\include\;%(AdditionalIncludeDirectories) FLOAT_SAMPLES;NDEBUG;_USRDLL;%(PreprocessorDefinitions) Async StreamingSIMDExtensions2 @@ -167,7 +167,7 @@ - $(SolutionDir)3rdparty\portaudio\include\;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)include;$(SolutionDir)3rdparty\portaudio\include\;%(AdditionalIncludeDirectories) FLOAT_SAMPLES;_USRDLL;%(PreprocessorDefinitions) Async Use @@ -200,7 +200,7 @@ - $(SolutionDir)3rdparty\portaudio\include\;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)include;$(SolutionDir)3rdparty\portaudio\include\;%(AdditionalIncludeDirectories) FLOAT_SAMPLES;NDEBUG;_USRDLL;%(PreprocessorDefinitions) Async StreamingSIMDExtensions2 @@ -241,7 +241,7 @@ - $(SolutionDir)3rdparty\portaudio\include\;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)include;$(SolutionDir)3rdparty\portaudio\include\;%(AdditionalIncludeDirectories) wxUSE_GUI=0;FLOAT_SAMPLES;DEBUG_FAST;_USRDLL;%(PreprocessorDefinitions) Async Use diff --git a/plugins/xpad/resource.h b/plugins/xpad/resource.h index 8c0ea45b17..36f359501c 100644 --- a/plugins/xpad/resource.h +++ b/plugins/xpad/resource.h @@ -3,6 +3,9 @@ // Used by xpad.rc // +#ifndef IDC_STATIC +#define IDC_STATIC -1 +#endif // Next default values for new objects // diff --git a/plugins/xpad/stdafx.h b/plugins/xpad/stdafx.h index 82f2547898..12856d5c4d 100644 --- a/plugins/xpad/stdafx.h +++ b/plugins/xpad/stdafx.h @@ -36,7 +36,6 @@ #include #include #include -#include #include #include diff --git a/plugins/xpad/vsprops/common.props b/plugins/xpad/vsprops/common.props index cffce2ea80..6e00a749ca 100644 --- a/plugins/xpad/vsprops/common.props +++ b/plugins/xpad/vsprops/common.props @@ -14,6 +14,7 @@ Level4 ProgramDatabase 4995;4324;%(DisableSpecificWarnings) + $(DXSDK_DIR)include;%(AdditionalIncludeDirectories) d3d10.lib;d3dx10.lib;d3d9.lib;d3dx9.lib;dxguid.lib;winmm.lib;strmiids.lib;xinput.lib;%(AdditionalDependencies) @@ -22,6 +23,7 @@ true Windows false + $(DXSDK_DIR)Lib\x86;%(AdditionalLibraryDirectories) \ No newline at end of file diff --git a/plugins/xpad/xpad.rc b/plugins/xpad/xpad.rc index 5028c34261..19d5c3c725 100644 --- a/plugins/xpad/xpad.rc +++ b/plugins/xpad/xpad.rc @@ -7,8 +7,9 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#include "afxres.h" - +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -34,7 +35,9 @@ END 2 TEXTINCLUDE BEGIN - "#include ""afxres.h""\r\n" + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" "\0" END @@ -49,7 +52,6 @@ BEGIN "LANGUAGE 9, 1\r\n" "#pragma code_page(1252)\r\n" "#include ""res\\xpad.rc2"" // non-Microsoft Visual C++ edited resources\r\n" - "#include ""afxres.rc"" // Standard components\r\n" "#endif\r\n" "\0" END @@ -142,7 +144,6 @@ END LANGUAGE 9, 1 #pragma code_page(1252) #include "res\xpad.rc2" // non-Microsoft Visual C++ edited resources -#include "afxres.rc" // Standard components #endif ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/zerogs/dx/Windows/zerogs_vs11.vcxproj b/plugins/zerogs/dx/Windows/zerogs_vs11.vcxproj index 2ea7f8a781..529697ed12 100644 --- a/plugins/zerogs/dx/Windows/zerogs_vs11.vcxproj +++ b/plugins/zerogs/dx/Windows/zerogs_vs11.vcxproj @@ -82,7 +82,7 @@ - ..\x86\;..\..\ZeroGSShaders\;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)include;..\x86\;..\..\ZeroGSShaders\;%(AdditionalIncludeDirectories) NDEBUG;_USRDLL;__i386__;ZEROGS_DEVBUILD;ZEROGS_SSE2;%(PreprocessorDefinitions) .\Release/GSsoftdx.pch Default @@ -95,7 +95,7 @@ dxerr.lib;dxguid.lib;d3dx9.lib;d3d9.lib;odbc32.lib;odbccp32.lib;winmm.lib;Vfw32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) true - ..\;%(AdditionalLibraryDirectories) + ..\;$(DXSDK_DIR)lib\x86;%(AdditionalLibraryDirectories) .\GSsoftdx.def false MachineX86 @@ -104,14 +104,14 @@ - ..\x86\;..\..\ZeroGSShaders\;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)include;..\x86\;..\..\ZeroGSShaders\;%(AdditionalIncludeDirectories) D3D_DEBUG_INFO;_USRDLL;__i386__;ZEROGS_DEVBUILD;ZEROGS_SSE2;%(PreprocessorDefinitions) EditAndContinue dxerr.lib;dxguid.lib;d3dx9.lib;d3d9.lib;odbc32.lib;odbccp32.lib;winmm.lib;Vfw32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) - ..\;%(AdditionalLibraryDirectories) + ..\;$(DXSDK_DIR)lib\x86;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) .\GSsoftdx.def false @@ -129,7 +129,7 @@ - ..\x86\;..\..\ZeroGSShaders\;%(AdditionalIncludeDirectories) + $(DXSDK_DIR)include;..\x86\;..\..\ZeroGSShaders\;%(AdditionalIncludeDirectories) NDEBUG;_WINDOWS;_USRDLL;__i386__;RELEASE_TO_PUBLIC;ZEROGS_SSE2;%(PreprocessorDefinitions) @@ -143,7 +143,7 @@ dxerr.lib;dxguid.lib;d3dx9.lib;d3d9.lib;odbc32.lib;odbccp32.lib;winmm.lib;Vfw32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) true - ..\;%(AdditionalLibraryDirectories) + ..\;$(DXSDK_DIR)lib\x86;%(AdditionalLibraryDirectories) .\GSsoftdx.def false MachineX86 diff --git a/plugins/zzogl-pg-cg/opengl/Win32/resource.h b/plugins/zzogl-pg-cg/opengl/Win32/resource.h index cece1dbb0e..09049e3e81 100644 --- a/plugins/zzogl-pg-cg/opengl/Win32/resource.h +++ b/plugins/zzogl-pg-cg/opengl/Win32/resource.h @@ -2,6 +2,11 @@ // Microsoft Visual C++ generated include file. // Used by GSsoftdx.rc // + +#ifndef IDC_STATIC +#define IDC_STATIC -1 +#endif + #define IDD_CONFIG 101 #define IDD_ABOUT 102 #define IDD_LOGGING 106 diff --git a/plugins/zzogl-pg-cg/opengl/Win32/zerogs.rc b/plugins/zzogl-pg-cg/opengl/Win32/zerogs.rc index 2aab0fd2d6..2204435f49 100644 --- a/plugins/zzogl-pg-cg/opengl/Win32/zerogs.rc +++ b/plugins/zzogl-pg-cg/opengl/Win32/zerogs.rc @@ -8,7 +8,9 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "resource.h" -#include "afxres.h" +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -295,7 +297,9 @@ END 2 TEXTINCLUDE BEGIN "#include ""resource.h""\r\n" - "#include ""afxres.h""\r\n" + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" "\0" END diff --git a/plugins/zzogl-pg-cg/opengl/Win32/zerogsogl-cg_vs11.vcxproj b/plugins/zzogl-pg-cg/opengl/Win32/zerogsogl-cg_vs11.vcxproj index 81ad89f66c..25d252ae97 100644 --- a/plugins/zzogl-pg-cg/opengl/Win32/zerogsogl-cg_vs11.vcxproj +++ b/plugins/zzogl-pg-cg/opengl/Win32/zerogsogl-cg_vs11.vcxproj @@ -81,7 +81,7 @@ - $(ProjectRootDir)\;$(ProjectRootDir)\ZeroGSShaders\;$(ProjectRootDir)\Win32;$(SvnRootDir)\3rdparty\libjpeg;$(SvnRootDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) + $(CG_INC_PATH);$(ProjectRootDir)\;$(ProjectRootDir)\ZeroGSShaders\;$(ProjectRootDir)\Win32;$(SvnRootDir)\3rdparty\libjpeg;$(SvnRootDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) NDEBUG;_USRDLL;__i386__;ZEROGS_DEVBUILD;%(PreprocessorDefinitions) @@ -91,20 +91,20 @@ winmm.lib;Vfw32.lib;cg.lib;cgGL.lib;opengl32.lib;Comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) - ..\;%(AdditionalLibraryDirectories) + $(CG_LIB_PATH);..\;%(AdditionalLibraryDirectories) .\zerogs.def false - $(ProjectRootDir)\;$(ProjectRootDir)\ZeroGSShaders\;$(ProjectRootDir)\Win32;$(SvnRootDir)\3rdparty\libjpeg;$(SvnRootDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) + $(CG_INC_PATH);$(ProjectRootDir)\;$(ProjectRootDir)\ZeroGSShaders\;$(ProjectRootDir)\Win32;$(SvnRootDir)\3rdparty\libjpeg;$(SvnRootDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) _USRDLL;ZEROGS_DEVBUILD;_DEBUG;__i386__;%(PreprocessorDefinitions) winmm.lib;Vfw32.lib;cg.lib;cgGL.lib;opengl32.lib;Comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) - ..\;%(AdditionalLibraryDirectories) + $(CG_LIB_PATH);..\;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) .\zerogs.def false @@ -120,7 +120,7 @@ - $(ProjectRootDir)\;$(ProjectRootDir)\ZeroGSShaders\;$(ProjectRootDir)\Win32;$(SvnRootDir)\3rdparty\libjpeg;$(SvnRootDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) + $(CG_INC_PATH);$(ProjectRootDir)\;$(ProjectRootDir)\ZeroGSShaders\;$(ProjectRootDir)\Win32;$(SvnRootDir)\3rdparty\libjpeg;$(SvnRootDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) NDEBUG;_USRDLL;__i386__;ZEROGS_SSE2;RELEASE_TO_PUBLIC;%(PreprocessorDefinitions) @@ -132,7 +132,7 @@ winmm.lib;Vfw32.lib;cg.lib;cgGL.lib;opengl32.lib;Comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) - ..\;%(AdditionalLibraryDirectories) + $(CG_LIB_PATH);..\;%(AdditionalLibraryDirectories) .\zerogs.def diff --git a/plugins/zzogl-pg/opengl/Win32/resource.h b/plugins/zzogl-pg/opengl/Win32/resource.h index cece1dbb0e..09049e3e81 100644 --- a/plugins/zzogl-pg/opengl/Win32/resource.h +++ b/plugins/zzogl-pg/opengl/Win32/resource.h @@ -2,6 +2,11 @@ // Microsoft Visual C++ generated include file. // Used by GSsoftdx.rc // + +#ifndef IDC_STATIC +#define IDC_STATIC -1 +#endif + #define IDD_CONFIG 101 #define IDD_ABOUT 102 #define IDD_LOGGING 106 diff --git a/plugins/zzogl-pg/opengl/Win32/zerogs.rc b/plugins/zzogl-pg/opengl/Win32/zerogs.rc index 2aab0fd2d6..2204435f49 100644 --- a/plugins/zzogl-pg/opengl/Win32/zerogs.rc +++ b/plugins/zzogl-pg/opengl/Win32/zerogs.rc @@ -8,7 +8,9 @@ // Generated from the TEXTINCLUDE 2 resource. // #include "resource.h" -#include "afxres.h" +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -295,7 +297,9 @@ END 2 TEXTINCLUDE BEGIN "#include ""resource.h""\r\n" - "#include ""afxres.h""\r\n" + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" "\0" END diff --git a/plugins/zzogl-pg/opengl/Win32/zerogsogl_vs11.vcxproj b/plugins/zzogl-pg/opengl/Win32/zerogsogl_vs11.vcxproj index 8b347299c6..4e5f2ab021 100644 --- a/plugins/zzogl-pg/opengl/Win32/zerogsogl_vs11.vcxproj +++ b/plugins/zzogl-pg/opengl/Win32/zerogsogl_vs11.vcxproj @@ -81,7 +81,7 @@ - $(ProjectRootDir)\;$(ProjectRootDir)\ZeroGSShaders\;$(ProjectRootDir)\Win32;$(SvnRootDir)\3rdparty\libjpeg;$(SvnRootDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) + $(CG_INC_PATH);$(ProjectRootDir)\;$(ProjectRootDir)\ZeroGSShaders\;$(ProjectRootDir)\Win32;$(SvnRootDir)\3rdparty\libjpeg;$(SvnRootDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) NDEBUG;_USRDLL;__i386__;ZEROGS_DEVBUILD;%(PreprocessorDefinitions) @@ -91,20 +91,20 @@ winmm.lib;Vfw32.lib;cg.lib;cgGL.lib;opengl32.lib;Comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) - ..\;%(AdditionalLibraryDirectories) + $(CG_LIB_PATH);..\;%(AdditionalLibraryDirectories) .\zerogs.def false - $(ProjectRootDir)\;$(ProjectRootDir)\ZeroGSShaders\;$(ProjectRootDir)\Win32;$(SvnRootDir)\3rdparty\libjpeg;$(SvnRootDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) + $(CG_INC_PATH);$(ProjectRootDir)\;$(ProjectRootDir)\ZeroGSShaders\;$(ProjectRootDir)\Win32;$(SvnRootDir)\3rdparty\libjpeg;$(SvnRootDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) _USRDLL;ZEROGS_DEVBUILD;_DEBUG;__i386__;%(PreprocessorDefinitions) winmm.lib;Vfw32.lib;cg.lib;cgGL.lib;opengl32.lib;Comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) - ..\;%(AdditionalLibraryDirectories) + $(CG_LIB_PATH);..\;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) .\zerogs.def false @@ -120,7 +120,7 @@ - $(ProjectRootDir)\;$(ProjectRootDir)\ZeroGSShaders\;$(ProjectRootDir)\Win32;$(SvnRootDir)\3rdparty\libjpeg;$(SvnRootDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) + $(CG_INC_PATH);$(ProjectRootDir)\;$(ProjectRootDir)\ZeroGSShaders\;$(ProjectRootDir)\Win32;$(SvnRootDir)\3rdparty\libjpeg;$(SvnRootDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) NDEBUG;_USRDLL;__i386__;ZEROGS_SSE2;RELEASE_TO_PUBLIC;%(PreprocessorDefinitions) @@ -132,7 +132,7 @@ winmm.lib;Vfw32.lib;cg.lib;cgGL.lib;opengl32.lib;Comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) $(OutDir)$(TargetName)$(TargetExt) - ..\;%(AdditionalLibraryDirectories) + $(CG_LIB_PATH);..\;%(AdditionalLibraryDirectories) .\zerogs.def