gitadora: show LEFT / RIGHT screens on sub screen in landscape mode (#900)

## Link to GitHub Issue or related Pull Request, if one exists
Continues #899 

## Description of change
#899 added the ability to display the gitadora subscreen in lanscape
mode with black bars on the side. With the new option the black bars can
instead display the LEFT / RIGHT screens, completing the two-monitor
full screen use case for arena model.

## Testing
This commit is contained in:
bicarus
2026-08-30 22:35:12 -07:00
committed by GitHub
parent 357e6c86f1
commit 0169fe1e31
11 changed files with 178 additions and 32 deletions
@@ -670,7 +670,7 @@ HRESULT STDMETHODCALLTYPE WrappedIDirect3DDevice9::Present(
// an adapter group device presents every head at once, so the SMALL head has to be
// composed here as well as in its own swap chain
if (gfdm_small_head.scaled()) {
gfdm_small_head.compose(pReal);
gfdm_small_head.compose(this);
}
CHECK_RESULT(pReal->Present(pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion));
@@ -2,6 +2,7 @@
#include <algorithm>
#include <cassert>
#include <cstring>
#include <mutex>
#include "games/gitadora/gitadora.h"
@@ -739,15 +740,118 @@ void GfdmSmallHead::release() {
}
}
HRESULT GfdmSmallHead::compose(IDirect3DDevice9 *device) {
// largest centered rect inside bounds that keeps the source's aspect ratio
static RECT gfdm_fit_centered(const RECT &bounds, LONG source_width, LONG source_height) {
const LONG bounds_width = bounds.right - bounds.left;
const LONG bounds_height = bounds.bottom - bounds.top;
if (bounds_width <= 0 || bounds_height <= 0 || source_width <= 0 || source_height <= 0) {
return RECT {};
}
LONG width = MulDiv(bounds_height, source_width, source_height);
LONG height = bounds_height;
if (width > bounds_width) {
width = bounds_width;
height = MulDiv(bounds_width, source_height, source_width);
}
const LONG left = bounds.left + (bounds_width - width) / 2;
const LONG top = bounds.top + (bounds_height - height) / 2;
return RECT { left, top, left + width, top + height };
}
static void gfdm_compose_side_heads(
WrappedIDirect3DDevice9 *device,
IDirect3DSurface9 *head,
LONG host_width,
LONG host_height,
const RECT &content)
{
if (!games::gitadora::arena_subscreen_shows_sides()) {
return;
}
const RECT bars[2] = {
{ 0, 0, content.left, host_height },
{ content.right, 0, host_width, host_height },
};
for (UINT swapchain = 1; swapchain < GFDM_LOGICAL_HEAD_COUNT; swapchain++) {
if (!device->is_gfdm_logical_side_swapchain(swapchain)) {
continue;
}
// nothing has been drawn yet if the game never asked for this head's back buffer
const auto *chain = device->fake_sub_swapchain[
device->gfdm_hidden_side_swapchain_slot(swapchain)];
if (chain == nullptr || chain->render_targets.empty()) {
continue;
}
// the head's own window is the only thing that says which side it is, so an
// unnamed one is left out rather than guessed at and possibly mirrored
const char *name = graphics_gitadora_window_name(
device->gfdm_logical_group_parameters[swapchain].hDeviceWindow);
const bool named_left = name != nullptr && strcmp(name, "LEFT") == 0;
const bool named_right = name != nullptr && strcmp(name, "RIGHT") == 0;
if (!named_left && !named_right) {
static std::once_flag warned;
std::call_once(warned, [] {
log_warning(
"graphics::d3d9",
"two-head exclusive: a side head has no LEFT or RIGHT window, "
"leaving its bar black");
});
continue;
}
const RECT &bar = bars[named_left ? 0 : 1];
if (bar.right <= bar.left) {
continue;
}
IDirect3DSurface9 *source = chain->render_targets[0];
D3DSURFACE_DESC source_desc {};
if (FAILED(source->GetDesc(&source_desc))) {
continue;
}
const RECT target = gfdm_fit_centered(
bar,
static_cast<LONG>(source_desc.Width),
static_cast<LONG>(source_desc.Height));
const HRESULT result = device->pReal->StretchRect(
source,
nullptr,
head,
&target,
D3DTEXF_LINEAR);
if (FAILED(result)) {
static std::once_flag warned;
std::call_once(warned, [result] {
log_warning(
"graphics::d3d9",
"two-head exclusive: could not draw a side head into the bars, hr={}",
FMT_HRESULT(result));
});
}
}
}
HRESULT GfdmSmallHead::compose(WrappedIDirect3DDevice9 *device) {
if (device == nullptr || device->pReal == nullptr) {
return D3DERR_INVALIDCALL;
}
IDirect3DDevice9 *real = device->pReal;
IDirect3DSurface9 *proxy = nullptr;
HRESULT result = backbuffer(device, &proxy);
HRESULT result = backbuffer(real, &proxy);
if (FAILED(result)) {
return result;
}
IDirect3DSurface9 *head = nullptr;
result = device->GetBackBuffer(
result = real->GetBackBuffer(
GFDM_NATIVE_SMALL_SWAPCHAIN,
0,
D3DBACKBUFFER_TYPE_MONO,
@@ -760,14 +864,18 @@ HRESULT GfdmSmallHead::compose(IDirect3DDevice9 *device) {
D3DSURFACE_DESC desc {};
result = head->GetDesc(&desc);
if (SUCCEEDED(result)) {
const auto host_width = static_cast<LONG>(desc.Width);
const auto host_height = static_cast<LONG>(desc.Height);
const RECT content = games::gitadora::arena_subscreen_content_rect(
static_cast<LONG>(desc.Width),
static_cast<LONG>(desc.Height));
host_width,
host_height);
// discard swap effect leaves the whole head undefined every frame, so the bars
// have to be repainted along with the image
device->ColorFill(head, nullptr, D3DCOLOR_XRGB(0, 0, 0));
result = device->StretchRect(proxy, nullptr, head, &content, D3DTEXF_LINEAR);
real->ColorFill(head, nullptr, D3DCOLOR_XRGB(0, 0, 0));
result = real->StretchRect(proxy, nullptr, head, &content, D3DTEXF_LINEAR);
gfdm_compose_side_heads(device, head, host_width, host_height, content);
}
head->Release();
@@ -13,6 +13,8 @@ inline constexpr UINT GFDM_SMALL_HEIGHT = games::gitadora::ARENA_SUBSCREEN_HEIGH
inline constexpr UINT GFDM_LOGICAL_HEAD_COUNT = 4;
inline constexpr UINT GFDM_NATIVE_SMALL_SWAPCHAIN = 1;
struct WrappedIDirect3DDevice9;
// Owns the portrait surface the game draws into while the SMALL head is scanned out at a
// different resolution, and composes it onto the real head. Allocates nothing and reports
// nothing until resolve() finds a head that is not the panel size.
@@ -27,7 +29,7 @@ struct GfdmSmallHead {
bool scaled() const { return active; }
HRESULT backbuffer(IDirect3DDevice9 *device, IDirect3DSurface9 **out);
HRESULT compose(IDirect3DDevice9 *device);
HRESULT compose(WrappedIDirect3DDevice9 *device);
void release();
// the game only ever sees the portrait size it asked for
@@ -96,7 +96,7 @@ HRESULT STDMETHODCALLTYPE WrappedIDirect3DSwapChain9::Present(const RECT *pSourc
}
if (scales_small_head(this)) {
pDev->gfdm_small_head.compose(pDev->pReal);
pDev->gfdm_small_head.compose(pDev);
}
HRESULT result = pReal->Present(
+4
View File
@@ -233,6 +233,10 @@ bool graphics_gitadora_has_dedicated_subscreen() {
return GFDM_SUBSCREEN_WINDOW != nullptr;
}
const char *graphics_gitadora_window_name(HWND hWnd) {
return gitadora_window_name_for_hwnd(hWnd);
}
bool graphics_gitadora_prepare_two_head_device_window(
HWND hWnd, HMONITOR target_monitor, UINT desired_width, UINT desired_height) {
if (hWnd == nullptr || !IsWindow(hWnd)) {
+3
View File
@@ -122,6 +122,9 @@ extern bool D3D9_DEVICE_HOOK_DISABLE;
void graphics_init();
void graphics_hook_window(HWND hWnd, D3DPRESENT_PARAMETERS *pPresentationParameters);
bool graphics_gitadora_has_dedicated_subscreen();
// "GITADORA", "LEFT", "RIGHT", "SMALL", or nullptr for anything else
const char *graphics_gitadora_window_name(HWND hWnd);
// The native GITADORA two-head D3D9 group uses the game's named SMALL
// device window for the native physical SMALL head. The game requests
// D3DCREATE_NOWINDOWCHANGES, so this host must be made borderless and sized