From 0a40fb6414d76fa4d722fa198bd4af6addfc28cf Mon Sep 17 00:00:00 2001 From: Aaron Robinson Date: Wed, 4 Feb 2004 19:39:15 +0000 Subject: [PATCH] updated to latest code --- Cxbx.sln | 32 +++++------ Cxbx.suo | Bin 11264 -> 11264 bytes CxbxKrnl.vcproj | 53 ++++++++++++++++-- Include/Cxbx.h | 4 +- Include/Win32/CxbxKrnl/EmuD3D8.h | 8 --- Source/Win32/CxbxKrnl/EmuD3D8.cpp | 28 --------- .../Win32/CxbxKrnl/EmuD3D8/VertexShader.cpp | 2 +- 7 files changed, 66 insertions(+), 61 deletions(-) diff --git a/Cxbx.sln b/Cxbx.sln index 5449d5186..4864b7768 100644 --- a/Cxbx.sln +++ b/Cxbx.sln @@ -1,9 +1,9 @@ Microsoft Visual Studio Solution File, Format Version 7.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbe", "Cxbe.vcproj", "{47E018FF-BC97-4BC1-9565-8D1B5EF5739A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbe", "Cxbe.vcproj", "{3A94CDEB-4EBF-45EF-A9C6-8873DD2A55C0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbx", "Cxbx.vcproj", "{32D9FF15-9484-4C74-866B-E336EDCF1669}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cxbx", "Cxbx.vcproj", "{186FDF0D-7099-41FB-9DEC-08BDA6296079}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CxbxKrnl", "CxbxKrnl.vcproj", "{134EEF58-6EBA-458A-8D9E-EDFE79650036}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CxbxKrnl", "CxbxKrnl.vcproj", "{B4B1DFA1-D5DA-4942-BE29-87BC6A433858}" EndProject Global GlobalSection(SolutionConfiguration) = preSolution @@ -11,21 +11,21 @@ Global ConfigName.1 = Release EndGlobalSection GlobalSection(ProjectDependencies) = postSolution - {32D9FF15-9484-4C74-866B-E336EDCF1669}.0 = {134EEF58-6EBA-458A-8D9E-EDFE79650036} + {186FDF0D-7099-41FB-9DEC-08BDA6296079}.0 = {B4B1DFA1-D5DA-4942-BE29-87BC6A433858} EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution - {47E018FF-BC97-4BC1-9565-8D1B5EF5739A}.Debug.ActiveCfg = Debug|Win32 - {47E018FF-BC97-4BC1-9565-8D1B5EF5739A}.Debug.Build.0 = Debug|Win32 - {47E018FF-BC97-4BC1-9565-8D1B5EF5739A}.Release.ActiveCfg = Release|Win32 - {47E018FF-BC97-4BC1-9565-8D1B5EF5739A}.Release.Build.0 = Release|Win32 - {32D9FF15-9484-4C74-866B-E336EDCF1669}.Debug.ActiveCfg = Debug|Win32 - {32D9FF15-9484-4C74-866B-E336EDCF1669}.Debug.Build.0 = Debug|Win32 - {32D9FF15-9484-4C74-866B-E336EDCF1669}.Release.ActiveCfg = Release|Win32 - {32D9FF15-9484-4C74-866B-E336EDCF1669}.Release.Build.0 = Release|Win32 - {134EEF58-6EBA-458A-8D9E-EDFE79650036}.Debug.ActiveCfg = Debug|Win32 - {134EEF58-6EBA-458A-8D9E-EDFE79650036}.Debug.Build.0 = Debug|Win32 - {134EEF58-6EBA-458A-8D9E-EDFE79650036}.Release.ActiveCfg = Release|Win32 - {134EEF58-6EBA-458A-8D9E-EDFE79650036}.Release.Build.0 = Release|Win32 + {3A94CDEB-4EBF-45EF-A9C6-8873DD2A55C0}.Debug.ActiveCfg = Debug|Win32 + {3A94CDEB-4EBF-45EF-A9C6-8873DD2A55C0}.Debug.Build.0 = Debug|Win32 + {3A94CDEB-4EBF-45EF-A9C6-8873DD2A55C0}.Release.ActiveCfg = Release|Win32 + {3A94CDEB-4EBF-45EF-A9C6-8873DD2A55C0}.Release.Build.0 = Release|Win32 + {186FDF0D-7099-41FB-9DEC-08BDA6296079}.Debug.ActiveCfg = Debug|Win32 + {186FDF0D-7099-41FB-9DEC-08BDA6296079}.Debug.Build.0 = Debug|Win32 + {186FDF0D-7099-41FB-9DEC-08BDA6296079}.Release.ActiveCfg = Release|Win32 + {186FDF0D-7099-41FB-9DEC-08BDA6296079}.Release.Build.0 = Release|Win32 + {B4B1DFA1-D5DA-4942-BE29-87BC6A433858}.Debug.ActiveCfg = Debug|Win32 + {B4B1DFA1-D5DA-4942-BE29-87BC6A433858}.Debug.Build.0 = Debug|Win32 + {B4B1DFA1-D5DA-4942-BE29-87BC6A433858}.Release.ActiveCfg = Release|Win32 + {B4B1DFA1-D5DA-4942-BE29-87BC6A433858}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/Cxbx.suo b/Cxbx.suo index 9b9f8046c04ff667e640ca9fe608636f8a9b73f2..d26124ccc01c68f1293430761eed5e051576a624 100644 GIT binary patch delta 2081 zcmb_c&rcIk5T3VeO95@^mV*4SidNhjD_sixAu(9G1tXG%i=yEor4kcjqSgc?gdY3{ z>`OcwO}rQr<0c-B2_C$d=&dKCcro$d#S0<2es3+pMuHNzFK^%M%kvOM{8 zPWIk^wfgA%mlak=L@(Qo+wvtzz6_aH-C?-^p;8}~i$bB+PX(tT{4h;(rgmNt=iQ0f zXP#^wUuo2gQd2;>D6B+n6m=b`Ya}vFRU&5Th+dytXF_g}YYLL+EL)^u>Zf5Bbix_{ z8V$R>=JV!pzw-6PllT0ce6Zrx_aG?MV*`l^U6_}=d2v1e=FRVAZde+&SY6F{QTT#y znHBh&@6>3VGL*)BS<)$oo1>7$IbulzkcA|CvXp?7!b(yc-a7R`KY*2`7{A^V86QII zMcAB)=vVWOq4TTz`CBD4o^ckTa=|%-N;eROM>XU(ft>5uF+8Klb`051TlLVO6*Wr3 zl0)93u%)2Uk@E!Vk;XHIFVdnOd?s*w*`au}M1%CJzPpOpu>(ZEI+1hc&)UnoD}X!U zQ_@W0_kx4XanWR1nx|=OqA~t4*vbmVr(jTGRb#C!AVr(#floA{haTb#!RrJ~p)yzL z8uiw`EkZXtn}J2m5Ehs=ET&yMk>&UIGh3th|Xv$592*+0dd|7%?1`++8wv0v6_ z!#D*F6@l&+&HlzaPh)fg_~&f#6WwlRln;fNV_fwsot5wzj|YG@rkGI*KWC%XAS4aY zMnG^4wbC(e1lh%y5@V|m(lA;rdWB>LEh_;7{O%Jo%Gud+SHz z8n+@Y_l>YT2WDeZUWP|Nyl!?3F^)`RG`nkdcxNI%Hie|go6(-w;JxUjmP3owq#Wg` zOv_kVs!^R>WV7T1aUPLNMJi!ufocF-L)-+q2wVZTReo@0zI_?okMT+kV=U8AR$VMJ z%O9xQ}ttvOU^w+gg?4!eOC`Jm%2I$Fk-deqTd8I_?%2`XfvLIJCUvw_=X zXd`c2sR!SQpX({&qo-7%p}vP=Ode386!=hN2Xc)Htc=xir{&0+tJl7~|2f%yaeC{6 z_B!!P5I;*)tdJbeI&IKxY$CSE`;ka!qU-G)k89piazXG?@;q;yJvK0Oem=7+y1bd{ zNkEFl{{T-vsS9sq&JlbunUk-){;9N3*CT6YU|)?KL8*U#6#JcM<>4R)4jN8$8Euw+ zs! + RelativePath=".\Include\Win32\CxbxKrnl\EmuD3D8Types.h"> @@ -242,7 +242,7 @@ RelativePath=".\Include\Core\Xbe.h"> @@ -256,6 +256,9 @@ + + @@ -292,10 +295,29 @@ + + + + + + + + + + + + - - @@ -383,7 +402,7 @@ RelativePath=".\Source\Win32\XBVideo.cpp"> @@ -397,6 +416,9 @@ + + @@ -433,10 +455,29 @@ + + + + + + + + + + + + diff --git a/Include/Cxbx.h b/Include/Cxbx.h index 960229f2c..12a1672c1 100644 --- a/Include/Cxbx.h +++ b/Include/Cxbx.h @@ -55,10 +55,10 @@ typedef signed short sint16; typedef signed long sint32; // define this to trace intercepted function calls -#define _DEBUG_TRACE +//#define _DEBUG_TRACE // define this to trace warnings -#define _DEBUG_WARNINGS +//#define _DEBUG_WARNINGS // version information #ifndef _DEBUG_TRACE diff --git a/Include/Win32/CxbxKrnl/EmuD3D8.h b/Include/Win32/CxbxKrnl/EmuD3D8.h index 88d76d0ea..dcf1c48d5 100644 --- a/Include/Win32/CxbxKrnl/EmuD3D8.h +++ b/Include/Win32/CxbxKrnl/EmuD3D8.h @@ -865,14 +865,6 @@ VOID WINAPI EmuIDirect3DDevice8_SetRenderState_PSTextureModes DWORD Value ); -// ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_StencilFail -// ****************************************************************** -VOID WINAPI EmuIDirect3DDevice8_SetRenderState_StencilFail -( - DWORD Value -); - // ****************************************************************** // * func: EmuIDirect3DDevice8_SetRenderState_CullMode // ****************************************************************** diff --git a/Source/Win32/CxbxKrnl/EmuD3D8.cpp b/Source/Win32/CxbxKrnl/EmuD3D8.cpp index 61d4772d8..c7d55f007 100644 --- a/Source/Win32/CxbxKrnl/EmuD3D8.cpp +++ b/Source/Win32/CxbxKrnl/EmuD3D8.cpp @@ -5363,34 +5363,6 @@ VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_PSTextureModes return; } -// ****************************************************************** -// * func: EmuIDirect3DDevice8_SetRenderState_StencilFail -// ****************************************************************** -VOID WINAPI XTL::EmuIDirect3DDevice8_SetRenderState_StencilFail -( - DWORD Value -) -{ - EmuSwapFS(); // Win2k/XP FS - - // debug trace - #ifdef _DEBUG_TRACE - { - printf("EmuD3D8 (0x%X): EmuIDirect3DDevice8_SetRenderState_StencilFail\n" - "(\n" - " Value : 0x%.08X\n" - ");\n", - GetCurrentThreadId(), Value); - } - #endif - - // TODO: do something.. - - EmuSwapFS(); // XBox FS - - return; -} - // ****************************************************************** // * func: EmuIDirect3DDevice8_SetRenderState_CullMode // ****************************************************************** diff --git a/Source/Win32/CxbxKrnl/EmuD3D8/VertexShader.cpp b/Source/Win32/CxbxKrnl/EmuD3D8/VertexShader.cpp index 93b1d1c46..30cd524f8 100644 --- a/Source/Win32/CxbxKrnl/EmuD3D8/VertexShader.cpp +++ b/Source/Win32/CxbxKrnl/EmuD3D8/VertexShader.cpp @@ -815,7 +815,7 @@ extern void XTL::EmuRecompileVSHFunction // start at 2nd param { - for(int i=1;i