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

Merge pull request #1426 from RadWolfie/move-source-files-to-their-own-folder-part1-of-2 

Move source files to their own folder part1.2
This commit is contained in:
RadWolfie 2018-09-02 09:54:11 -05:00 committed by GitHub
parent aeca7066bc 75ac4079aa
commit eff6da7551
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 117 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
build/win32/Cxbx.vcxproj
View File

@ -209,7 +209,7 @@
<ClInclude Include="..\..\src\Common\XADPCM.h" />
<ClInclude Include="..\..\src\Common\XbePrinter.h" />
<ClInclude Include="..\..\src\CxbxKrnl\crc32c.h" />
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8Logging.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\XbD3D8Logging.h" />
<ClInclude Include="..\..\src\Common\EmuEEPROM.h" />
<ClInclude Include="..\..\src\Common\Logging.h" />
<ClInclude Include="..\..\src\Common\Win32\AlignPosfix1.h" />
@ -219,14 +219,14 @@
<ClInclude Include="..\..\src\Cxbx.h" />
<ClInclude Include="..\..\src\CxbxKrnl\CxbxKrnl.h" />
<ClInclude Include="..\..\src\CxbxKrnl\DbgConsole.h" />
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8.h" />
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8Types.h" />
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\Convert.h" />
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\PixelShader.h" />
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\PushBuffer.h" />
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\State.h" />
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\VertexBuffer.h" />
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\VertexShader.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\Direct3D9\Direct3D9.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\XbD3D8Types.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\XbConvert.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\XbPixelShader.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\XbPushBuffer.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\XbState.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\XbVertexBuffer.h" />
<ClInclude Include="..\..\src\core\HLE\D3D8\XbVertexShader.h" />
<ClInclude Include="..\..\src\core\HLE\XAPI\OHCI\XInput\DInput.h" />
<ClInclude Include="..\..\src\core\HLE\DSOUND\DirectSound\DirectSound.hpp" />
<ClInclude Include="..\..\src\core\HLE\DSOUND\DirectSound\DirectSoundInline.hpp" />
@ -352,7 +352,7 @@
<ClCompile Include="..\..\src\Common\Win32\XBPortMapping.cpp" />
<ClCompile Include="..\..\src\Common\XbePrinter.cpp" />
<ClCompile Include="..\..\src\CxbxKrnl\crc32c.cpp" />
<ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8Logging.cpp" />
<ClCompile Include="..\..\src\core\HLE\D3D8\XbD3D8Logging.cpp" />
<ClCompile Include="..\..\src\Common\EmuEEPROM.cpp" />
<ClCompile Include="..\..\src\Common\Logging.cpp" />
<ClCompile Include="..\..\src\Common\Win32\EmuShared.cpp">
@ -382,43 +382,13 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\Convert.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\PixelShader.cpp" />
<ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\PushBuffer.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\State.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\VertexBuffer.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\VertexShader.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\D3D8\Direct3D9\Direct3D9.cpp" />
<ClCompile Include="..\..\src\core\HLE\D3D8\XbConvert.cpp" />
<ClCompile Include="..\..\src\core\HLE\D3D8\XbPixelShader.cpp" />
<ClCompile Include="..\..\src\core\HLE\D3D8\XbPushBuffer.cpp" />
<ClCompile Include="..\..\src\core\HLE\D3D8\XbState.cpp" />
<ClCompile Include="..\..\src\core\HLE\D3D8\XbVertexBuffer.cpp" />
<ClCompile Include="..\..\src\core\HLE\D3D8\XbVertexShader.cpp" />
<ClCompile Include="..\..\src\core\HLE\XAPI\OHCI\XInput\DInput.cpp" />
<ClCompile Include="..\..\src\core\HLE\DSOUND\DirectSound\DirectSound.cpp" />
<ClCompile Include="..\..\src\CxbxKrnl\EmuFile.cpp">
@ -468,12 +438,7 @@
<ClCompile Include="..\..\src\CxbxKrnl\EmuX86.cpp" />
<ClCompile Include="..\..\src\core\HLE\XACTENG\XactEng.cpp" />
<ClCompile Include="..\..\src\core\HLE\XAPI\Xapi.cpp" />
<ClCompile Include="..\..\src\core\HLE\XGRAPHIC\XGraphic.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\XGRAPHIC\XGraphic.cpp" />
<ClCompile Include="..\..\src\core\HLE\XAPI\OHCI\XInput\XInput.cpp" />
<ClCompile Include="..\..\src\core\HLE\XONLINE\XOnline.cpp" />
<ClCompile Include="..\..\src\CxbxKrnl\gloffscreen\glextensions.cpp" />

74
build/win32/Cxbx.vcxproj.filters
View File

@ -16,23 +16,23 @@
<ClCompile Include="..\..\src\Cxbx\WndMain.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\Convert.cpp">
<Filter>EmuD3D8</Filter>
<ClCompile Include="..\..\src\core\HLE\D3D8\XbConvert.cpp">
<Filter>core\HLE\D3D8</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\PixelShader.cpp">
<Filter>EmuD3D8</Filter>
<ClCompile Include="..\..\src\core\HLE\D3D8\XbPixelShader.cpp">
<Filter>core\HLE\D3D8</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\PushBuffer.cpp">
<Filter>EmuD3D8</Filter>
<ClCompile Include="..\..\src\core\HLE\D3D8\XbPushBuffer.cpp">
<Filter>core\HLE\D3D8</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\State.cpp">
<Filter>EmuD3D8</Filter>
<ClCompile Include="..\..\src\core\HLE\D3D8\XbState.cpp">
<Filter>core\HLE\D3D8</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\VertexBuffer.cpp">
<Filter>EmuD3D8</Filter>
<ClCompile Include="..\..\src\core\HLE\D3D8\XbVertexBuffer.cpp">
<Filter>core\HLE\D3D8</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8\VertexShader.cpp">
<Filter>EmuD3D8</Filter>
<ClCompile Include="..\..\src\core\HLE\D3D8\XbVertexShader.cpp">
<Filter>core\HLE\D3D8</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\EmuKrnl.cpp">
<Filter>Kernel</Filter>
@ -106,8 +106,8 @@
<ClCompile Include="..\..\src\CxbxKrnl\Emu.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8.cpp">
<Filter>Emulator</Filter>
<ClCompile Include="..\..\src\core\HLE\D3D8\Direct3D9\Direct3D9.cpp">
<Filter>core\HLE\D3D8\Direct3D9</Filter>
</ClCompile>
<ClCompile Include="..\..\src\core\HLE\XAPI\OHCI\XInput\DInput.cpp">
<Filter>core\HLE\XAPI\OHCI\XInput</Filter>
@ -172,8 +172,8 @@
<ClCompile Include="..\..\src\Cxbx\DlgAbout.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\EmuD3D8Logging.cpp">
<Filter>Emulator</Filter>
<ClCompile Include="..\..\src\core\HLE\D3D8\XbD3D8Logging.cpp">
<Filter>core\HLE\D3D8</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Cxbx\DlgAudioConfig.cpp">
<Filter>GUI</Filter>
@ -332,23 +332,23 @@
<ClInclude Include="..\..\src\Cxbx\Wnd.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\Convert.h">
<Filter>EmuD3D8</Filter>
<ClInclude Include="..\..\src\core\HLE\D3D8\XbConvert.h">
<Filter>core\HLE\D3D8</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\PixelShader.h">
<Filter>EmuD3D8</Filter>
<ClInclude Include="..\..\src\core\HLE\D3D8\XbPixelShader.h">
<Filter>core\HLE\D3D8</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\PushBuffer.h">
<Filter>EmuD3D8</Filter>
<ClInclude Include="..\..\src\core\HLE\D3D8\XbPushBuffer.h">
<Filter>core\HLE\D3D8</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\State.h">
<Filter>EmuD3D8</Filter>
<ClInclude Include="..\..\src\core\HLE\D3D8\XbState.h">
<Filter>core\HLE\D3D8</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\VertexBuffer.h">
<Filter>EmuD3D8</Filter>
<ClInclude Include="..\..\src\core\HLE\D3D8\XbVertexBuffer.h">
<Filter>core\HLE\D3D8</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8\VertexShader.h">
<Filter>EmuD3D8</Filter>
<ClInclude Include="..\..\src\core\HLE\D3D8\XbVertexShader.h">
<Filter>core\HLE\D3D8</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\EmuKrnlLogging.h">
<Filter>Kernel</Filter>
@ -380,11 +380,11 @@
<ClInclude Include="..\..\src\CxbxKrnl\DbgConsole.h">
<Filter>Emulator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8.h">
<Filter>Emulator</Filter>
<ClInclude Include="..\..\src\core\HLE\D3D8\Direct3D9\Direct3D9.h">
<Filter>core\HLE\D3D8\Direct3D9</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8Types.h">
<Filter>Emulator</Filter>
<ClInclude Include="..\..\src\core\HLE\D3D8\XbD3D8Types.h">
<Filter>core\HLE\D3D8</Filter>
</ClInclude>
<ClInclude Include="..\..\src\core\HLE\XAPI\OHCI\XInput\DInput.h">
<Filter>core\HLE\XAPI\OHCI\XInput</Filter>
@ -458,8 +458,8 @@
<ClInclude Include="..\..\src\Cxbx\DlgAbout.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\EmuD3D8Logging.h">
<Filter>Emulator</Filter>
<ClInclude Include="..\..\src\core\HLE\D3D8\XbD3D8Logging.h">
<Filter>core\HLE\D3D8</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Common\XADPCM.h">
<Filter>Shared</Filter>
@ -717,9 +717,6 @@
<Filter Include="GUI">
<UniqueIdentifier>{445ff8dc-8414-41ad-8681-01243121d574}</UniqueIdentifier>
</Filter>
<Filter Include="EmuD3D8">
<UniqueIdentifier>{4ee1fc9a-ee21-4764-b96f-1caf41881bab}</UniqueIdentifier>
</Filter>
<Filter Include="Kernel">
<UniqueIdentifier>{0187aa1f-d227-4dd5-b9ae-a336795923c7}</UniqueIdentifier>
</Filter>
@ -798,6 +795,9 @@
<Filter Include="core\HLE\D3D8">
<UniqueIdentifier>{6f39b9de-ab9d-4780-b687-2d930f86738e}</UniqueIdentifier>
</Filter>
<Filter Include="core\HLE\D3D8\Direct3D9">
<UniqueIdentifier>{c56dc02e-4531-4cd2-aac2-a3c97eec11c1}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\resource\Cxbx.rc">

14
src/CxbxKrnl/EmuXTL.h
View File

@ -39,13 +39,13 @@
namespace XTL
{
#include "core/HLE/XAPI/Xapi.h"
#include "EmuD3D8.h"
#include "EmuD3D8\Convert.h"
#include "EmuD3D8\VertexBuffer.h"
#include "EmuD3D8\PushBuffer.h"
#include "EmuD3D8\VertexShader.h"
#include "EmuD3D8\PixelShader.h"
#include "EmuD3D8\State.h"
#include "core/HLE/D3D8/Direct3D9/Direct3D9.h"
#include "core/HLE/D3D8/XbConvert.h"
#include "core/HLE/D3D8/XbVertexBuffer.h"
#include "core/HLE/D3D8/XbPushBuffer.h"
#include "core/HLE/D3D8/XbVertexShader.h"
#include "core/HLE/D3D8/XbPixelShader.h"
#include "core/HLE/D3D8/XbState.h"
#include "core/HLE/XAPI/OHCI/XInput/DInput.h"
#include "core/HLE/DSOUND/DirectSound/DirectSound.hpp"
#include "core/HLE/XONLINE/XOnline.h"

22
src/CxbxKrnl/EmuD3D8.cpp → src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp
View File

@ -9,7 +9,7 @@
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
// *
// * Cxbx->Win32->CxbxKrnl->EmuD3D8.cpp
// * core->HLE->D3D8->Direct3D9->Direct3D9.cpp
// *
// * This file is part of the Cxbx project.
// *
@ -36,7 +36,7 @@
#define _XBOXKRNL_DEFEXTRN_
#define LOG_PREFIX CXBXR_MODULE::D3D8
#include "xxhash32.h"
#include "CxbxKrnl/xxhash32.h"
#include <condition_variable>
// prevent name collisions
@ -47,16 +47,16 @@ namespace xboxkrnl
#include "CxbxUtil.h"
#include "CxbxVersion.h"
#include "CxbxKrnl.h"
#include "Emu.h"
#include "EmuFS.h"
#include "EmuShared.h"
#include "DbgConsole.h"
#include "ResourceTracker.h"
#include "VMManager.h" // for g_VMManager
#include "EmuXTL.h"
#include "CxbxKrnl/CxbxKrnl.h"
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuFS.h"
#include "CxbxKrnl/EmuShared.h"
#include "CxbxKrnl/DbgConsole.h"
#include "CxbxKrnl/ResourceTracker.h"
#include "CxbxKrnl/VMManager.h" // for g_VMManager
#include "CxbxKrnl/EmuXTL.h"
#include "Logging.h"
#include "EmuD3D8Logging.h"
#include "../XbD3D8Logging.h"
#include "core/HLE/Intercept.hpp" // for bLLE_GPU
#include "Cxbx/ResCxbx.h"

0
src/CxbxKrnl/EmuD3D.cpp.unused-patches → src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp.unused-patches
View File

12
src/CxbxKrnl/EmuD3D8.h → src/core/HLE/D3D8/Direct3D9/Direct3D9.h
View File

@ -7,7 +7,7 @@
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
// *
// * Cxbx->Win32->CxbxKrnl->EmuD3D8.h
// * core->HLE->D3D8->Direct3D9->Direct3D9.h
// *
// * This file is part of the Cxbx project.
// *
@ -31,13 +31,13 @@
// * All rights reserved
// *
// ******************************************************************
#ifndef EMUD3D8_H
#define EMUD3D8_H
#ifndef DIRECT3D9_H
#define DIRECT3D9_H
#include "EmuD3D8Types.h"
#include "CxbxKrnl.h"
#include "../XbD3D8Types.h"
#include "CxbxKrnl/CxbxKrnl.h"
#include "Common/Xbe.h"
#include "Emu.h"
#include "CxbxKrnl/Emu.h"
#define DIRECTDRAW_VERSION 0x0700
#include <ddraw.h>

2
src/CxbxKrnl/EmuD3D8/Convert.cpp → src/core/HLE/D3D8/XbConvert.cpp Executable file → Normal file
View File

@ -38,7 +38,7 @@
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuXTL.h"
#include "Convert.h"
#include "XbConvert.h"
// About format color components:
// A = alpha, byte : 0 = fully opaque, 255 = fully transparent

8
src/CxbxKrnl/EmuD3D8/Convert.h → src/core/HLE/D3D8/XbConvert.h Executable file → Normal file
View File

@ -7,7 +7,7 @@
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
// *
// * Cxbx->Win32->CxbxKrnl->EmuD3D8->Convert.h
// * core->HLE->D3D8->XbConvert.h
// *
// * This file is part of the Cxbx project.
// *
@ -31,10 +31,10 @@
// * All rights reserved
// *
// ******************************************************************
#ifndef CONVERT_H
#define CONVERT_H
#ifndef XBCONVERT_H
#define XBCONVERT_H
#include "CxbxKrnl.h"
#include "CxbxKrnl/CxbxKrnl.h"
#define VERTICES_PER_TRIANGLE 3
#define VERTICES_PER_QUAD 4

4
src/CxbxKrnl/EmuD3D8Logging.cpp → src/core/HLE/D3D8/XbD3D8Logging.cpp
View File

@ -9,7 +9,7 @@
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
// *
// * Cxbx->EmuD3D8Logging.cpp
// * core->HLE->D3D8->XbD3D8Logging.cpp
// *
// * This file is part of the Cxbx project.
// *
@ -36,7 +36,7 @@
#define _XBOXKRNL_DEFEXTRN_
#include "Logging.h"
#include "EmuD3D8Logging.h"
#include "XbD3D8Logging.h"
// prevent name collisions
namespace XTL

6
src/CxbxKrnl/EmuD3D8Logging.h → src/core/HLE/D3D8/XbD3D8Logging.h
View File

@ -7,7 +7,7 @@
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
// *
// * Cxbx->EmuD3D8Logging.h
// * core->HLE->D3D8->XbD3D8Logging.h
// *
// * This file is part of the Cxbx project.
// *
@ -42,7 +42,7 @@
namespace XTL
{
#include "EmuD3D8Types.h"
#include "XbD3D8Types.h"
// Additional types, exclusively for logging (not really enums) :
enum D3DVS20CAPS;
@ -159,4 +159,4 @@ LOGRENDER_HEADER(X_D3DPixelContainer)
}; // end of namespace XTL
#endif _EMU_D3D8_LOGGING_H
#endif _EMU_D3D8_LOGGING_H

6
src/CxbxKrnl/EmuD3D8Types.h → src/core/HLE/D3D8/XbD3D8Types.h Executable file → Normal file
View File

@ -7,7 +7,7 @@
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
// *
// * Cxbx->Win32->CxbxKrnl->EmuD3D8Types.h
// * core->HLE->D3D8->XbD3D8Types.h
// *
// * This file is part of the Cxbx project.
// *
@ -31,8 +31,8 @@
// * All rights reserved
// *
// ******************************************************************
#ifndef EMUD3D8TYPES_H
#define EMUD3D8TYPES_H
#ifndef XBD3D8TYPES_H
#define XBD3D8TYPES_H
#undef UNICODE // make sure dxerr.h DXGetErrorString is aliassed to *A, not *W

2
src/CxbxKrnl/EmuD3D8/PixelShader.cpp → src/core/HLE/D3D8/XbPixelShader.cpp
View File

@ -9,7 +9,7 @@
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
// *
// * Cxbx->Win32->CxbxKrnl->PixelShader.cpp
// * core->HLE->D3D8->XbPixelShader.cpp
// *
// * This file is part of the Cxbx project.
// *

6
src/CxbxKrnl/EmuD3D8/PixelShader.h → src/core/HLE/D3D8/XbPixelShader.h
View File

@ -7,7 +7,7 @@
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
// *
// * Cxbx->Win32->CxbxKrnl->EmuD3D8->PixelShader.h
// * core->HLE->D3D8->XbPixelShader.h
// *
// * This file is part of the Cxbx project.
// *
@ -31,8 +31,8 @@
// * All rights reserved
// *
// ******************************************************************
#ifndef PIXELSHADER_H
#define PIXELSHADER_H
#ifndef XBPIXELSHADER_H
#define XBPIXELSHADER_H
#pragma once

4
src/CxbxKrnl/EmuD3D8/PushBuffer.cpp → src/core/HLE/D3D8/XbPushBuffer.cpp
View File

@ -9,7 +9,7 @@
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
// *
// * Cxbx->Win32->CxbxKrnl->EmuD3D->PushBuffer.cpp
// * core->HLE->D3D8->XbPushBuffer.cpp
// *
// * This file is part of the Cxbx project.
// *
@ -41,7 +41,7 @@
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuXTL.h"
#include "CxbxKrnl/EmuD3D8Types.h" // For X_D3DFORMAT
#include "XbD3D8Types.h" // For X_D3DFORMAT
#include "CxbxKrnl/ResourceTracker.h"
#include "devices/video/nv2a.h" // For PGRAPHState
#include "devices/video/nv2a_int.h" // For NV** defines

8
src/CxbxKrnl/EmuD3D8/PushBuffer.h → src/core/HLE/D3D8/XbPushBuffer.h
View File

@ -7,7 +7,7 @@
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
// *
// * Cxbx->Win32->CxbxKrnl->EmuD3D8->PushBuffer.h
// * core->HLE->D3D8->XbPushBuffer.h
// *
// * This file is part of the Cxbx project.
// *
@ -31,8 +31,8 @@
// * All rights reserved
// *
// ******************************************************************
#ifndef PUSHBUFFER_H
#define PUSHBUFFER_H
#ifndef XBPUSHBUFFER_H
#define XBPUSHBUFFER_H
extern int DxbxFVF_GetNumberOfTextureCoordinates(DWORD dwFVF, int aTextureIndex);
extern UINT DxbxFVFToVertexSizeInBytes(DWORD dwFVF, BOOL bIncludeTextures);
@ -52,4 +52,4 @@ extern void EmuExecutePushBufferRaw
uint32_t uSizeInBytes
);
#endif
#endif

2
src/CxbxKrnl/EmuD3D8/State.cpp → src/core/HLE/D3D8/XbState.cpp
View File

@ -9,7 +9,7 @@
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
// *
// * Cxbx->Win32->CxbxKrnl->EmuD3D->State.cpp
// * core->HLE->D3D8->XbState.cpp
// *
// * This file is part of the Cxbx project.
// *

8
src/CxbxKrnl/EmuD3D8/State.h → src/core/HLE/D3D8/XbState.h
View File

@ -7,7 +7,7 @@
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
// *
// * Cxbx->Win32->CxbxKrnl->EmuD3D8->State.h
// * core->HLE->D3D8->XbD3D8->State.h
// *
// * This file is part of the Cxbx project.
// *
@ -31,8 +31,8 @@
// * All rights reserved
// *
// ******************************************************************
#ifndef STATE_H
#define STATE_H
#ifndef XBSTATE_H
#define XBSTATE_H
#define X_D3DRS_UNSUPPORTED (X_D3DRS_LAST + 1)
@ -55,4 +55,4 @@ extern void EmuUpdateDeferredStates();
extern void CxbxUpdateNativeD3DResources();
#endif
#endif

2
src/CxbxKrnl/EmuD3D8/VertexBuffer.cpp → src/core/HLE/D3D8/XbVertexBuffer.cpp Executable file → Normal file
View File

@ -9,7 +9,7 @@
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
// *
// * Cxbx->Win32->CxbxKrnl->EmuD3D8->VertexBuffer.cpp
// * core->HLE->D3D8->XbVertexBuffer.cpp
// *
// * This file is part of the Cxbx project.
// *

6
src/CxbxKrnl/EmuD3D8/VertexBuffer.h → src/core/HLE/D3D8/XbVertexBuffer.h Executable file → Normal file
View File

@ -7,7 +7,7 @@
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
// *
// * Cxbx->Win32->CxbxKrnl->EmuD3D8->VertexBuffer.h
// * core->HLE->D3D8->XbVertexBuffer.h
// *
// * This file is part of the Cxbx project.
// *
@ -31,8 +31,8 @@
// * All rights reserved
// *
// ******************************************************************
#ifndef VERTEXBUFFER_H
#define VERTEXBUFFER_H
#ifndef XBVERTEXBUFFER_H
#define XBVERTEXBUFFER_H
#include "Cxbx.h"
//#include <ctime> // Conflict with io.h

4
src/CxbxKrnl/EmuD3D8/VertexShader.cpp → src/core/HLE/D3D8/XbVertexShader.cpp
View File

@ -9,7 +9,7 @@
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
// *
// * Cxbx->Win32->CxbxKrnl->EmuD3D8->VertexShader.cpp
// * core->HLE->D3D8->XbVertexShader.cpp
// *
// * This file is part of the Cxbx project.
// *
@ -43,7 +43,7 @@
#include "CxbxKrnl/Emu.h"
#include "CxbxKrnl/EmuFS.h"
#include "CxbxKrnl/EmuXTL.h"
#include "CxbxKrnl/EmuD3D8Types.h" // For X_D3DVSDE_*
#include "XbD3D8Types.h" // For X_D3DVSDE_*
#include <sstream>
#include <unordered_map>
#include <array>

6
src/CxbxKrnl/EmuD3D8/VertexShader.h → src/core/HLE/D3D8/XbVertexShader.h
View File

@ -7,7 +7,7 @@
// * `88bo,__,o, oP"``"Yo, _88o,,od8P oP"``"Yo,
// * "YUMMMMMP",m" "Mm,""YUMMMP" ,m" "Mm,
// *
// * Cxbx->Win32->CxbxKrnl->EmuD3D8->VertexShader.h
// * core->HLE->D3D8->XbVertexShader.h
// *
// * This file is part of the Cxbx project.
// *
@ -31,8 +31,8 @@
// * All rights reserved
// *
// ******************************************************************
#ifndef VERTEXSHADER_H
#define VERTEXSHADER_H
#ifndef XBVERTEXSHADER_H
#define XBVERTEXSHADER_H
#include "Cxbx.h"

2
src/core/HLE/XGRAPHIC/XGraphic.cpp
View File

@ -44,7 +44,7 @@
#include "CxbxKrnl/EmuFS.h"
#include "Common/Logging.h"
#include "CxbxKrnl/EmuXTL.h"
#include "CxbxKrnl/EmuD3D8Logging.h" // for log rendering of X_D3DFORMAT, etc.
#include "core/HLE/D3D8/XbD3D8Logging.h" // for log rendering of X_D3DFORMAT, etc.
// ******************************************************************
// * patch: XGIsSwizzledFormat