Skip to content

Switch to DirectX based render backend #2212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
secsome wants to merge 21 commits into
base: develop
Choose a base branch
from
Draft

Switch to DirectX based render backend #2212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ec0ada5
Refactor ddraw render backend into software surface + directx12 swapc…
secsome May 16, 2026
576ce82
Enhance D3D12/DXGI error logging with HRESULTs and Win32 error codes
secsome May 16, 2026
9d57762
Disable bink movie render temporary
secsome May 16, 2026
685c9f4
Fix wrong resolution detection bpp
secsome May 16, 2026
4ce6145
Fix wrong PrimarySurface creation width and height
secsome May 16, 2026
1f6a77c
Refine D3D12 device creation with preferred adapter and WARP fallbacks
secsome May 17, 2026
ef8a003
Add AGENTS.md
secsome May 17, 2026
8b0ddb1
Switch to DirectX11 for compability
secsome May 17, 2026
f857e7f
Update .gitignore
secsome May 18, 2026
e80e9a4
Rename hook files, split WWUI hooks
secsome May 18, 2026
781ab10
Fix bink movie not calling present
secsome May 18, 2026
e642b02
Replace game OwnerDraw implementations
secsome May 27, 2026
c15668e
Fix ProgressScreenClass crash
secsome May 27, 2026
a717ee0
Implement DXSurface::CopyFrom for scaled copy
secsome May 27, 2026
4a0ccdb
Improve DXSurface scaled copy initialization
secsome May 27, 2026
3d3301d
Implement always scaling support
secsome May 28, 2026
e55f1b6
Automatically set HighDpiAwareness before creating main window
secsome May 28, 2026
0c75746
Fix wrong OptionDialog control position
secsome May 28, 2026
d6e8776
Remove gamemd comment in StringTable::LoadString
secsome May 28, 2026
f8134c1
Tidy OwnerDrawStandardWndProc
secsome May 28, 2026
99a9028
Sync with YRpp changes
secsome May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ out
.venv/

debug.log
Phobos.log
gamemd.*
1 change: 1 addition & 0 deletions AGENTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.github/copilot-instructions.md
2 changes: 1 addition & 1 deletion Phobos.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<OutDir>$(Configuration)\</OutDir>
<IntDir>$(Configuration)\IntDir\</IntDir>
<CoreLibraryDependencies></CoreLibraryDependencies>
<PhobosExtraLibs>dbghelp.lib;onecore.lib</PhobosExtraLibs>
<PhobosExtraLibs>dbghelp.lib;onecore.lib;imm32.lib</PhobosExtraLibs>
</PropertyGroup>
<!-- Global -->
<ItemDefinitionGroup>
Expand Down
36 changes: 36 additions & 0 deletions Phobos.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,31 @@
<ClCompile Include="src\New\Type\Affiliated\PassengerDeletionTypeClass.cpp" />
<ClCompile Include="src\New\Type\Affiliated\TiberiumEaterTypeClass.cpp" />
<ClCompile Include="src\New\Type\Affiliated\TypeConvertGroup.cpp" />
<!-- src\OwnerDraw -->
<ClCompile Include="src\OwnerDraw\Button.cpp" />
<ClCompile Include="src\OwnerDraw\ComboBox.cpp" />
<ClCompile Include="src\OwnerDraw\Edit.cpp" />
<ClCompile Include="src\OwnerDraw\GroupBox.cpp" />
<ClCompile Include="src\OwnerDraw\Input.cpp" />
<ClCompile Include="src\OwnerDraw\ListBox.cpp" />
<ClCompile Include="src\OwnerDraw\OwnerDraw.cpp" />
<ClCompile Include="src\OwnerDraw\OwnerDraw.Hooks.cpp" />
<ClCompile Include="src\OwnerDraw\Progress.cpp" />
<ClCompile Include="src\OwnerDraw\ScrollBar.cpp" />
<ClCompile Include="src\OwnerDraw\Slider.cpp" />
<ClCompile Include="src\OwnerDraw\Static.cpp" />
<ClCompile Include="src\OwnerDraw\Tab.cpp" />
<!-- src\Render -->
<ClCompile Include="src\Render\Functions.cpp" />
<ClCompile Include="src\Render\Hooks.cpp" />
<ClCompile Include="src\Render\Mouse.cpp" />
<ClCompile Include="src\Render\Mouse.Hooks.cpp" />
<ClCompile Include="src\Render\Options.Hooks.cpp" />
<ClCompile Include="src\Render\Renderer.cpp" />
<ClCompile Include="src\Render\Surface.cpp" />
<ClCompile Include="src\Render\Surface.Hooks.cpp" />
<!-- src\Utilities -->
<ClCompile Include="src\Render\WWUI.Hooks.cpp" />
<ClCompile Include="src\Utilities\Anchor.cpp" />
<ClCompile Include="src\Utilities\AresAddressInit.cpp" />
<ClCompile Include="src\Utilities\AresHelper.cpp" />
Expand Down Expand Up @@ -387,6 +411,18 @@
<ClInclude Include="src\New\Type\Affiliated\PassengerDeletionTypeClass.h" />
<ClInclude Include="src\New\Type\Affiliated\TiberiumEaterTypeClass.h" />
<ClInclude Include="src\New\Type\Affiliated\TypeConvertGroup.h" />
<!-- src\OwnerDraw -->
<ClInclude Include="src\OwnerDraw\OwnerDraw.h" />
<ClInclude Include="src\OwnerDraw\OwnerDraw.Internal.h" />
<!-- src\Render -->
<ClInclude Include="src\Render\Functions.h" />
<ClInclude Include="src\Render\Mouse.h" />
<ClInclude Include="src\Render\Options.h" />
<ClInclude Include="src\Render\Renderer.h" />
<ClInclude Include="src\Render\Renderer.SurfacePS.h" />
<ClInclude Include="src\Render\Renderer.SurfaceVS.h" />
<ClInclude Include="src\Render\Surface.h" />
<ClInclude Include="src\Render\WWUI.h" />
<!-- src\Utilities -->
<ClInclude Include="src\Utilities\Anchor.h" />
<ClInclude Include="src\Utilities\AresFunctions.h" />
Expand Down
2 changes: 1 addition & 1 deletion YRpp
Open in desktop
Submodule YRpp updated 8 files
+10 −0 BitFont.h
+1 −0 BitText.h
+34 −0 Blitters/BlitPlain.h
+36 −0 Blitters/BlitTrans.h
+11 −0 Drawing.h
+766 −18 OwnerDraw.h
+3 −0 UI.h
+2 −0 YRpp.props
30 changes: 0 additions & 30 deletions src/Misc/RetryDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
#include <GScreenClass.h>
#include <EvadeClass.h>

namespace RetryDialogFlag
{
bool IsCalledFromRetryDialog = false;
}

DEFINE_HOOK(0x686092, DoLose_RetryDialogForCampaigns, 0x7)
{
enum { OK = 0x6860F6, Cancel = 0x6860EE, LoadGame = 0x686231 };
Expand Down Expand Up @@ -39,9 +34,7 @@ DEFINE_HOOK(0x686092, DoLose_RetryDialogForCampaigns, 0x7)

case WWMessageBox::Result::Button1:
auto pDialog = GameCreate<LoadOptionsClass>();
RetryDialogFlag::IsCalledFromRetryDialog = true;
const bool bIsAboutToLoad = pDialog->LoadDialog();
RetryDialogFlag::IsCalledFromRetryDialog = false;
GameDelete(pDialog);

if (!bIsAboutToLoad)
Expand All @@ -63,26 +56,3 @@ DEFINE_HOOK(0x686092, DoLose_RetryDialogForCampaigns, 0x7)

return LoadGame;
}

DEFINE_HOOK(0x558F4E, LoadOptionClass_Dialog_CenterListBox, 0x5)
{
if (RetryDialogFlag::IsCalledFromRetryDialog)
{
GET(HWND, hListBox, EAX);
GET(HWND, hDialog, EDI);

HWND hLoadButton = GetDlgItem(hDialog, 1039);

RECT buttonRect;
GetWindowRect(hLoadButton, &buttonRect);

float scaleX = static_cast<float>(buttonRect.right - buttonRect.left) / 108;
float scaleY = static_cast<float>(buttonRect.bottom - buttonRect.top) / 22;
int X = buttonRect.left - static_cast<int>(346 * scaleX);
int Y = buttonRect.top - static_cast<int>(44 * scaleY);

SetWindowPos(hListBox, NULL, X, Y, NULL, NULL, SWP_NOSIZE | SWP_NOZORDER);
}

return 0;
}
Loading
Loading