Skip to content

Correct System 246 (480P) aspect ratio & Vulkan visual improvement #1602

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

Open
pizzzza19 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Correct System 246 (480P) aspect ratio & Vulkan visual improvement #1602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5481eae
[GSH_VulkanPresent.cpp] bilinear interpolation in Vulkan
pizzzza19 Jul 18, 2026
5650e7f
[GSHandler.cpp] Correct size CRT_MODE_HDTV_480P
pizzzza19 Jul 18, 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
88 changes: 61 additions & 27 deletions Source/gs/GSH_Vulkan/GSH_VulkanPresent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,33 +732,67 @@ Framework::Vulkan::CShaderModule CPresent::CreateFragmentShader(const PIPELINE_C
auto bufAddress = presentBufParams->x();
auto bufWidth = presentBufParams->y();
auto layerSize = presentRectParams->zw();

auto screenPos = ToInt(inputTexCoord->xy() * ToFloat(layerSize));

switch(caps.bufPsm)
{
default:
assert(false);
[[fallthrough]];
case CGSHandler::PSMCT32:
case CGSHandler::PSMCT24:
{
auto address = CMemoryUtils::GetPixelAddress<CGsPixelFormats::STORAGEPSMCT32>(
b, swizzleTable, bufAddress, bufWidth, screenPos);
auto imageColor = CMemoryUtils::Memory_Read32(b, memoryBuffer, address);
outputColor = CMemoryUtils::PSM32ToVec4(b, imageColor);
}
break;
case CGSHandler::PSMCT16:
case CGSHandler::PSMCT16S:
{
auto address = CMemoryUtils::GetPixelAddress<CGsPixelFormats::STORAGEPSMCT16>(
b, swizzleTable, bufAddress, bufWidth, screenPos);
auto imageColor = CMemoryUtils::Memory_Read16(b, memoryBuffer, address);
outputColor = CMemoryUtils::PSM16ToVec4(b, imageColor);
}
break;
}
auto maxPos = NewInt2(layerSize->x() - NewInt(b, 1), layerSize->y() - NewInt(b, 1));
auto ReadTexel = [&](Nuanceur::CInt2Value rawPos) -> Nuanceur::CFloat4Rvalue {
auto pos = NewInt2(
Clamp(rawPos->x(), NewInt(b, 0), maxPos->x()),
Clamp(rawPos->y(), NewInt(b, 0), maxPos->y()));
switch(caps.bufPsm)
{
default:
assert(false);
[[fallthrough]];
case CGSHandler::PSMCT32:
case CGSHandler::PSMCT24:
{
auto address = CMemoryUtils::GetPixelAddress<CGsPixelFormats::STORAGEPSMCT32>(
b, swizzleTable, bufAddress, bufWidth, pos);
auto imageColor = CMemoryUtils::Memory_Read32(b, memoryBuffer, address);
return CMemoryUtils::PSM32ToVec4(b, imageColor);
}
case CGSHandler::PSMCT16:
case CGSHandler::PSMCT16S:
{
auto address = CMemoryUtils::GetPixelAddress<CGsPixelFormats::STORAGEPSMCT16>(
b, swizzleTable, bufAddress, bufWidth, pos);
auto imageColor = CMemoryUtils::Memory_Read16(b, memoryBuffer, address);
return CMemoryUtils::PSM16ToVec4(b, imageColor);
}
}
};

auto rawPosF = inputTexCoord->xy() * ToFloat(layerSize);
auto half = NewFloat(b, 0.5f);
auto srcPosF = NewFloat2(rawPosF->x() - half, rawPosF->y() - half);
auto basePos = ToInt(srcPosF);
auto frac = Fract(srcPosF);
auto fx = frac->x();
auto fy = frac->y();

auto posX1Y0 = NewInt2(basePos->x() + NewInt(b, 1), basePos->y());
auto posX0Y1 = NewInt2(basePos->x(), basePos->y() + NewInt(b, 1));
auto posX1Y1 = NewInt2(basePos->x() + NewInt(b, 1), basePos->y() + NewInt(b, 1));

auto c00 = ReadTexel(basePos);
auto c10 = ReadTexel(posX1Y0);
auto c01 = ReadTexel(posX0Y1);
auto c11 = ReadTexel(posX1Y1);

auto one = NewFloat(b, 1.0f);
auto oneMinusFx = one - fx;
auto oneMinusFy = one - fy;

auto w00 = oneMinusFx * oneMinusFy;
auto w10 = fx * oneMinusFy;
auto w01 = oneMinusFx * fy;
auto w11 = fx * fy;

auto Broadcast4 = [&](Nuanceur::CFloatValue w) -> Nuanceur::CFloat4Rvalue {
return NewFloat4(w, w, w, w);
};

outputColor = (c00 * Broadcast4(w00)) + (c10 * Broadcast4(w10)) +
(c01 * Broadcast4(w01)) + (c11 * Broadcast4(w11));
}

Framework::CMemStream shaderStream;
Expand Down
7 changes: 7 additions & 0 deletions Source/gs/GSHandler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,13 @@ CGSHandler::PRESENTATION_VIEWPORT CGSHandler::GetPresentationViewport() const
{
PRESENTATION_VIEWPORT viewport;
auto sourceSize = std::make_pair(GetCrtWidth(), GetCrtHeight());

//720x480(HDTV_480P) should be 4:3
if(m_crtMode == CRT_MODE_HDTV_480P)
{
sourceSize = std::make_pair(640u, 480u);
}

if(CAppConfig::GetInstance().GetPreferenceBoolean(PREF_CGSHANDLER_WIDESCREEN))
{
sourceSize = std::make_pair(1920, 1080);
Expand Down
Loading