The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-11-27 05:24:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use surfaceClip as a hint for the underlying rendertarget size

Browse Source 
TIC sizes may not be aligned to block linear dimensions whereas RT sizes are and then limited by the surface clip. By using this to determine surface size we are more likely to get a match in texture manager for any future usages.
This commit is contained in:
Billy Laws 2022-10-09 16:35:35 +01:00
parent 297597f697
commit 27de42f8df
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/src/main/cpp/skyline/gpu/interconnect/maxwell_3d/pipeline_state.cpp
View File

@ -13,9 +13,23 @@
#include "pipeline_state.h" #include "pipeline_state.h"
namespace skyline::gpu::interconnect::maxwell3d { namespace skyline::gpu::interconnect::maxwell3d {
static void DetermineRenderTargetDimensions(GuestTexture &guest, const engine::SurfaceClip &clip) {
// RT dimensions always include block linear alignment and contain the unaligned dimensions in surface clip, we ideally want to create the texture using the unaligned dimensions since the texture manager doesn't support resolving such overlaps yet. By checking that the layer size calculated is equal to the RT size we can eliminate most cases where the clip is used not just for aligmnent
u32 underlyingRtLayerSize{guest.CalculateLayerSize()};
texture::Dimensions underlyingRtDimensions{guest.dimensions};
guest.dimensions = texture::Dimensions{static_cast<u32>(clip.horizontal.width + clip.horizontal.x),
static_cast<u32>(clip.vertical.height + clip.vertical.y),
guest.dimensions.depth};
u32 clippedRtLayerSize{guest.CalculateLayerSize()};
// If the calculated sizes don't match then always use the RT dimensions
if (clippedRtLayerSize != underlyingRtLayerSize)
guest.dimensions = underlyingRtDimensions;
}
/* Colour Render Target */ /* Colour Render Target */
void ColorRenderTargetState::EngineRegisters::DirtyBind(DirtyManager &manager, dirty::Handle handle) const { void ColorRenderTargetState::EngineRegisters::DirtyBind(DirtyManager &manager, dirty::Handle handle) const {
manager.Bind(handle, colorTarget); manager.Bind(handle, colorTarget, surfaceClip);
} }
ColorRenderTargetState::ColorRenderTargetState(dirty::Handle dirtyHandle, DirtyManager &manager, const EngineRegisters &engine, size_t index) : engine{manager, dirtyHandle, engine}, index{index} {} ColorRenderTargetState::ColorRenderTargetState(dirty::Handle dirtyHandle, DirtyManager &manager, const EngineRegisters &engine, size_t index) : engine{manager, dirtyHandle, engine}, index{index} {}
@ -145,15 +159,19 @@ namespace skyline::gpu::interconnect::maxwell3d {
auto mappings{ctx.channelCtx.asCtx->gmmu.TranslateRange(target.offset, guest.GetSize())}; auto mappings{ctx.channelCtx.asCtx->gmmu.TranslateRange(target.offset, guest.GetSize())};
guest.mappings.assign(mappings.begin(), mappings.end()); guest.mappings.assign(mappings.begin(), mappings.end());
if (guest.MappingsValid()) if (guest.MappingsValid()) {
view = ctx.executor.AcquireTextureManager().FindOrCreate(guest, ctx.executor.tag); if (guest.tileConfig.mode == gpu::texture::TileMode::Block)
else DetermineRenderTargetDimensions(guest, engine->surfaceClip);
view = ctx.gpu.texture.FindOrCreate(guest, ctx.executor.tag);
} else {
view = {}; view = {};
}
} }
/* Depth Render Target */ /* Depth Render Target */
void DepthRenderTargetState::EngineRegisters::DirtyBind(DirtyManager &manager, dirty::Handle handle) const { void DepthRenderTargetState::EngineRegisters::DirtyBind(DirtyManager &manager, dirty::Handle handle) const {
manager.Bind(handle, ztSize, ztOffset, ztFormat, ztBlockSize, ztArrayPitch, ztSelect, ztLayer); manager.Bind(handle, ztSize, ztOffset, ztFormat, ztBlockSize, ztArrayPitch, ztSelect, ztLayer, surfaceClip);
} }
DepthRenderTargetState::DepthRenderTargetState(dirty::Handle dirtyHandle, DirtyManager &manager, const EngineRegisters &engine) : engine{manager, dirtyHandle, engine} {} DepthRenderTargetState::DepthRenderTargetState(dirty::Handle dirtyHandle, DirtyManager &manager, const EngineRegisters &engine) : engine{manager, dirtyHandle, engine} {}
@ -212,10 +230,14 @@ namespace skyline::gpu::interconnect::maxwell3d {
auto mappings{ctx.channelCtx.asCtx->gmmu.TranslateRange(engine->ztOffset, guest.GetSize())}; auto mappings{ctx.channelCtx.asCtx->gmmu.TranslateRange(engine->ztOffset, guest.GetSize())};
guest.mappings.assign(mappings.begin(), mappings.end()); guest.mappings.assign(mappings.begin(), mappings.end());
if (guest.MappingsValid()) if (guest.MappingsValid()) {
view = ctx.executor.AcquireTextureManager().FindOrCreate(guest, ctx.executor.tag); if (guest.tileConfig.mode == gpu::texture::TileMode::Block)
else DetermineRenderTargetDimensions(guest, engine->surfaceClip);
view = ctx.gpu.texture.FindOrCreate(guest, ctx.executor.tag);
} else {
view = {}; view = {};
}
} }
/* Pipeline Stages */ /* Pipeline Stages */

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

@ -14,6 +14,7 @@ namespace skyline::gpu::interconnect::maxwell3d {
public: public:
struct EngineRegisters { struct EngineRegisters {
const engine::ColorTarget &colorTarget; const engine::ColorTarget &colorTarget;
const engine::SurfaceClip &surfaceClip;
void DirtyBind(DirtyManager &manager, dirty::Handle handle) const; void DirtyBind(DirtyManager &manager, dirty::Handle handle) const;
}; };
@ -40,6 +41,7 @@ namespace skyline::gpu::interconnect::maxwell3d {
const u32 &ztArrayPitch; const u32 &ztArrayPitch;
const engine::ZtSelect &ztSelect; const engine::ZtSelect &ztSelect;
const engine::ZtLayer &ztLayer; const engine::ZtLayer &ztLayer;
const engine::SurfaceClip &surfaceClip;
void DirtyBind(DirtyManager &manager, dirty::Handle handle) const; void DirtyBind(DirtyManager &manager, dirty::Handle handle) const;
}; };