GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-10-17 01:26:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make viewports fallback to viewport 0 when their dimensions are invalid

Browse Source 
OpenGL games use a zero width/height for viewports 1-15 when they're unused
This commit is contained in:
Billy Laws 2022-09-29 20:57:41 +01:00
parent 586f872655
commit 60863fa162
3 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/active_state.cpp
View File

@ -206,7 +206,10 @@ namespace skyline::gpu::interconnect::maxwell3d {
/* Viewport */
void ViewportState::EngineRegisters::DirtyBind(DirtyManager &manager, dirty::Handle handle) const {
manager.Bind(handle, viewport.offsetX, viewport.offsetY, viewport.scaleX, viewport.scaleY, viewport.swizzle,
manager.Bind(handle,
viewport0.offsetX, viewport0.offsetY, viewport0.scaleX, viewport0.scaleY, viewport0.swizzle,
viewportClip0,
viewport.offsetX, viewport.offsetY, viewport.scaleX, viewport.scaleY, viewport.swizzle,
viewportClip,
windowOrigin,
viewportScaleOffsetEnable);
@ -214,6 +217,37 @@ namespace skyline::gpu::interconnect::maxwell3d {
ViewportState::ViewportState(dirty::Handle dirtyHandle, DirtyManager &manager, const EngineRegisters &engine, u32 index) : engine{manager, dirtyHandle, engine}, index{index} {}
static vk::Viewport ConvertViewport(const engine::Viewport &viewport, const engine::ViewportClip &viewportClip, const engine::WindowOrigin &windowOrigin, bool viewportScaleOffsetEnable) {
vk::Viewport vkViewport{};
vkViewport.x = viewport.offsetX - viewport.scaleX; // Counteract the addition of the half of the width (o_x) to the host translation
vkViewport.width = viewport.scaleX * 2.0f; // Counteract the division of the width (p_x) by 2 for the host scale
vkViewport.y = viewport.offsetY - viewport.scaleY; // Counteract the addition of the half of the height (p_y/2 is center) to the host translation (o_y)
vkViewport.height = viewport.scaleY * 2.0f; // Counteract the division of the height (p_y) by 2 for the host scale
using CoordinateSwizzle = engine::Viewport::CoordinateSwizzle;
if (viewport.swizzle.x != CoordinateSwizzle::PosX &&
viewport.swizzle.y != CoordinateSwizzle::PosY && viewport.swizzle.y != CoordinateSwizzle::NegY &&
viewport.swizzle.z != CoordinateSwizzle::PosZ &&
viewport.swizzle.w != CoordinateSwizzle::PosW)
throw exception("Unsupported viewport swizzle: {}x{}x{}x{}", engine::Viewport::ToString(viewport.swizzle.x),
engine::Viewport::ToString(viewport.swizzle.y),
engine::Viewport::ToString(viewport.swizzle.z),
engine::Viewport::ToString(viewport.swizzle.w));
// If swizzle and origin mode cancel out then do nothing, otherwise flip the viewport
if ((viewport.swizzle.y == CoordinateSwizzle::NegY) != (windowOrigin.lowerLeft != 0)) {
// Flip the viewport given that the viewport origin is lower left or the viewport Y has been flipped via a swizzle but not if both are active at the same time
vkViewport.y += vkViewport.height;
vkViewport.height = -vkViewport.height;
}
// Clamp since we don't yet use VK_EXT_unrestricted_depth_range
vkViewport.minDepth = std::clamp(viewportClip.minZ, 0.0f, 1.0f);
vkViewport.maxDepth = std::clamp(viewportClip.maxZ, 0.0f, 1.0f);
return vkViewport;
}
void ViewportState::Flush(InterconnectContext &ctx, StateUpdateBuilder &builder) {
if (index != 0 && !ctx.gpu.traits.supportsMultipleViewports)
return;
@ -222,34 +256,10 @@ namespace skyline::gpu::interconnect::maxwell3d {
// https://github.com/Ryujinx/Ryujinx/pull/3328
Logger::Warn("Viewport scale/offset disable is unimplemented");
vk::Viewport viewport{};
viewport.x = engine->viewport.offsetX - engine->viewport.scaleX; // Counteract the addition of the half of the width (o_x) to the host translation
viewport.width = engine->viewport.scaleX * 2.0f; // Counteract the division of the width (p_x) by 2 for the host scale
viewport.y = engine->viewport.offsetY - engine->viewport.scaleY; // Counteract the addition of the half of the height (p_y/2 is center) to the host translation (o_y)
viewport.height = engine->viewport.scaleY * 2.0f; // Counteract the division of the height (p_y) by 2 for the host scale
using CoordinateSwizzle = engine::Viewport::CoordinateSwizzle;
if (engine->viewport.swizzle.x != CoordinateSwizzle::PosX &&
engine->viewport.swizzle.y != CoordinateSwizzle::PosY && engine->viewport.swizzle.y != CoordinateSwizzle::NegY &&
engine->viewport.swizzle.z != CoordinateSwizzle::PosZ &&
engine->viewport.swizzle.w != CoordinateSwizzle::PosW)
throw exception("Unsupported viewport swizzle: {}x{}x{}x{}", engine::Viewport::ToString(engine->viewport.swizzle.x),
engine::Viewport::ToString(engine->viewport.swizzle.y),
engine::Viewport::ToString(engine->viewport.swizzle.z),
engine::Viewport::ToString(engine->viewport.swizzle.w));
// If swizzle and origin mode cancel out then do nothing, otherwise flip the viewport
if ((engine->viewport.swizzle.y == CoordinateSwizzle::NegY) != (engine->windowOrigin.lowerLeft != 0)) {
// Flip the viewport given that the viewport origin is lower left or the viewport Y has been flipped via a swizzle but not if both are active at the same time
viewport.y += viewport.height;
viewport.height = -viewport.height;
}
// Clamp since we don't yet use VK_EXT_unrestricted_depth_range
viewport.minDepth = std::clamp(engine->viewportClip.minZ, 0.0f, 1.0f);
viewport.maxDepth = std::clamp(engine->viewportClip.maxZ, 0.0f, 1.0f);
builder.SetViewport(index, viewport);
if (engine->viewport.scaleX == 0.0f || engine->viewport.scaleY == 0.0f)
builder.SetViewport(index, ConvertViewport(engine->viewport0, engine->viewportClip0, engine->windowOrigin, engine->viewportScaleOffsetEnable));
else
builder.SetViewport(index, ConvertViewport(engine->viewport, engine->viewportClip, engine->windowOrigin, engine->viewportScaleOffsetEnable));
}
/* Scissor */

2
app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/active_state.h
View File

@ -85,6 +85,8 @@ namespace skyline::gpu::interconnect::maxwell3d {
class ViewportState : dirty::ManualDirty {
public:
struct EngineRegisters {
const engine::Viewport &viewport0;
const engine::ViewportClip &viewportClip0;
const engine::Viewport &viewport;
const engine::ViewportClip &viewportClip;
const engine::WindowOrigin &windowOrigin;

2
app/src/main/cpp/skyline/soc/gm20b/engines/maxwell_3d.cpp
View File

@ -34,7 +34,7 @@ namespace skyline::soc::gm20b::engine::maxwell3d {
.vertexBuffersRegisters = util::MergeInto<REGTYPE(VertexBufferState), type::VertexStreamCount>(*registers.vertexStreams, *registers.vertexStreamLimits),
.indexBufferRegisters = {*registers.indexBuffer},
.transformFeedbackBuffersRegisters = util::MergeInto<REGTYPE(TransformFeedbackBufferState), type::StreamOutBufferCount>(*registers.streamOutBuffers, *registers.streamOutEnable),
.viewportsRegisters = util::MergeInto<REGTYPE(ViewportState), type::ViewportCount>(*registers.viewports, *registers.viewportClips, *registers.windowOrigin, *registers.viewportScaleOffsetEnable),
.viewportsRegisters = util::MergeInto<REGTYPE(ViewportState), type::ViewportCount>(registers.viewports[0], registers.viewportClips[0], *registers.viewports, *registers.viewportClips, *registers.windowOrigin, *registers.viewportScaleOffsetEnable),
.scissorsRegisters = util::MergeInto<REGTYPE(ScissorState), type::ViewportCount>(*registers.scissors),
.lineWidthRegisters = {*registers.lineWidth, *registers.lineWidthAliased, *registers.aliasedLineWidthEnable},
.depthBiasRegisters = {*registers.depthBias, *registers.depthBiasClamp, *registers.slopeScaleDepthBias},