ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GSdx: everything should be back to normal now 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1406 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gabest11 2009-06-19 20:43:08 +00:00
parent 191a3d0c7e
commit 69e3dcfa63
4 changed files with 1719 additions and 1583 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
plugins/GSdx/GSTextureFX11.cpp
View File

@ -180,8 +180,8 @@ bool GSTextureFX11::SetupGS(GSSelector sel)
D3D11_SHADER_MACRO macro[] = D3D11_SHADER_MACRO macro[] =
{ {
{"IIP", str[0].c_str()}, {"GS_IIP", str[0].c_str()},
{"PRIM", str[1].c_str()}, {"GS_PRIM", str[1].c_str()},
{NULL, NULL}, {NULL, NULL},
}; };
@ -232,20 +232,20 @@ void GSTextureFX11::UpdatePS(PSSelector sel, const PSConstantBuffer* cb, PSSampl
D3D11_SHADER_MACRO macro[] = D3D11_SHADER_MACRO macro[] =
{ {
{"FST", str[0].c_str()}, {"PS_FST", str[0].c_str()},
{"WMS", str[1].c_str()}, {"PS_WMS", str[1].c_str()},
{"WMT", str[2].c_str()}, {"PS_WMT", str[2].c_str()},
{"BPP", str[3].c_str()}, {"PS_BPP", str[3].c_str()},
{"AEM", str[4].c_str()}, {"PS_AEM", str[4].c_str()},
{"TFX", str[5].c_str()}, {"PS_TFX", str[5].c_str()},
{"TCC", str[6].c_str()}, {"PS_TCC", str[6].c_str()},
{"ATE", str[7].c_str()}, {"PS_ATE", str[7].c_str()},
{"ATST", str[8].c_str()}, {"PS_ATST", str[8].c_str()},
{"FOG", str[9].c_str()}, {"PS_FOG", str[9].c_str()},
{"CLR1", str[10].c_str()}, {"PS_CLR1", str[10].c_str()},
{"FBA", str[11].c_str()}, {"PS_FBA", str[11].c_str()},
{"AOUT", str[12].c_str()}, {"PS_AOUT", str[12].c_str()},
{"LTF", str[13].c_str()}, {"PS_LTF", str[13].c_str()},
{NULL, NULL}, {NULL, NULL},
}; };

26
plugins/GSdx/GSTextureFX9.cpp
View File

@ -197,19 +197,19 @@ void GSTextureFX9::UpdatePS(PSSelector sel, const PSConstantBuffer* cb, PSSample
D3DXMACRO macro[] = D3DXMACRO macro[] =
{ {
{"FST", str[0].c_str()}, {"PS_FST", str[0].c_str()},
{"WMS", str[1].c_str()}, {"PS_WMS", str[1].c_str()},
{"WMT", str[2].c_str()}, {"PS_WMT", str[2].c_str()},
{"BPP", str[3].c_str()}, {"PS_BPP", str[3].c_str()},
{"AEM", str[4].c_str()}, {"PS_AEM", str[4].c_str()},
{"TFX", str[5].c_str()}, {"PS_TFX", str[5].c_str()},
{"TCC", str[6].c_str()}, {"PS_TCC", str[6].c_str()},
{"ATE", str[7].c_str()}, {"PS_ATE", str[7].c_str()},
{"ATST", str[8].c_str()}, {"PS_ATST", str[8].c_str()},
{"FOG", str[9].c_str()}, {"PS_FOG", str[9].c_str()},
{"CLR1", str[10].c_str()}, {"PS_CLR1", str[10].c_str()},
{"RT", str[11].c_str()}, {"PS_RT", str[11].c_str()},
{"LTF", str[12].c_str()}, {"PS_LTF", str[12].c_str()},
{NULL, NULL}, {NULL, NULL},
}; };

3240
plugins/GSdx/GSdx_vs2008.vcproj
View File

File diff suppressed because it is too large Load Diff

4
plugins/GSdx/vsprops/common.vsprops
View File

@ -18,9 +18,9 @@
/> />
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="JITProfiling.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 d3dx10.lib d3d9.lib d3dx9.lib ddraw.lib dxguid.lib winmm.lib strmiids.lib xinput.lib cg.lib cgGL.lib glut32.lib glew32.lib"
AdditionalLibraryDirectories="./vtune" AdditionalLibraryDirectories="./vtune"
DelayLoadDLLs="d3d9.dll;d3dx9_41.dll;d3d10.dll;d3dx10_41.dll;cg.dll;cgGL.dll;glut32.dll" DelayLoadDLLs="d3d9.dll;d3dx9_41.dll;d3d10.dll;d3dx10_41.dll;d3d11.dll;d3d11_beta.dll;d3dx11_41.dll;cg.dll;cgGL.dll;glut32.dll"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
RandomizedBaseAddress="1" RandomizedBaseAddress="1"