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

updated to latest code

This commit is contained in:
Aaron Robinson 2004-02-04 19:39:15 +00:00
parent 10c02495a8
commit 0a40fb6414
7 changed files with 66 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Cxbx.sln
View File

@ -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

BIN
Cxbx.suo
View File

Binary file not shown.

53
CxbxKrnl.vcproj
View File

@ -188,7 +188,7 @@
RelativePath=".\Include\Win32\CxbxKrnl\EmuD3D8.h">
</File>
<File
RelativePath=".\Include\Win32\CxbxKrnl\EmuD3D8Conv.h">
RelativePath=".\Include\Win32\CxbxKrnl\EmuD3D8Types.h">
</File>
<File
RelativePath=".\Include\Win32\CxbxKrnl\EmuDInput.h">
@ -242,7 +242,7 @@
RelativePath=".\Include\Core\Xbe.h">
</File>
<Filter
Name="HLEDataBase.h"
Name="HLEDataBase (h)"
Filter="">
<File
RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.3925.h">
@ -256,6 +256,9 @@
<File
RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4361.h">
</File>
<File
RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4432.h">
</File>
<File
RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4627.h">
</File>
@ -292,10 +295,29 @@
<File
RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4361.h">
</File>
<File
RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4432.h">
</File>
<File
RelativePath=".\Include\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4627.h">
</File>
</Filter>
<Filter
Name="EmuD3D8 (h)"
Filter="">
<File
RelativePath=".\Include\Win32\CxbxKrnl\EmuD3D8\Convert.h">
</File>
<File
RelativePath=".\Include\Win32\CxbxKrnl\EmuD3D8\PushBuffer.h">
</File>
<File
RelativePath=".\Include\Win32\CxbxKrnl\EmuD3D8\VertexBuffer.h">
</File>
<File
RelativePath=".\Include\Win32\CxbxKrnl\EmuD3D8\VertexShader.h">
</File>
</Filter>
</Filter>
<Filter
Name="Resource"
@ -328,9 +350,6 @@
<File
RelativePath=".\Source\Win32\CxbxKrnl\EmuD3D8.cpp">
</File>
<File
RelativePath=".\Source\Win32\CxbxKrnl\EmuD3D8Conv.cpp">
</File>
<File
RelativePath=".\Source\Win32\CxbxKrnl\EmuDInput.cpp">
</File>
@ -383,7 +402,7 @@
RelativePath=".\Source\Win32\XBVideo.cpp">
</File>
<Filter
Name="HLEDataBase.inl"
Name="HLEDataBase (inl)"
Filter="">
<File
RelativePath=".\Source\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.3925.inl">
@ -397,6 +416,9 @@
<File
RelativePath=".\Source\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4361.inl">
</File>
<File
RelativePath=".\Source\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4432.inl">
</File>
<File
RelativePath=".\Source\Win32\CxbxKrnl\HLEDataBase\D3D8.1.0.4627.inl">
</File>
@ -433,10 +455,29 @@
<File
RelativePath=".\Source\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4361.inl">
</File>
<File
RelativePath=".\Source\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4432.inl">
</File>
<File
RelativePath=".\Source\Win32\CxbxKrnl\HLEDataBase\Xapi.1.0.4627.inl">
</File>
</Filter>
<Filter
Name="EmuD3D8 (cpp)"
Filter="">
<File
RelativePath=".\Source\Win32\CxbxKrnl\EmuD3D8\Convert.cpp">
</File>
<File
RelativePath=".\Source\Win32\CxbxKrnl\EmuD3D8\PushBuffer.cpp">
</File>
<File
RelativePath=".\Source\Win32\CxbxKrnl\EmuD3D8\VertexBuffer.cpp">
</File>
<File
RelativePath=".\Source\Win32\CxbxKrnl\EmuD3D8\VertexShader.cpp">
</File>
</Filter>
</Filter>
</Files>
<Globals>

4
Include/Cxbx.h
View File

@ -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

8
Include/Win32/CxbxKrnl/EmuD3D8.h
View File

@ -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
// ******************************************************************

28
Source/Win32/CxbxKrnl/EmuD3D8.cpp
View File

@ -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
// ******************************************************************

2
Source/Win32/CxbxKrnl/EmuD3D8/VertexShader.cpp
View File

@ -815,7 +815,7 @@ extern void XTL::EmuRecompileVSHFunction
// start at 2nd param
{
for(int i=1;i<dwMaxParams;i++)
for(DWORD i=1;i<dwMaxParams;i++)
{
strcat(mac_parm_str, ", ");