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

Use TIC maximum index over TSC when tscIndexLinked is set

Browse Source
This commit is contained in:
Billy Laws 2022-05-12 17:09:51 +01:00
parent 8e021a9f1f
commit d08ac63bbf
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/cpp/skyline/gpu/interconnect/graphics_context.h
View File

@ -1213,7 +1213,7 @@ namespace skyline::gpu::interconnect {
if (tscIndexLinked) if (tscIndexLinked)
handle.samplerIndex = handle.textureIndex; handle.samplerIndex = handle.textureIndex;
auto sampler{GetSampler(handle.samplerIndex)}; auto sampler{GetSampler(handle.samplerIndex, tscIndexLinked)};
auto textureView{GetPoolTextureView(handle.textureIndex)}; auto textureView{GetPoolTextureView(handle.textureIndex)};
std::scoped_lock lock(*textureView); std::scoped_lock lock(*textureView);
@ -2374,6 +2374,7 @@ namespace skyline::gpu::interconnect {
void SetTscIndexLinked(bool isTscIndexLinked) { void SetTscIndexLinked(bool isTscIndexLinked) {
tscIndexLinked = isTscIndexLinked; tscIndexLinked = isTscIndexLinked;
samplerPool.samplerControls = nullptr;
} }
private: private:
@ -2490,9 +2491,9 @@ namespace skyline::gpu::interconnect {
return vk::BorderColor::eFloatTransparentBlack; return vk::BorderColor::eFloatTransparentBlack;
} }
std::shared_ptr<Sampler> GetSampler(u32 index) { std::shared_ptr<Sampler> GetSampler(u32 index, bool tscIndexLinked) {
if (!samplerPool.samplerControls.valid()) { if (!samplerPool.samplerControls.valid()) {
auto mappings{channelCtx.asCtx->gmmu.TranslateRange(samplerPool.iova, samplerPool.maximumIndex * sizeof(TextureSamplerControl))}; auto mappings{channelCtx.asCtx->gmmu.TranslateRange(samplerPool.iova, (tscIndexLinked ? texturePool.maximumIndex : samplerPool.maximumIndex) * sizeof(TextureSamplerControl))};
if (mappings.size() != 1) if (mappings.size() != 1)
throw exception("Sampler pool mapping count is unexpected: {}", mappings.size()); throw exception("Sampler pool mapping count is unexpected: {}", mappings.size());
samplerPool.samplerControls = mappings.front().cast<TextureSamplerControl>(); samplerPool.samplerControls = mappings.front().cast<TextureSamplerControl>();