2019-10-13 08:02:07 +02:00
|
|
|
using Ryujinx.Common;
|
|
|
|
using Ryujinx.Graphics.GAL;
|
|
|
|
using Ryujinx.Graphics.Gpu.Image;
|
|
|
|
using Ryujinx.Graphics.Gpu.Memory;
|
|
|
|
using Ryujinx.Graphics.Gpu.State;
|
|
|
|
using Ryujinx.Graphics.Texture;
|
Memory Read/Write Tracking using Region Handles (#1272)
* WIP Range Tracking
- Texture invalidation seems to have large problems
- Buffer/Pool invalidation may have problems
- Mirror memory tracking puts an additional `add` in compiled code, we likely just want to make HLE access slower if this is the final solution.
- Native project is in the messiest possible location.
- [HACK] JIT memory access always uses native "fast" path
- [HACK] Trying some things with texture invalidation and views.
It works :)
Still a few hacks, messy things, slow things
More work in progress stuff (also move to memory project)
Quite a bit faster now.
- Unmapping GPU VA and CPU VA will now correctly update write tracking regions, and invalidate textures for the former.
- The Virtual range list is now non-overlapping like the physical one.
- Fixed some bugs where regions could leak.
- Introduced a weird bug that I still need to track down (consistent invalid buffer in MK8 ribbon road)
Move some stuff.
I think we'll eventually just put the dll and so for this in a nuget package.
Fix rebase.
[WIP] MultiRegionHandle variable size ranges
- Avoid reprotecting regions that change often (needs some tweaking)
- There's still a bug in buffers, somehow.
- Might want different api for minimum granularity
Fix rebase issue
Commit everything needed for software only tracking.
Remove native components.
Remove more native stuff.
Cleanup
Use a separate window for the background context, update opentk. (fixes linux)
Some experimental changes
Should get things working up to scratch - still need to try some things with flush/modification and res scale.
Include address with the region action.
Initial work to make range tracking work
Still a ton of bugs
Fix some issues with the new stuff.
* Fix texture flush instability
There's still some weird behaviour, but it's much improved without this. (textures with cpu modified data were flushing over it)
* Find the destination texture for Buffer->Texture full copy
Greatly improves performance for nvdec videos (with range tracking)
* Further improve texture tracking
* Disable Memory Tracking for view parents
This is a temporary approach to better match behaviour on master (where invalidations would be soaked up by views, rather than trigger twice)
The assumption is that when views are created to a texture, they will cover all of its data anyways. Of course, this can easily be improved in future.
* Introduce some tracking tests.
WIP
* Complete base tests.
* Add more tests for multiregion, fix existing test.
* Cleanup Part 1
* Remove unnecessary code from memory tracking
* Fix some inconsistencies with 3D texture rule.
* Add dispose tests.
* Use a background thread for the background context.
Rather than setting and unsetting a context as current, doing the work on a dedicated thread with signals seems to be a bit faster.
Also nerf the multithreading test a bit.
* Copy to texture with matching alignment
This extends the copy to work for some videos with unusual size, such as tutorial videos in SMO. It will only occur if the destination texture already exists at XCount size.
* Track reads for buffer copies. Synchronize new buffers before copying overlaps.
* Remove old texture flushing mechanisms.
Range tracking all the way, baby.
* Wake the background thread when disposing.
Avoids a deadlock when games are closed.
* Address Feedback 1
* Separate TextureCopy instance for background thread
Also `BackgroundContextWorker.InBackground` for a more sensible idenfifier for if we're in a background thread.
* Add missing XML docs.
* Address Feedback
* Maybe I should start drinking coffee.
* Some more feedback.
* Remove flush warning, Refocus window after making background context
2020-10-16 22:18:35 +02:00
|
|
|
using Ryujinx.Memory.Range;
|
2019-10-13 08:02:07 +02:00
|
|
|
using System;
|
|
|
|
|
|
|
|
namespace Ryujinx.Graphics.Gpu.Image
|
|
|
|
{
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Texture manager.
|
|
|
|
/// </summary>
|
2019-12-31 23:09:49 +01:00
|
|
|
class TextureManager : IDisposable
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
2020-09-10 21:44:04 +02:00
|
|
|
private struct OverlapInfo
|
|
|
|
{
|
|
|
|
public TextureViewCompatibility Compatibility { get; }
|
|
|
|
public int FirstLayer { get; }
|
|
|
|
public int FirstLevel { get; }
|
|
|
|
|
|
|
|
public OverlapInfo(TextureViewCompatibility compatibility, int firstLayer, int firstLevel)
|
|
|
|
{
|
|
|
|
Compatibility = compatibility;
|
|
|
|
FirstLayer = firstLayer;
|
|
|
|
FirstLevel = firstLevel;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-11-25 01:29:37 +01:00
|
|
|
private const int OverlapsBufferInitialCapacity = 10;
|
|
|
|
private const int OverlapsBufferMaxCapacity = 10000;
|
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
private readonly GpuContext _context;
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
private readonly TextureBindingsManager _cpBindingsManager;
|
|
|
|
private readonly TextureBindingsManager _gpBindingsManager;
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
private readonly Texture[] _rtColors;
|
|
|
|
private readonly ITexture[] _rtHostColors;
|
2021-01-17 19:44:34 +01:00
|
|
|
private Texture _rtDepthStencil;
|
2019-12-30 00:26:37 +01:00
|
|
|
private ITexture _rtHostDs;
|
|
|
|
|
2021-01-17 19:44:34 +01:00
|
|
|
private readonly MultiRangeList<Texture> _textures;
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2019-11-25 01:29:37 +01:00
|
|
|
private Texture[] _textureOverlaps;
|
2020-09-10 21:44:04 +02:00
|
|
|
private OverlapInfo[] _overlapInfo;
|
2019-11-25 01:29:37 +01:00
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
private readonly AutoDeleteCache _cache;
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2020-07-07 04:41:07 +02:00
|
|
|
/// <summary>
|
|
|
|
/// The scaling factor applied to all currently bound render targets.
|
|
|
|
/// </summary>
|
|
|
|
public float RenderTargetScale { get; private set; } = 1f;
|
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Constructs a new instance of the texture manager.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="context">The GPU context that the texture manager belongs to</param>
|
2019-10-18 04:41:18 +02:00
|
|
|
public TextureManager(GpuContext context)
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
2019-10-18 04:41:18 +02:00
|
|
|
_context = context;
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2019-11-22 18:17:06 +01:00
|
|
|
TexturePoolCache texturePoolCache = new TexturePoolCache(context);
|
|
|
|
|
|
|
|
_cpBindingsManager = new TextureBindingsManager(context, texturePoolCache, isCompute: true);
|
|
|
|
_gpBindingsManager = new TextureBindingsManager(context, texturePoolCache, isCompute: false);
|
2019-10-13 08:02:07 +02:00
|
|
|
|
|
|
|
_rtColors = new Texture[Constants.TotalRenderTargets];
|
|
|
|
_rtHostColors = new ITexture[Constants.TotalRenderTargets];
|
|
|
|
|
2021-01-17 19:44:34 +01:00
|
|
|
_textures = new MultiRangeList<Texture>();
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2019-11-25 01:29:37 +01:00
|
|
|
_textureOverlaps = new Texture[OverlapsBufferInitialCapacity];
|
2020-09-10 21:44:04 +02:00
|
|
|
_overlapInfo = new OverlapInfo[OverlapsBufferInitialCapacity];
|
2019-11-25 01:29:37 +01:00
|
|
|
|
2019-10-13 08:02:07 +02:00
|
|
|
_cache = new AutoDeleteCache();
|
2019-10-18 04:41:18 +02:00
|
|
|
}
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Sets texture bindings on the compute pipeline.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="bindings">The texture bindings</param>
|
2019-10-18 04:41:18 +02:00
|
|
|
public void SetComputeTextures(TextureBindingInfo[] bindings)
|
|
|
|
{
|
|
|
|
_cpBindingsManager.SetTextures(0, bindings);
|
2019-10-13 08:02:07 +02:00
|
|
|
}
|
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Sets texture bindings on the graphics pipeline.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="stage">The index of the shader stage to bind the textures</param>
|
|
|
|
/// <param name="bindings">The texture bindings</param>
|
2019-10-18 04:41:18 +02:00
|
|
|
public void SetGraphicsTextures(int stage, TextureBindingInfo[] bindings)
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
2019-10-18 04:41:18 +02:00
|
|
|
_gpBindingsManager.SetTextures(stage, bindings);
|
|
|
|
}
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Sets image bindings on the compute pipeline.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="bindings">The image bindings</param>
|
2019-10-18 04:41:18 +02:00
|
|
|
public void SetComputeImages(TextureBindingInfo[] bindings)
|
|
|
|
{
|
|
|
|
_cpBindingsManager.SetImages(0, bindings);
|
2019-10-13 08:02:07 +02:00
|
|
|
}
|
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Sets image bindings on the graphics pipeline.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="stage">The index of the shader stage to bind the images</param>
|
|
|
|
/// <param name="bindings">The image bindings</param>
|
2019-10-18 04:41:18 +02:00
|
|
|
public void SetGraphicsImages(int stage, TextureBindingInfo[] bindings)
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
2019-10-18 04:41:18 +02:00
|
|
|
_gpBindingsManager.SetImages(stage, bindings);
|
2019-10-13 08:02:07 +02:00
|
|
|
}
|
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Sets the texture constant buffer index on the compute pipeline.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="index">The texture constant buffer index</param>
|
2019-10-18 04:41:18 +02:00
|
|
|
public void SetComputeTextureBufferIndex(int index)
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
2019-10-18 04:41:18 +02:00
|
|
|
_cpBindingsManager.SetTextureBufferIndex(index);
|
|
|
|
}
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Sets the texture constant buffer index on the graphics pipeline.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="index">The texture constant buffer index</param>
|
2019-10-18 04:41:18 +02:00
|
|
|
public void SetGraphicsTextureBufferIndex(int index)
|
|
|
|
{
|
|
|
|
_gpBindingsManager.SetTextureBufferIndex(index);
|
|
|
|
}
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Sets the current sampler pool on the compute pipeline.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="gpuVa">The start GPU virtual address of the sampler pool</param>
|
|
|
|
/// <param name="maximumId">The maximum ID of the sampler pool</param>
|
2019-12-30 18:44:22 +01:00
|
|
|
/// <param name="samplerIndex">The indexing type of the sampler pool</param>
|
2019-12-05 21:34:47 +01:00
|
|
|
public void SetComputeSamplerPool(ulong gpuVa, int maximumId, SamplerIndex samplerIndex)
|
2019-10-18 04:41:18 +02:00
|
|
|
{
|
2019-12-05 21:34:47 +01:00
|
|
|
_cpBindingsManager.SetSamplerPool(gpuVa, maximumId, samplerIndex);
|
2019-10-18 04:41:18 +02:00
|
|
|
}
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Sets the current sampler pool on the graphics pipeline.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="gpuVa">The start GPU virtual address of the sampler pool</param>
|
|
|
|
/// <param name="maximumId">The maximum ID of the sampler pool</param>
|
2019-12-30 18:44:22 +01:00
|
|
|
/// <param name="samplerIndex">The indexing type of the sampler pool</param>
|
2019-12-05 21:34:47 +01:00
|
|
|
public void SetGraphicsSamplerPool(ulong gpuVa, int maximumId, SamplerIndex samplerIndex)
|
2019-10-18 04:41:18 +02:00
|
|
|
{
|
2019-12-05 21:34:47 +01:00
|
|
|
_gpBindingsManager.SetSamplerPool(gpuVa, maximumId, samplerIndex);
|
2019-10-13 08:02:07 +02:00
|
|
|
}
|
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Sets the current texture pool on the compute pipeline.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="gpuVa">The start GPU virtual address of the texture pool</param>
|
|
|
|
/// <param name="maximumId">The maximum ID of the texture pool</param>
|
2019-10-18 04:41:18 +02:00
|
|
|
public void SetComputeTexturePool(ulong gpuVa, int maximumId)
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
2019-10-18 04:41:18 +02:00
|
|
|
_cpBindingsManager.SetTexturePool(gpuVa, maximumId);
|
|
|
|
}
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Sets the current texture pool on the graphics pipeline.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="gpuVa">The start GPU virtual address of the texture pool</param>
|
|
|
|
/// <param name="maximumId">The maximum ID of the texture pool</param>
|
2019-10-18 04:41:18 +02:00
|
|
|
public void SetGraphicsTexturePool(ulong gpuVa, int maximumId)
|
|
|
|
{
|
|
|
|
_gpBindingsManager.SetTexturePool(gpuVa, maximumId);
|
2019-10-13 08:02:07 +02:00
|
|
|
}
|
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Sets the render target color buffer.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="index">The index of the color buffer to set (up to 8)</param>
|
|
|
|
/// <param name="color">The color buffer texture</param>
|
2020-07-07 04:41:07 +02:00
|
|
|
/// <returns>True if render target scale must be updated.</returns>
|
|
|
|
public bool SetRenderTargetColor(int index, Texture color)
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
2020-07-07 04:41:07 +02:00
|
|
|
bool hasValue = color != null;
|
|
|
|
bool changesScale = (hasValue != (_rtColors[index] != null)) || (hasValue && RenderTargetScale != color.ScaleFactor);
|
2021-03-02 23:30:54 +01:00
|
|
|
|
|
|
|
if (_rtColors[index] != color)
|
|
|
|
{
|
|
|
|
_rtColors[index]?.SignalModifying(false);
|
|
|
|
color?.SignalModifying(true);
|
|
|
|
|
|
|
|
_rtColors[index] = color;
|
|
|
|
}
|
2020-07-07 04:41:07 +02:00
|
|
|
|
|
|
|
return changesScale || (hasValue && color.ScaleMode != TextureScaleMode.Blacklisted && color.ScaleFactor != GraphicsConfig.ResScale);
|
|
|
|
}
|
|
|
|
|
2021-04-02 16:33:39 +02:00
|
|
|
/// <summary>
|
|
|
|
/// Sets the render target depth-stencil buffer.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="depthStencil">The depth-stencil buffer texture</param>
|
|
|
|
/// <returns>True if render target scale must be updated.</returns>
|
|
|
|
public bool SetRenderTargetDepthStencil(Texture depthStencil)
|
|
|
|
{
|
|
|
|
bool hasValue = depthStencil != null;
|
|
|
|
bool changesScale = (hasValue != (_rtDepthStencil != null)) || (hasValue && RenderTargetScale != depthStencil.ScaleFactor);
|
|
|
|
|
|
|
|
if (_rtDepthStencil != depthStencil)
|
|
|
|
{
|
|
|
|
_rtDepthStencil?.SignalModifying(false);
|
|
|
|
depthStencil?.SignalModifying(true);
|
|
|
|
|
|
|
|
_rtDepthStencil = depthStencil;
|
|
|
|
}
|
|
|
|
|
|
|
|
return changesScale || (hasValue && depthStencil.ScaleMode != TextureScaleMode.Blacklisted && depthStencil.ScaleFactor != GraphicsConfig.ResScale);
|
|
|
|
}
|
|
|
|
|
2020-11-02 20:53:23 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Gets the first available bound colour target, or the depth stencil target if not present.
|
|
|
|
/// </summary>
|
|
|
|
/// <returns>The first bound colour target, otherwise the depth stencil target</returns>
|
|
|
|
public Texture GetAnyRenderTarget()
|
|
|
|
{
|
|
|
|
return _rtColors[0] ?? _rtDepthStencil;
|
|
|
|
}
|
|
|
|
|
2020-07-07 04:41:07 +02:00
|
|
|
/// <summary>
|
|
|
|
/// Updates the Render Target scale, given the currently bound render targets.
|
|
|
|
/// This will update scale to match the configured scale, scale textures that are eligible but not scaled,
|
|
|
|
/// and propagate blacklisted status from one texture to the ones bound with it.
|
|
|
|
/// </summary>
|
2020-07-13 13:41:30 +02:00
|
|
|
/// <param name="singleUse">If this is not -1, it indicates that only the given indexed target will be used.</param>
|
2020-07-07 04:41:07 +02:00
|
|
|
public void UpdateRenderTargetScale(int singleUse)
|
|
|
|
{
|
|
|
|
// Make sure all scales for render targets are at the highest they should be. Blacklisted targets should propagate their scale to the other targets.
|
|
|
|
bool mismatch = false;
|
|
|
|
bool blacklisted = false;
|
|
|
|
bool hasUpscaled = false;
|
|
|
|
float targetScale = GraphicsConfig.ResScale;
|
|
|
|
|
|
|
|
void ConsiderTarget(Texture target)
|
|
|
|
{
|
|
|
|
if (target == null) return;
|
|
|
|
float scale = target.ScaleFactor;
|
|
|
|
|
|
|
|
switch (target.ScaleMode)
|
|
|
|
{
|
|
|
|
case TextureScaleMode.Blacklisted:
|
|
|
|
mismatch |= scale != 1f;
|
|
|
|
blacklisted = true;
|
|
|
|
break;
|
|
|
|
case TextureScaleMode.Eligible:
|
|
|
|
mismatch = true; // We must make a decision.
|
|
|
|
break;
|
|
|
|
case TextureScaleMode.Scaled:
|
|
|
|
hasUpscaled = true;
|
|
|
|
mismatch |= scale != targetScale; // If the target scale has changed, reset the scale for all targets.
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (singleUse != -1)
|
|
|
|
{
|
|
|
|
// If only one target is in use (by a clear, for example) the others do not need to be checked for mismatching scale.
|
|
|
|
ConsiderTarget(_rtColors[singleUse]);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
foreach (Texture color in _rtColors)
|
|
|
|
{
|
|
|
|
ConsiderTarget(color);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ConsiderTarget(_rtDepthStencil);
|
|
|
|
|
|
|
|
mismatch |= blacklisted && hasUpscaled;
|
|
|
|
|
|
|
|
if (blacklisted)
|
|
|
|
{
|
|
|
|
targetScale = 1f;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mismatch)
|
|
|
|
{
|
|
|
|
if (blacklisted)
|
|
|
|
{
|
|
|
|
// Propagate the blacklisted state to the other textures.
|
|
|
|
foreach (Texture color in _rtColors)
|
|
|
|
{
|
|
|
|
color?.BlacklistScale();
|
|
|
|
}
|
|
|
|
|
|
|
|
_rtDepthStencil?.BlacklistScale();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Set the scale of the other textures.
|
|
|
|
foreach (Texture color in _rtColors)
|
|
|
|
{
|
|
|
|
color?.SetScale(targetScale);
|
|
|
|
}
|
|
|
|
|
|
|
|
_rtDepthStencil?.SetScale(targetScale);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
RenderTargetScale = targetScale;
|
2019-10-13 08:02:07 +02:00
|
|
|
}
|
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Commits bindings on the compute pipeline.
|
|
|
|
/// </summary>
|
2019-10-18 04:41:18 +02:00
|
|
|
public void CommitComputeBindings()
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
2019-10-26 19:50:52 +02:00
|
|
|
// Every time we switch between graphics and compute work,
|
2019-10-18 04:41:18 +02:00
|
|
|
// we must rebind everything.
|
|
|
|
// Since compute work happens less often, we always do that
|
|
|
|
// before and after the compute dispatch.
|
|
|
|
_cpBindingsManager.Rebind();
|
|
|
|
_cpBindingsManager.CommitBindings();
|
|
|
|
_gpBindingsManager.Rebind();
|
2019-10-13 08:02:07 +02:00
|
|
|
}
|
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Commits bindings on the graphics pipeline.
|
|
|
|
/// </summary>
|
2019-10-18 04:41:18 +02:00
|
|
|
public void CommitGraphicsBindings()
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
2019-10-18 04:41:18 +02:00
|
|
|
_gpBindingsManager.CommitBindings();
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2019-10-18 04:41:18 +02:00
|
|
|
UpdateRenderTargets();
|
2019-10-13 08:02:07 +02:00
|
|
|
}
|
|
|
|
|
2020-04-22 01:35:28 +02:00
|
|
|
/// <summary>
|
|
|
|
/// Gets a texture descriptor used on the compute pipeline.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="state">Current GPU state</param>
|
|
|
|
/// <param name="handle">Shader "fake" handle of the texture</param>
|
2021-05-19 20:05:43 +02:00
|
|
|
/// <param name="cbufSlot">Shader constant buffer slot of the texture</param>
|
2020-04-22 01:35:28 +02:00
|
|
|
/// <returns>The texture descriptor</returns>
|
2021-05-19 20:05:43 +02:00
|
|
|
public TextureDescriptor GetComputeTextureDescriptor(GpuState state, int handle, int cbufSlot)
|
2020-04-22 01:35:28 +02:00
|
|
|
{
|
2021-05-19 20:05:43 +02:00
|
|
|
return _cpBindingsManager.GetTextureDescriptor(state, 0, handle, cbufSlot);
|
2020-04-22 01:35:28 +02:00
|
|
|
}
|
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Gets a texture descriptor used on the graphics pipeline.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="state">Current GPU state</param>
|
|
|
|
/// <param name="stageIndex">Index of the shader stage where the texture is bound</param>
|
|
|
|
/// <param name="handle">Shader "fake" handle of the texture</param>
|
2021-05-19 20:05:43 +02:00
|
|
|
/// <param name="cbufSlot">Shader constant buffer slot of the texture</param>
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <returns>The texture descriptor</returns>
|
2021-05-19 20:05:43 +02:00
|
|
|
public TextureDescriptor GetGraphicsTextureDescriptor(GpuState state, int stageIndex, int handle, int cbufSlot)
|
2019-12-16 05:59:46 +01:00
|
|
|
{
|
2021-05-19 20:05:43 +02:00
|
|
|
return _gpBindingsManager.GetTextureDescriptor(state, stageIndex, handle, cbufSlot);
|
2019-12-16 05:59:46 +01:00
|
|
|
}
|
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Update host framebuffer attachments based on currently bound render target buffers.
|
|
|
|
/// </summary>
|
2020-09-24 01:48:34 +02:00
|
|
|
public void UpdateRenderTargets()
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
|
|
|
bool anyChanged = false;
|
|
|
|
|
|
|
|
if (_rtHostDs != _rtDepthStencil?.HostTexture)
|
|
|
|
{
|
|
|
|
_rtHostDs = _rtDepthStencil?.HostTexture;
|
|
|
|
|
|
|
|
anyChanged = true;
|
|
|
|
}
|
|
|
|
|
2019-10-31 00:45:01 +01:00
|
|
|
for (int index = 0; index < _rtColors.Length; index++)
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
2019-10-31 00:45:01 +01:00
|
|
|
ITexture hostTexture = _rtColors[index]?.HostTexture;
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2019-10-31 00:45:01 +01:00
|
|
|
if (_rtHostColors[index] != hostTexture)
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
2019-10-31 00:45:01 +01:00
|
|
|
_rtHostColors[index] = hostTexture;
|
2019-10-13 08:02:07 +02:00
|
|
|
|
|
|
|
anyChanged = true;
|
|
|
|
}
|
2019-10-31 00:45:01 +01:00
|
|
|
}
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2019-10-31 00:45:01 +01:00
|
|
|
if (anyChanged)
|
|
|
|
{
|
|
|
|
_context.Renderer.Pipeline.SetRenderTargets(_rtHostColors, _rtHostDs);
|
2019-10-13 08:02:07 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-07-07 04:41:07 +02:00
|
|
|
/// <summary>
|
|
|
|
/// Determines if a given texture is eligible for upscaling from its info.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="info">The texture info to check</param>
|
|
|
|
/// <returns>True if eligible</returns>
|
|
|
|
public bool IsUpscaleCompatible(TextureInfo info)
|
|
|
|
{
|
2020-11-20 21:14:45 +01:00
|
|
|
return (info.Target == Target.Texture2D || info.Target == Target.Texture2DArray) && !info.FormatInfo.IsCompressed && UpscaleSafeMode(info);
|
2020-07-07 04:41:07 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// Determines if a given texture is "safe" for upscaling from its info.
|
|
|
|
/// Note that this is different from being compatible - this elilinates targets that would have detrimental effects when scaled.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="info">The texture info to check</param>
|
|
|
|
/// <returns>True if safe</returns>
|
|
|
|
public bool UpscaleSafeMode(TextureInfo info)
|
|
|
|
{
|
|
|
|
// While upscaling works for all targets defined by IsUpscaleCompatible, we additionally blacklist targets here that
|
|
|
|
// may have undesirable results (upscaling blur textures) or simply waste GPU resources (upscaling texture atlas).
|
|
|
|
|
2020-11-20 21:14:45 +01:00
|
|
|
if (info.Levels > 3)
|
|
|
|
{
|
|
|
|
// Textures with more than 3 levels are likely to be game textures, rather than render textures.
|
|
|
|
// Small textures with full mips are likely to be removed by the next check.
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2020-11-27 19:23:30 +01:00
|
|
|
if (info.Width < 8 || info.Height < 8)
|
|
|
|
{
|
|
|
|
// Discount textures with small dimensions.
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2020-09-11 01:48:48 +02:00
|
|
|
if (!(info.FormatInfo.Format.IsDepthOrStencil() || info.FormatInfo.Components == 1))
|
2020-07-07 04:41:07 +02:00
|
|
|
{
|
|
|
|
// Discount square textures that aren't depth-stencil like. (excludes game textures, cubemap faces, most 3D texture LUT, texture atlas)
|
|
|
|
// Detect if the texture is possibly square. Widths may be aligned, so to remove the uncertainty we align both the width and height.
|
|
|
|
|
2021-03-19 02:17:38 +01:00
|
|
|
int widthAlignment = (info.IsLinear ? Constants.StrideAlignment : Constants.GobAlignment) / info.FormatInfo.BytesPerPixel;
|
2020-07-07 04:41:07 +02:00
|
|
|
|
|
|
|
bool possiblySquare = BitUtils.AlignUp(info.Width, widthAlignment) == BitUtils.AlignUp(info.Height, widthAlignment);
|
|
|
|
|
|
|
|
if (possiblySquare)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int aspect = (int)Math.Round((info.Width / (float)info.Height) * 9);
|
|
|
|
if (aspect == 16 && info.Height < 360)
|
|
|
|
{
|
|
|
|
// Targets that are roughly 16:9 can only be rescaled if they're equal to or above 360p. (excludes blur and bloom textures)
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2020-09-10 21:44:04 +02:00
|
|
|
/// <summary>
|
|
|
|
/// Handles removal of textures written to a memory region being unmapped.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="sender">Sender object</param>
|
|
|
|
/// <param name="e">Event arguments</param>
|
|
|
|
public void MemoryUnmappedHandler(object sender, UnmapEventArgs e)
|
|
|
|
{
|
|
|
|
Texture[] overlaps = new Texture[10];
|
|
|
|
int overlapCount;
|
|
|
|
|
|
|
|
lock (_textures)
|
|
|
|
{
|
|
|
|
overlapCount = _textures.FindOverlaps(_context.MemoryManager.Translate(e.Address), e.Size, ref overlaps);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = 0; i < overlapCount; i++)
|
|
|
|
{
|
|
|
|
overlaps[i].Unmapped();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
2020-01-02 00:14:18 +01:00
|
|
|
/// Tries to find an existing texture, or create a new one if not found.
|
2019-12-30 00:26:37 +01:00
|
|
|
/// </summary>
|
|
|
|
/// <param name="copyTexture">Copy texture to find or create</param>
|
2021-05-22 01:26:49 +02:00
|
|
|
/// <param name="offset">Offset to be added to the physical texture address</param>
|
2020-11-05 23:50:34 +01:00
|
|
|
/// <param name="formatInfo">Format information of the copy texture</param>
|
2020-07-07 04:41:07 +02:00
|
|
|
/// <param name="preferScaling">Indicates if the texture should be scaled from the start</param>
|
2020-11-10 01:41:13 +01:00
|
|
|
/// <param name="sizeHint">A hint indicating the minimum used size for the texture</param>
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <returns>The texture</returns>
|
2021-05-22 01:26:49 +02:00
|
|
|
public Texture FindOrCreateTexture(CopyTexture copyTexture, ulong offset, FormatInfo formatInfo, bool preferScaling = true, Size? sizeHint = null)
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
|
|
|
int gobBlocksInY = copyTexture.MemoryLayout.UnpackGobBlocksInY();
|
|
|
|
int gobBlocksInZ = copyTexture.MemoryLayout.UnpackGobBlocksInZ();
|
|
|
|
|
2019-10-14 03:48:09 +02:00
|
|
|
int width;
|
|
|
|
|
|
|
|
if (copyTexture.LinearLayout)
|
|
|
|
{
|
|
|
|
width = copyTexture.Stride / formatInfo.BytesPerPixel;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
width = copyTexture.Width;
|
|
|
|
}
|
|
|
|
|
2019-10-13 08:02:07 +02:00
|
|
|
TextureInfo info = new TextureInfo(
|
2021-05-22 01:26:49 +02:00
|
|
|
copyTexture.Address.Pack() + offset,
|
2019-10-14 03:48:09 +02:00
|
|
|
width,
|
2019-10-13 08:02:07 +02:00
|
|
|
copyTexture.Height,
|
|
|
|
copyTexture.Depth,
|
|
|
|
1,
|
|
|
|
1,
|
|
|
|
1,
|
|
|
|
copyTexture.Stride,
|
|
|
|
copyTexture.LinearLayout,
|
|
|
|
gobBlocksInY,
|
|
|
|
gobBlocksInZ,
|
|
|
|
1,
|
|
|
|
Target.Texture2D,
|
|
|
|
formatInfo);
|
|
|
|
|
2020-07-13 13:41:30 +02:00
|
|
|
TextureSearchFlags flags = TextureSearchFlags.ForCopy;
|
2020-07-07 04:41:07 +02:00
|
|
|
|
|
|
|
if (preferScaling)
|
|
|
|
{
|
|
|
|
flags |= TextureSearchFlags.WithUpscale;
|
|
|
|
}
|
|
|
|
|
2021-01-17 19:44:34 +01:00
|
|
|
Texture texture = FindOrCreateTexture(flags, info, 0, sizeHint);
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2021-01-17 19:44:34 +01:00
|
|
|
texture?.SynchronizeMemory();
|
2019-10-13 08:02:07 +02:00
|
|
|
|
|
|
|
return texture;
|
|
|
|
}
|
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
2020-01-02 00:14:18 +01:00
|
|
|
/// Tries to find an existing texture, or create a new one if not found.
|
2019-12-30 00:26:37 +01:00
|
|
|
/// </summary>
|
|
|
|
/// <param name="colorState">Color buffer texture to find or create</param>
|
|
|
|
/// <param name="samplesInX">Number of samples in the X direction, for MSAA</param>
|
|
|
|
/// <param name="samplesInY">Number of samples in the Y direction, for MSAA</param>
|
2020-11-10 01:41:13 +01:00
|
|
|
/// <param name="sizeHint">A hint indicating the minimum used size for the texture</param>
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <returns>The texture</returns>
|
2020-11-10 01:41:13 +01:00
|
|
|
public Texture FindOrCreateTexture(RtColorState colorState, int samplesInX, int samplesInY, Size sizeHint)
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
|
|
|
bool isLinear = colorState.MemoryLayout.UnpackIsLinear();
|
|
|
|
|
|
|
|
int gobBlocksInY = colorState.MemoryLayout.UnpackGobBlocksInY();
|
|
|
|
int gobBlocksInZ = colorState.MemoryLayout.UnpackGobBlocksInZ();
|
|
|
|
|
|
|
|
Target target;
|
|
|
|
|
|
|
|
if (colorState.MemoryLayout.UnpackIsTarget3D())
|
|
|
|
{
|
|
|
|
target = Target.Texture3D;
|
|
|
|
}
|
|
|
|
else if ((samplesInX | samplesInY) != 1)
|
|
|
|
{
|
|
|
|
target = colorState.Depth > 1
|
|
|
|
? Target.Texture2DMultisampleArray
|
|
|
|
: Target.Texture2DMultisample;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
target = colorState.Depth > 1
|
|
|
|
? Target.Texture2DArray
|
|
|
|
: Target.Texture2D;
|
|
|
|
}
|
|
|
|
|
|
|
|
FormatInfo formatInfo = colorState.Format.Convert();
|
|
|
|
|
|
|
|
int width, stride;
|
|
|
|
|
|
|
|
// For linear textures, the width value is actually the stride.
|
|
|
|
// We can easily get the width by dividing the stride by the bpp,
|
|
|
|
// since the stride is the total number of bytes occupied by a
|
|
|
|
// line. The stride should also meet alignment constraints however,
|
|
|
|
// so the width we get here is the aligned width.
|
|
|
|
if (isLinear)
|
|
|
|
{
|
|
|
|
width = colorState.WidthOrStride / formatInfo.BytesPerPixel;
|
|
|
|
stride = colorState.WidthOrStride;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
width = colorState.WidthOrStride;
|
|
|
|
stride = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
TextureInfo info = new TextureInfo(
|
2021-01-17 19:44:34 +01:00
|
|
|
colorState.Address.Pack(),
|
2019-10-13 08:02:07 +02:00
|
|
|
width,
|
|
|
|
colorState.Height,
|
|
|
|
colorState.Depth,
|
|
|
|
1,
|
|
|
|
samplesInX,
|
|
|
|
samplesInY,
|
|
|
|
stride,
|
|
|
|
isLinear,
|
|
|
|
gobBlocksInY,
|
|
|
|
gobBlocksInZ,
|
|
|
|
1,
|
|
|
|
target,
|
|
|
|
formatInfo);
|
|
|
|
|
2021-01-15 19:14:00 +01:00
|
|
|
int layerSize = !isLinear ? colorState.LayerSize * 4 : 0;
|
|
|
|
|
2021-01-17 19:44:34 +01:00
|
|
|
Texture texture = FindOrCreateTexture(TextureSearchFlags.WithUpscale, info, layerSize, sizeHint);
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2021-01-17 19:44:34 +01:00
|
|
|
texture?.SynchronizeMemory();
|
2019-10-13 08:02:07 +02:00
|
|
|
|
|
|
|
return texture;
|
|
|
|
}
|
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
2020-01-02 00:14:18 +01:00
|
|
|
/// Tries to find an existing texture, or create a new one if not found.
|
2019-12-30 00:26:37 +01:00
|
|
|
/// </summary>
|
|
|
|
/// <param name="dsState">Depth-stencil buffer texture to find or create</param>
|
|
|
|
/// <param name="size">Size of the depth-stencil texture</param>
|
|
|
|
/// <param name="samplesInX">Number of samples in the X direction, for MSAA</param>
|
|
|
|
/// <param name="samplesInY">Number of samples in the Y direction, for MSAA</param>
|
2020-11-10 01:41:13 +01:00
|
|
|
/// <param name="sizeHint">A hint indicating the minimum used size for the texture</param>
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <returns>The texture</returns>
|
2020-11-10 01:41:13 +01:00
|
|
|
public Texture FindOrCreateTexture(RtDepthStencilState dsState, Size3D size, int samplesInX, int samplesInY, Size sizeHint)
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
|
|
|
int gobBlocksInY = dsState.MemoryLayout.UnpackGobBlocksInY();
|
|
|
|
int gobBlocksInZ = dsState.MemoryLayout.UnpackGobBlocksInZ();
|
|
|
|
|
|
|
|
Target target = (samplesInX | samplesInY) != 1
|
|
|
|
? Target.Texture2DMultisample
|
|
|
|
: Target.Texture2D;
|
|
|
|
|
|
|
|
FormatInfo formatInfo = dsState.Format.Convert();
|
|
|
|
|
|
|
|
TextureInfo info = new TextureInfo(
|
2021-01-17 19:44:34 +01:00
|
|
|
dsState.Address.Pack(),
|
2019-10-13 08:02:07 +02:00
|
|
|
size.Width,
|
|
|
|
size.Height,
|
|
|
|
size.Depth,
|
|
|
|
1,
|
|
|
|
samplesInX,
|
|
|
|
samplesInY,
|
|
|
|
0,
|
|
|
|
false,
|
|
|
|
gobBlocksInY,
|
|
|
|
gobBlocksInZ,
|
|
|
|
1,
|
|
|
|
target,
|
|
|
|
formatInfo);
|
|
|
|
|
2021-01-17 19:44:34 +01:00
|
|
|
Texture texture = FindOrCreateTexture(TextureSearchFlags.WithUpscale, info, dsState.LayerSize * 4, sizeHint);
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2021-01-17 19:44:34 +01:00
|
|
|
texture?.SynchronizeMemory();
|
2019-10-13 08:02:07 +02:00
|
|
|
|
|
|
|
return texture;
|
|
|
|
}
|
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
2020-01-02 00:14:18 +01:00
|
|
|
/// Tries to find an existing texture, or create a new one if not found.
|
2019-12-30 00:26:37 +01:00
|
|
|
/// </summary>
|
|
|
|
/// <param name="flags">The texture search flags, defines texture comparison rules</param>
|
2021-01-17 19:44:34 +01:00
|
|
|
/// <param name="info">Texture information of the texture to be found or created</param>
|
2021-01-15 19:14:00 +01:00
|
|
|
/// <param name="layerSize">Size in bytes of a single texture layer</param>
|
2020-11-10 01:41:13 +01:00
|
|
|
/// <param name="sizeHint">A hint indicating the minimum used size for the texture</param>
|
2021-01-17 19:44:34 +01:00
|
|
|
/// <param name="range">Optional ranges of physical memory where the texture data is located</param>
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <returns>The texture</returns>
|
2021-01-17 19:44:34 +01:00
|
|
|
public Texture FindOrCreateTexture(TextureSearchFlags flags, TextureInfo info, int layerSize = 0, Size? sizeHint = null, MultiRange? range = null)
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
2020-07-13 13:41:30 +02:00
|
|
|
bool isSamplerTexture = (flags & TextureSearchFlags.ForSampler) != 0;
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2020-07-07 04:41:07 +02:00
|
|
|
bool isScalable = IsUpscaleCompatible(info);
|
|
|
|
|
|
|
|
TextureScaleMode scaleMode = TextureScaleMode.Blacklisted;
|
|
|
|
if (isScalable)
|
|
|
|
{
|
|
|
|
scaleMode = (flags & TextureSearchFlags.WithUpscale) != 0 ? TextureScaleMode.Scaled : TextureScaleMode.Eligible;
|
|
|
|
}
|
|
|
|
|
2021-01-17 19:44:34 +01:00
|
|
|
ulong address;
|
|
|
|
|
|
|
|
if (range != null)
|
|
|
|
{
|
|
|
|
address = range.Value.GetSubRange(0).Address;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
address = _context.MemoryManager.Translate(info.GpuAddress);
|
|
|
|
|
|
|
|
if (address == MemoryManager.PteUnmapped)
|
|
|
|
{
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-10 21:44:04 +02:00
|
|
|
int sameAddressOverlapsCount;
|
|
|
|
|
|
|
|
lock (_textures)
|
|
|
|
{
|
|
|
|
// Try to find a perfect texture match, with the same address and parameters.
|
2021-01-17 19:44:34 +01:00
|
|
|
sameAddressOverlapsCount = _textures.FindOverlaps(address, ref _textureOverlaps);
|
2020-09-10 21:44:04 +02:00
|
|
|
}
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2020-11-27 19:46:23 +01:00
|
|
|
Texture texture = null;
|
|
|
|
|
|
|
|
TextureMatchQuality bestQuality = TextureMatchQuality.NoMatch;
|
|
|
|
|
2019-11-25 01:29:37 +01:00
|
|
|
for (int index = 0; index < sameAddressOverlapsCount; index++)
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
2019-11-25 01:29:37 +01:00
|
|
|
Texture overlap = _textureOverlaps[index];
|
|
|
|
|
2021-01-23 13:38:00 +01:00
|
|
|
TextureMatchQuality matchQuality = overlap.IsExactMatch(info, flags);
|
|
|
|
|
|
|
|
if (matchQuality != TextureMatchQuality.NoMatch)
|
2021-01-17 19:44:34 +01:00
|
|
|
{
|
2021-01-23 13:38:00 +01:00
|
|
|
// If the parameters match, we need to make sure the texture is mapped to the same memory regions.
|
2021-01-17 19:44:34 +01:00
|
|
|
|
2021-01-23 13:38:00 +01:00
|
|
|
// If a range of memory was supplied, just check if the ranges match.
|
|
|
|
if (range != null && !overlap.Range.Equals(range.Value))
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If no range was supplied, we can check if the GPU virtual address match. If they do,
|
|
|
|
// we know the textures are located at the same memory region.
|
|
|
|
// If they don't, it may still be mapped to the same physical region, so we
|
|
|
|
// do a more expensive check to tell if they are mapped into the same physical regions.
|
2021-03-06 15:43:55 +01:00
|
|
|
// If the GPU VA for the texture has ever been unmapped, then the range must be checked regardless.
|
2021-04-02 16:33:39 +02:00
|
|
|
if ((overlap.Info.GpuAddress != info.GpuAddress || overlap.ChangedMapping) &&
|
2021-03-06 15:43:55 +01:00
|
|
|
!_context.MemoryManager.CompareRange(overlap.Range, info.GpuAddress))
|
2021-01-23 13:38:00 +01:00
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
2020-11-27 19:46:23 +01:00
|
|
|
|
|
|
|
if (matchQuality == TextureMatchQuality.Perfect)
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
2020-11-27 19:46:23 +01:00
|
|
|
texture = overlap;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else if (matchQuality > bestQuality)
|
|
|
|
{
|
|
|
|
texture = overlap;
|
|
|
|
bestQuality = matchQuality;
|
|
|
|
}
|
|
|
|
}
|
2020-11-10 01:41:13 +01:00
|
|
|
|
2020-11-27 19:46:23 +01:00
|
|
|
if (texture != null)
|
|
|
|
{
|
|
|
|
if (!isSamplerTexture)
|
|
|
|
{
|
|
|
|
// If not a sampler texture, it is managed by the auto delete
|
|
|
|
// cache, ensure that it is on the "top" of the list to avoid
|
|
|
|
// deletion.
|
|
|
|
_cache.Lift(texture);
|
|
|
|
}
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2020-11-27 19:46:23 +01:00
|
|
|
ChangeSizeIfNeeded(info, texture, isSamplerTexture, sizeHint);
|
2020-07-12 05:07:01 +02:00
|
|
|
|
2020-11-27 19:46:23 +01:00
|
|
|
texture.SynchronizeMemory();
|
|
|
|
|
|
|
|
return texture;
|
2019-10-13 08:02:07 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Calculate texture sizes, used to find all overlapping textures.
|
2021-01-15 19:14:00 +01:00
|
|
|
SizeInfo sizeInfo = info.CalculateSizeInfo(layerSize);
|
2019-10-13 08:02:07 +02:00
|
|
|
|
|
|
|
ulong size = (ulong)sizeInfo.TotalSize;
|
2021-01-17 19:44:34 +01:00
|
|
|
|
|
|
|
if (range == null)
|
|
|
|
{
|
|
|
|
range = _context.MemoryManager.GetPhysicalRegions(info.GpuAddress, size);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Find view compatible matches.
|
2020-09-10 21:44:04 +02:00
|
|
|
int overlapsCount;
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2020-09-10 21:44:04 +02:00
|
|
|
lock (_textures)
|
|
|
|
{
|
2021-01-17 19:44:34 +01:00
|
|
|
overlapsCount = _textures.FindOverlaps(range.Value, ref _textureOverlaps);
|
2020-09-10 21:44:04 +02:00
|
|
|
}
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2021-03-02 23:30:54 +01:00
|
|
|
if (_overlapInfo.Length != _textureOverlaps.Length)
|
|
|
|
{
|
|
|
|
Array.Resize(ref _overlapInfo, _textureOverlaps.Length);
|
|
|
|
}
|
|
|
|
|
2021-04-02 16:33:39 +02:00
|
|
|
// =============== Find Texture View of Existing Texture ===============
|
2021-03-02 23:30:54 +01:00
|
|
|
|
|
|
|
int fullyCompatible = 0;
|
|
|
|
|
|
|
|
// Evaluate compatibility of overlaps
|
|
|
|
|
2019-11-25 01:29:37 +01:00
|
|
|
for (int index = 0; index < overlapsCount; index++)
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
2019-11-25 01:29:37 +01:00
|
|
|
Texture overlap = _textureOverlaps[index];
|
2021-03-02 23:30:54 +01:00
|
|
|
TextureViewCompatibility overlapCompatibility = overlap.IsViewCompatible(info, range.Value, sizeInfo.LayerSize, out int firstLayer, out int firstLevel);
|
2019-11-25 01:29:37 +01:00
|
|
|
|
Memory Read/Write Tracking using Region Handles (#1272)
* WIP Range Tracking
- Texture invalidation seems to have large problems
- Buffer/Pool invalidation may have problems
- Mirror memory tracking puts an additional `add` in compiled code, we likely just want to make HLE access slower if this is the final solution.
- Native project is in the messiest possible location.
- [HACK] JIT memory access always uses native "fast" path
- [HACK] Trying some things with texture invalidation and views.
It works :)
Still a few hacks, messy things, slow things
More work in progress stuff (also move to memory project)
Quite a bit faster now.
- Unmapping GPU VA and CPU VA will now correctly update write tracking regions, and invalidate textures for the former.
- The Virtual range list is now non-overlapping like the physical one.
- Fixed some bugs where regions could leak.
- Introduced a weird bug that I still need to track down (consistent invalid buffer in MK8 ribbon road)
Move some stuff.
I think we'll eventually just put the dll and so for this in a nuget package.
Fix rebase.
[WIP] MultiRegionHandle variable size ranges
- Avoid reprotecting regions that change often (needs some tweaking)
- There's still a bug in buffers, somehow.
- Might want different api for minimum granularity
Fix rebase issue
Commit everything needed for software only tracking.
Remove native components.
Remove more native stuff.
Cleanup
Use a separate window for the background context, update opentk. (fixes linux)
Some experimental changes
Should get things working up to scratch - still need to try some things with flush/modification and res scale.
Include address with the region action.
Initial work to make range tracking work
Still a ton of bugs
Fix some issues with the new stuff.
* Fix texture flush instability
There's still some weird behaviour, but it's much improved without this. (textures with cpu modified data were flushing over it)
* Find the destination texture for Buffer->Texture full copy
Greatly improves performance for nvdec videos (with range tracking)
* Further improve texture tracking
* Disable Memory Tracking for view parents
This is a temporary approach to better match behaviour on master (where invalidations would be soaked up by views, rather than trigger twice)
The assumption is that when views are created to a texture, they will cover all of its data anyways. Of course, this can easily be improved in future.
* Introduce some tracking tests.
WIP
* Complete base tests.
* Add more tests for multiregion, fix existing test.
* Cleanup Part 1
* Remove unnecessary code from memory tracking
* Fix some inconsistencies with 3D texture rule.
* Add dispose tests.
* Use a background thread for the background context.
Rather than setting and unsetting a context as current, doing the work on a dedicated thread with signals seems to be a bit faster.
Also nerf the multithreading test a bit.
* Copy to texture with matching alignment
This extends the copy to work for some videos with unusual size, such as tutorial videos in SMO. It will only occur if the destination texture already exists at XCount size.
* Track reads for buffer copies. Synchronize new buffers before copying overlaps.
* Remove old texture flushing mechanisms.
Range tracking all the way, baby.
* Wake the background thread when disposing.
Avoids a deadlock when games are closed.
* Address Feedback 1
* Separate TextureCopy instance for background thread
Also `BackgroundContextWorker.InBackground` for a more sensible idenfifier for if we're in a background thread.
* Add missing XML docs.
* Address Feedback
* Maybe I should start drinking coffee.
* Some more feedback.
* Remove flush warning, Refocus window after making background context
2020-10-16 22:18:35 +02:00
|
|
|
if (overlapCompatibility == TextureViewCompatibility.Full)
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
2021-03-02 23:30:54 +01:00
|
|
|
if (overlap.IsView)
|
|
|
|
{
|
|
|
|
overlapCompatibility = TextureViewCompatibility.CopyOnly;
|
|
|
|
}
|
|
|
|
else
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
2021-03-02 23:30:54 +01:00
|
|
|
fullyCompatible++;
|
2019-10-13 08:02:07 +02:00
|
|
|
}
|
2021-03-02 23:30:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
_overlapInfo[index] = new OverlapInfo(overlapCompatibility, firstLayer, firstLevel);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Search through the overlaps to find a compatible view and establish any copy dependencies.
|
|
|
|
|
|
|
|
for (int index = 0; index < overlapsCount; index++)
|
|
|
|
{
|
|
|
|
Texture overlap = _textureOverlaps[index];
|
|
|
|
OverlapInfo oInfo = _overlapInfo[index];
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2021-03-02 23:30:54 +01:00
|
|
|
if (oInfo.Compatibility == TextureViewCompatibility.Full)
|
|
|
|
{
|
|
|
|
TextureInfo adjInfo = AdjustSizes(overlap, info, oInfo.FirstLevel);
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2021-03-02 23:30:54 +01:00
|
|
|
if (!isSamplerTexture)
|
2020-03-20 04:17:11 +01:00
|
|
|
{
|
2021-03-02 23:30:54 +01:00
|
|
|
info = adjInfo;
|
2020-03-20 04:17:11 +01:00
|
|
|
}
|
|
|
|
|
2021-03-02 23:30:54 +01:00
|
|
|
texture = overlap.CreateView(adjInfo, sizeInfo, range.Value, oInfo.FirstLayer, oInfo.FirstLevel);
|
|
|
|
|
2020-11-10 01:41:13 +01:00
|
|
|
ChangeSizeIfNeeded(info, texture, isSamplerTexture, sizeHint);
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2021-03-02 23:30:54 +01:00
|
|
|
texture.SynchronizeMemory();
|
2019-10-13 08:02:07 +02:00
|
|
|
break;
|
2020-10-29 22:57:34 +01:00
|
|
|
}
|
2021-03-02 23:30:54 +01:00
|
|
|
else if (oInfo.Compatibility == TextureViewCompatibility.CopyOnly && fullyCompatible == 0)
|
Memory Read/Write Tracking using Region Handles (#1272)
* WIP Range Tracking
- Texture invalidation seems to have large problems
- Buffer/Pool invalidation may have problems
- Mirror memory tracking puts an additional `add` in compiled code, we likely just want to make HLE access slower if this is the final solution.
- Native project is in the messiest possible location.
- [HACK] JIT memory access always uses native "fast" path
- [HACK] Trying some things with texture invalidation and views.
It works :)
Still a few hacks, messy things, slow things
More work in progress stuff (also move to memory project)
Quite a bit faster now.
- Unmapping GPU VA and CPU VA will now correctly update write tracking regions, and invalidate textures for the former.
- The Virtual range list is now non-overlapping like the physical one.
- Fixed some bugs where regions could leak.
- Introduced a weird bug that I still need to track down (consistent invalid buffer in MK8 ribbon road)
Move some stuff.
I think we'll eventually just put the dll and so for this in a nuget package.
Fix rebase.
[WIP] MultiRegionHandle variable size ranges
- Avoid reprotecting regions that change often (needs some tweaking)
- There's still a bug in buffers, somehow.
- Might want different api for minimum granularity
Fix rebase issue
Commit everything needed for software only tracking.
Remove native components.
Remove more native stuff.
Cleanup
Use a separate window for the background context, update opentk. (fixes linux)
Some experimental changes
Should get things working up to scratch - still need to try some things with flush/modification and res scale.
Include address with the region action.
Initial work to make range tracking work
Still a ton of bugs
Fix some issues with the new stuff.
* Fix texture flush instability
There's still some weird behaviour, but it's much improved without this. (textures with cpu modified data were flushing over it)
* Find the destination texture for Buffer->Texture full copy
Greatly improves performance for nvdec videos (with range tracking)
* Further improve texture tracking
* Disable Memory Tracking for view parents
This is a temporary approach to better match behaviour on master (where invalidations would be soaked up by views, rather than trigger twice)
The assumption is that when views are created to a texture, they will cover all of its data anyways. Of course, this can easily be improved in future.
* Introduce some tracking tests.
WIP
* Complete base tests.
* Add more tests for multiregion, fix existing test.
* Cleanup Part 1
* Remove unnecessary code from memory tracking
* Fix some inconsistencies with 3D texture rule.
* Add dispose tests.
* Use a background thread for the background context.
Rather than setting and unsetting a context as current, doing the work on a dedicated thread with signals seems to be a bit faster.
Also nerf the multithreading test a bit.
* Copy to texture with matching alignment
This extends the copy to work for some videos with unusual size, such as tutorial videos in SMO. It will only occur if the destination texture already exists at XCount size.
* Track reads for buffer copies. Synchronize new buffers before copying overlaps.
* Remove old texture flushing mechanisms.
Range tracking all the way, baby.
* Wake the background thread when disposing.
Avoids a deadlock when games are closed.
* Address Feedback 1
* Separate TextureCopy instance for background thread
Also `BackgroundContextWorker.InBackground` for a more sensible idenfifier for if we're in a background thread.
* Add missing XML docs.
* Address Feedback
* Maybe I should start drinking coffee.
* Some more feedback.
* Remove flush warning, Refocus window after making background context
2020-10-16 22:18:35 +02:00
|
|
|
{
|
2021-03-02 23:30:54 +01:00
|
|
|
// Only copy compatible. If there's another choice for a FULLY compatible texture, choose that instead.
|
|
|
|
|
|
|
|
texture = new Texture(_context, info, sizeInfo, range.Value, scaleMode);
|
|
|
|
texture.InitializeGroup(true, true);
|
|
|
|
texture.InitializeData(false, false);
|
|
|
|
|
|
|
|
overlap.SynchronizeMemory();
|
|
|
|
overlap.CreateCopyDependency(texture, oInfo.FirstLayer, oInfo.FirstLevel, true);
|
|
|
|
break;
|
2019-10-13 08:02:07 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-03-02 23:30:54 +01:00
|
|
|
if (texture != null)
|
|
|
|
{
|
|
|
|
// This texture could be a view of multiple parent textures with different storages, even if it is a view.
|
2021-04-02 16:33:39 +02:00
|
|
|
// When a texture is created, make sure all possible dependencies to other textures are created as copies.
|
2021-03-02 23:30:54 +01:00
|
|
|
// (even if it could be fulfilled without a copy)
|
|
|
|
|
|
|
|
for (int index = 0; index < overlapsCount; index++)
|
|
|
|
{
|
|
|
|
Texture overlap = _textureOverlaps[index];
|
|
|
|
OverlapInfo oInfo = _overlapInfo[index];
|
|
|
|
|
|
|
|
if (oInfo.Compatibility != TextureViewCompatibility.Incompatible && overlap.Group != texture.Group)
|
|
|
|
{
|
|
|
|
overlap.SynchronizeMemory();
|
|
|
|
overlap.CreateCopyDependency(texture, oInfo.FirstLayer, oInfo.FirstLevel, true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
texture.SynchronizeMemory();
|
|
|
|
}
|
|
|
|
|
2021-04-02 16:33:39 +02:00
|
|
|
// =============== Create a New Texture ===============
|
2021-03-02 23:30:54 +01:00
|
|
|
|
2019-10-13 08:02:07 +02:00
|
|
|
// No match, create a new texture.
|
|
|
|
if (texture == null)
|
|
|
|
{
|
2021-01-17 19:44:34 +01:00
|
|
|
texture = new Texture(_context, info, sizeInfo, range.Value, scaleMode);
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2020-09-10 21:44:04 +02:00
|
|
|
// Step 1: Find textures that are view compatible with the new texture.
|
|
|
|
// Any textures that are incompatible will contain garbage data, so they should be removed where possible.
|
|
|
|
|
|
|
|
int viewCompatible = 0;
|
2021-03-02 23:30:54 +01:00
|
|
|
fullyCompatible = 0;
|
2020-09-27 01:37:45 +02:00
|
|
|
bool setData = isSamplerTexture || overlapsCount == 0 || flags.HasFlag(TextureSearchFlags.ForCopy);
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2021-03-02 23:30:54 +01:00
|
|
|
bool hasLayerViews = false;
|
|
|
|
bool hasMipViews = false;
|
|
|
|
|
2019-11-25 01:29:37 +01:00
|
|
|
for (int index = 0; index < overlapsCount; index++)
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
2019-11-25 01:29:37 +01:00
|
|
|
Texture overlap = _textureOverlaps[index];
|
2020-09-10 21:44:04 +02:00
|
|
|
bool overlapInCache = overlap.CacheNode != null;
|
2019-11-25 01:29:37 +01:00
|
|
|
|
2021-03-02 23:30:54 +01:00
|
|
|
TextureViewCompatibility compatibility = texture.IsViewCompatible(overlap.Info, overlap.Range, overlap.LayerSize, out int firstLayer, out int firstLevel);
|
|
|
|
|
|
|
|
if (overlap.IsView && compatibility == TextureViewCompatibility.Full)
|
|
|
|
{
|
|
|
|
compatibility = TextureViewCompatibility.CopyOnly;
|
|
|
|
}
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2020-09-10 21:44:04 +02:00
|
|
|
if (compatibility != TextureViewCompatibility.Incompatible)
|
|
|
|
{
|
2021-03-02 23:30:54 +01:00
|
|
|
if (compatibility == TextureViewCompatibility.Full)
|
|
|
|
{
|
|
|
|
if (viewCompatible == fullyCompatible)
|
|
|
|
{
|
|
|
|
_overlapInfo[viewCompatible] = new OverlapInfo(compatibility, firstLayer, firstLevel);
|
|
|
|
_textureOverlaps[viewCompatible++] = overlap;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Swap overlaps so that the fully compatible views have priority.
|
|
|
|
|
|
|
|
_overlapInfo[viewCompatible] = _overlapInfo[fullyCompatible];
|
|
|
|
_textureOverlaps[viewCompatible++] = _textureOverlaps[fullyCompatible];
|
|
|
|
|
|
|
|
_overlapInfo[fullyCompatible] = new OverlapInfo(compatibility, firstLayer, firstLevel);
|
|
|
|
_textureOverlaps[fullyCompatible] = overlap;
|
|
|
|
}
|
|
|
|
fullyCompatible++;
|
|
|
|
}
|
|
|
|
else
|
2020-07-07 04:41:07 +02:00
|
|
|
{
|
2021-03-02 23:30:54 +01:00
|
|
|
_overlapInfo[viewCompatible] = new OverlapInfo(compatibility, firstLayer, firstLevel);
|
|
|
|
_textureOverlaps[viewCompatible++] = overlap;
|
2020-09-10 21:44:04 +02:00
|
|
|
}
|
2020-07-07 04:41:07 +02:00
|
|
|
|
2021-03-02 23:30:54 +01:00
|
|
|
hasLayerViews |= overlap.Info.GetSlices() < texture.Info.GetSlices();
|
|
|
|
hasMipViews |= overlap.Info.Levels < texture.Info.Levels;
|
2020-09-10 21:44:04 +02:00
|
|
|
}
|
|
|
|
else if (overlapInCache || !setData)
|
|
|
|
{
|
|
|
|
if (info.GobBlocksInZ > 1 && info.GobBlocksInZ == overlap.Info.GobBlocksInZ)
|
|
|
|
{
|
|
|
|
// Allow overlapping slices of 3D textures. Could be improved in future by making sure the textures don't overlap.
|
|
|
|
continue;
|
2020-07-07 04:41:07 +02:00
|
|
|
}
|
|
|
|
|
2020-09-10 21:44:04 +02:00
|
|
|
// The overlap texture is going to contain garbage data after we draw, or is generally incompatible.
|
|
|
|
// If the texture cannot be entirely contained in the new address space, and one of its view children is compatible with us,
|
|
|
|
// it must be flushed before removal, so that the data is not lost.
|
|
|
|
|
|
|
|
// If the texture was modified since its last use, then that data is probably meant to go into this texture.
|
|
|
|
// If the data has been modified by the CPU, then it also shouldn't be flushed.
|
|
|
|
bool modified = overlap.ConsumeModified();
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2021-01-17 19:44:34 +01:00
|
|
|
bool flush = overlapInCache && !modified && !texture.Range.Contains(overlap.Range) && overlap.HasViewCompatibleChild(texture);
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2020-09-10 21:44:04 +02:00
|
|
|
setData |= modified || flush;
|
|
|
|
|
|
|
|
if (overlapInCache)
|
2020-03-20 04:17:11 +01:00
|
|
|
{
|
2020-09-10 21:44:04 +02:00
|
|
|
_cache.Remove(overlap, flush);
|
2020-03-20 04:17:11 +01:00
|
|
|
}
|
2020-09-10 21:44:04 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-03-02 23:30:54 +01:00
|
|
|
texture.InitializeGroup(hasLayerViews, hasMipViews);
|
|
|
|
|
2020-09-10 21:44:04 +02:00
|
|
|
// We need to synchronize before copying the old view data to the texture,
|
|
|
|
// otherwise the copied data would be overwritten by a future synchronization.
|
|
|
|
texture.InitializeData(false, setData);
|
|
|
|
|
|
|
|
for (int index = 0; index < viewCompatible; index++)
|
|
|
|
{
|
|
|
|
Texture overlap = _textureOverlaps[index];
|
2021-03-02 23:30:54 +01:00
|
|
|
|
2020-09-10 21:44:04 +02:00
|
|
|
OverlapInfo oInfo = _overlapInfo[index];
|
|
|
|
|
2021-03-02 23:30:54 +01:00
|
|
|
if (overlap.Group == texture.Group)
|
2020-09-10 21:44:04 +02:00
|
|
|
{
|
2021-03-02 23:30:54 +01:00
|
|
|
// If the texture group is equal, then this texture (or its parent) is already a view.
|
|
|
|
continue;
|
2020-09-10 21:44:04 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
TextureInfo overlapInfo = AdjustSizes(texture, overlap.Info, oInfo.FirstLevel);
|
|
|
|
|
|
|
|
if (texture.ScaleFactor != overlap.ScaleFactor)
|
|
|
|
{
|
|
|
|
// A bit tricky, our new texture may need to contain an existing texture that is upscaled, but isn't itself.
|
|
|
|
// In that case, we prefer the higher scale only if our format is render-target-like, otherwise we scale the view down before copy.
|
2020-03-20 04:17:11 +01:00
|
|
|
|
2020-09-10 21:44:04 +02:00
|
|
|
texture.PropagateScale(overlap);
|
2019-10-13 08:02:07 +02:00
|
|
|
}
|
2020-09-10 21:44:04 +02:00
|
|
|
|
2021-03-02 23:30:54 +01:00
|
|
|
if (oInfo.Compatibility != TextureViewCompatibility.Full)
|
2020-09-10 21:44:04 +02:00
|
|
|
{
|
2021-03-02 23:30:54 +01:00
|
|
|
// Copy only compatibility, or target texture is already a view.
|
2020-09-10 21:44:04 +02:00
|
|
|
|
2021-03-02 23:30:54 +01:00
|
|
|
overlap.SynchronizeMemory();
|
|
|
|
texture.CreateCopyDependency(overlap, oInfo.FirstLayer, oInfo.FirstLevel, false);
|
|
|
|
}
|
|
|
|
else
|
2019-10-31 00:45:01 +01:00
|
|
|
{
|
2021-03-02 23:30:54 +01:00
|
|
|
TextureCreateInfo createInfo = GetCreateInfo(overlapInfo, _context.Capabilities, overlap.ScaleFactor);
|
2019-11-25 01:29:37 +01:00
|
|
|
|
2021-03-02 23:30:54 +01:00
|
|
|
ITexture newView = texture.HostTexture.CreateView(createInfo, oInfo.FirstLayer, oInfo.FirstLevel);
|
2020-07-07 04:41:07 +02:00
|
|
|
|
2021-03-02 23:30:54 +01:00
|
|
|
overlap.SynchronizeMemory();
|
2020-03-20 04:17:11 +01:00
|
|
|
|
2021-03-02 23:30:54 +01:00
|
|
|
overlap.HostTexture.CopyTo(newView, 0, 0);
|
|
|
|
|
|
|
|
overlap.ReplaceView(texture, overlapInfo, newView, oInfo.FirstLayer, oInfo.FirstLevel);
|
2019-10-31 00:45:01 +01:00
|
|
|
}
|
|
|
|
}
|
2021-04-02 16:33:39 +02:00
|
|
|
|
2021-03-02 23:30:54 +01:00
|
|
|
texture.SynchronizeMemory();
|
2019-10-13 08:02:07 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Sampler textures are managed by the texture pool, all other textures
|
|
|
|
// are managed by the auto delete cache.
|
|
|
|
if (!isSamplerTexture)
|
|
|
|
{
|
|
|
|
_cache.Add(texture);
|
|
|
|
}
|
|
|
|
|
2020-09-10 21:44:04 +02:00
|
|
|
lock (_textures)
|
|
|
|
{
|
|
|
|
_textures.Add(texture);
|
|
|
|
}
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2019-11-25 01:29:37 +01:00
|
|
|
ShrinkOverlapsBufferIfNeeded();
|
|
|
|
|
2019-10-13 08:02:07 +02:00
|
|
|
return texture;
|
|
|
|
}
|
|
|
|
|
2020-11-10 01:41:13 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Changes a texture's size to match the desired size for samplers,
|
|
|
|
/// or increases a texture's size to fit the region indicated by a size hint.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="info">The desired texture info</param>
|
|
|
|
/// <param name="texture">The texture to resize</param>
|
|
|
|
/// <param name="isSamplerTexture">True if the texture will be used for a sampler, false otherwise</param>
|
|
|
|
/// <param name="sizeHint">A hint indicating the minimum used size for the texture</param>
|
|
|
|
private void ChangeSizeIfNeeded(TextureInfo info, Texture texture, bool isSamplerTexture, Size? sizeHint)
|
|
|
|
{
|
|
|
|
if (isSamplerTexture)
|
|
|
|
{
|
|
|
|
// If this is used for sampling, the size must match,
|
|
|
|
// otherwise the shader would sample garbage data.
|
|
|
|
// To fix that, we create a new texture with the correct
|
|
|
|
// size, and copy the data from the old one to the new one.
|
|
|
|
|
|
|
|
if (!TextureCompatibility.SizeMatches(texture.Info, info))
|
|
|
|
{
|
|
|
|
texture.ChangeSize(info.Width, info.Height, info.DepthOrLayers);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (sizeHint != null)
|
|
|
|
{
|
|
|
|
// A size hint indicates that data will be used within that range, at least.
|
|
|
|
// If the texture is smaller than the size hint, it must be enlarged to meet it.
|
|
|
|
// The maximum size is provided by the requested info, which generally has an aligned size.
|
|
|
|
|
|
|
|
int width = Math.Max(texture.Info.Width, Math.Min(sizeHint.Value.Width, info.Width));
|
|
|
|
int height = Math.Max(texture.Info.Height, Math.Min(sizeHint.Value.Height, info.Height));
|
|
|
|
|
|
|
|
if (texture.Info.Width != width || texture.Info.Height != height)
|
|
|
|
{
|
|
|
|
texture.ChangeSize(width, height, info.DepthOrLayers);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-20 04:17:11 +01:00
|
|
|
/// <summary>
|
Memory Read/Write Tracking using Region Handles (#1272)
* WIP Range Tracking
- Texture invalidation seems to have large problems
- Buffer/Pool invalidation may have problems
- Mirror memory tracking puts an additional `add` in compiled code, we likely just want to make HLE access slower if this is the final solution.
- Native project is in the messiest possible location.
- [HACK] JIT memory access always uses native "fast" path
- [HACK] Trying some things with texture invalidation and views.
It works :)
Still a few hacks, messy things, slow things
More work in progress stuff (also move to memory project)
Quite a bit faster now.
- Unmapping GPU VA and CPU VA will now correctly update write tracking regions, and invalidate textures for the former.
- The Virtual range list is now non-overlapping like the physical one.
- Fixed some bugs where regions could leak.
- Introduced a weird bug that I still need to track down (consistent invalid buffer in MK8 ribbon road)
Move some stuff.
I think we'll eventually just put the dll and so for this in a nuget package.
Fix rebase.
[WIP] MultiRegionHandle variable size ranges
- Avoid reprotecting regions that change often (needs some tweaking)
- There's still a bug in buffers, somehow.
- Might want different api for minimum granularity
Fix rebase issue
Commit everything needed for software only tracking.
Remove native components.
Remove more native stuff.
Cleanup
Use a separate window for the background context, update opentk. (fixes linux)
Some experimental changes
Should get things working up to scratch - still need to try some things with flush/modification and res scale.
Include address with the region action.
Initial work to make range tracking work
Still a ton of bugs
Fix some issues with the new stuff.
* Fix texture flush instability
There's still some weird behaviour, but it's much improved without this. (textures with cpu modified data were flushing over it)
* Find the destination texture for Buffer->Texture full copy
Greatly improves performance for nvdec videos (with range tracking)
* Further improve texture tracking
* Disable Memory Tracking for view parents
This is a temporary approach to better match behaviour on master (where invalidations would be soaked up by views, rather than trigger twice)
The assumption is that when views are created to a texture, they will cover all of its data anyways. Of course, this can easily be improved in future.
* Introduce some tracking tests.
WIP
* Complete base tests.
* Add more tests for multiregion, fix existing test.
* Cleanup Part 1
* Remove unnecessary code from memory tracking
* Fix some inconsistencies with 3D texture rule.
* Add dispose tests.
* Use a background thread for the background context.
Rather than setting and unsetting a context as current, doing the work on a dedicated thread with signals seems to be a bit faster.
Also nerf the multithreading test a bit.
* Copy to texture with matching alignment
This extends the copy to work for some videos with unusual size, such as tutorial videos in SMO. It will only occur if the destination texture already exists at XCount size.
* Track reads for buffer copies. Synchronize new buffers before copying overlaps.
* Remove old texture flushing mechanisms.
Range tracking all the way, baby.
* Wake the background thread when disposing.
Avoids a deadlock when games are closed.
* Address Feedback 1
* Separate TextureCopy instance for background thread
Also `BackgroundContextWorker.InBackground` for a more sensible idenfifier for if we're in a background thread.
* Add missing XML docs.
* Address Feedback
* Maybe I should start drinking coffee.
* Some more feedback.
* Remove flush warning, Refocus window after making background context
2020-10-16 22:18:35 +02:00
|
|
|
/// Tries to find an existing texture matching the given buffer copy destination. If none is found, returns null.
|
2020-03-20 04:17:11 +01:00
|
|
|
/// </summary>
|
Memory Read/Write Tracking using Region Handles (#1272)
* WIP Range Tracking
- Texture invalidation seems to have large problems
- Buffer/Pool invalidation may have problems
- Mirror memory tracking puts an additional `add` in compiled code, we likely just want to make HLE access slower if this is the final solution.
- Native project is in the messiest possible location.
- [HACK] JIT memory access always uses native "fast" path
- [HACK] Trying some things with texture invalidation and views.
It works :)
Still a few hacks, messy things, slow things
More work in progress stuff (also move to memory project)
Quite a bit faster now.
- Unmapping GPU VA and CPU VA will now correctly update write tracking regions, and invalidate textures for the former.
- The Virtual range list is now non-overlapping like the physical one.
- Fixed some bugs where regions could leak.
- Introduced a weird bug that I still need to track down (consistent invalid buffer in MK8 ribbon road)
Move some stuff.
I think we'll eventually just put the dll and so for this in a nuget package.
Fix rebase.
[WIP] MultiRegionHandle variable size ranges
- Avoid reprotecting regions that change often (needs some tweaking)
- There's still a bug in buffers, somehow.
- Might want different api for minimum granularity
Fix rebase issue
Commit everything needed for software only tracking.
Remove native components.
Remove more native stuff.
Cleanup
Use a separate window for the background context, update opentk. (fixes linux)
Some experimental changes
Should get things working up to scratch - still need to try some things with flush/modification and res scale.
Include address with the region action.
Initial work to make range tracking work
Still a ton of bugs
Fix some issues with the new stuff.
* Fix texture flush instability
There's still some weird behaviour, but it's much improved without this. (textures with cpu modified data were flushing over it)
* Find the destination texture for Buffer->Texture full copy
Greatly improves performance for nvdec videos (with range tracking)
* Further improve texture tracking
* Disable Memory Tracking for view parents
This is a temporary approach to better match behaviour on master (where invalidations would be soaked up by views, rather than trigger twice)
The assumption is that when views are created to a texture, they will cover all of its data anyways. Of course, this can easily be improved in future.
* Introduce some tracking tests.
WIP
* Complete base tests.
* Add more tests for multiregion, fix existing test.
* Cleanup Part 1
* Remove unnecessary code from memory tracking
* Fix some inconsistencies with 3D texture rule.
* Add dispose tests.
* Use a background thread for the background context.
Rather than setting and unsetting a context as current, doing the work on a dedicated thread with signals seems to be a bit faster.
Also nerf the multithreading test a bit.
* Copy to texture with matching alignment
This extends the copy to work for some videos with unusual size, such as tutorial videos in SMO. It will only occur if the destination texture already exists at XCount size.
* Track reads for buffer copies. Synchronize new buffers before copying overlaps.
* Remove old texture flushing mechanisms.
Range tracking all the way, baby.
* Wake the background thread when disposing.
Avoids a deadlock when games are closed.
* Address Feedback 1
* Separate TextureCopy instance for background thread
Also `BackgroundContextWorker.InBackground` for a more sensible idenfifier for if we're in a background thread.
* Add missing XML docs.
* Address Feedback
* Maybe I should start drinking coffee.
* Some more feedback.
* Remove flush warning, Refocus window after making background context
2020-10-16 22:18:35 +02:00
|
|
|
/// <param name="tex">The texture information</param>
|
|
|
|
/// <param name="cbp">The copy buffer parameters</param>
|
|
|
|
/// <param name="swizzle">The copy buffer swizzle</param>
|
|
|
|
/// <param name="linear">True if the texture has a linear layout, false otherwise</param>
|
|
|
|
/// <returns>A matching texture, or null if there is no match</returns>
|
|
|
|
public Texture FindTexture(CopyBufferTexture tex, CopyBufferParams cbp, CopyBufferSwizzle swizzle, bool linear)
|
2020-03-20 04:17:11 +01:00
|
|
|
{
|
Memory Read/Write Tracking using Region Handles (#1272)
* WIP Range Tracking
- Texture invalidation seems to have large problems
- Buffer/Pool invalidation may have problems
- Mirror memory tracking puts an additional `add` in compiled code, we likely just want to make HLE access slower if this is the final solution.
- Native project is in the messiest possible location.
- [HACK] JIT memory access always uses native "fast" path
- [HACK] Trying some things with texture invalidation and views.
It works :)
Still a few hacks, messy things, slow things
More work in progress stuff (also move to memory project)
Quite a bit faster now.
- Unmapping GPU VA and CPU VA will now correctly update write tracking regions, and invalidate textures for the former.
- The Virtual range list is now non-overlapping like the physical one.
- Fixed some bugs where regions could leak.
- Introduced a weird bug that I still need to track down (consistent invalid buffer in MK8 ribbon road)
Move some stuff.
I think we'll eventually just put the dll and so for this in a nuget package.
Fix rebase.
[WIP] MultiRegionHandle variable size ranges
- Avoid reprotecting regions that change often (needs some tweaking)
- There's still a bug in buffers, somehow.
- Might want different api for minimum granularity
Fix rebase issue
Commit everything needed for software only tracking.
Remove native components.
Remove more native stuff.
Cleanup
Use a separate window for the background context, update opentk. (fixes linux)
Some experimental changes
Should get things working up to scratch - still need to try some things with flush/modification and res scale.
Include address with the region action.
Initial work to make range tracking work
Still a ton of bugs
Fix some issues with the new stuff.
* Fix texture flush instability
There's still some weird behaviour, but it's much improved without this. (textures with cpu modified data were flushing over it)
* Find the destination texture for Buffer->Texture full copy
Greatly improves performance for nvdec videos (with range tracking)
* Further improve texture tracking
* Disable Memory Tracking for view parents
This is a temporary approach to better match behaviour on master (where invalidations would be soaked up by views, rather than trigger twice)
The assumption is that when views are created to a texture, they will cover all of its data anyways. Of course, this can easily be improved in future.
* Introduce some tracking tests.
WIP
* Complete base tests.
* Add more tests for multiregion, fix existing test.
* Cleanup Part 1
* Remove unnecessary code from memory tracking
* Fix some inconsistencies with 3D texture rule.
* Add dispose tests.
* Use a background thread for the background context.
Rather than setting and unsetting a context as current, doing the work on a dedicated thread with signals seems to be a bit faster.
Also nerf the multithreading test a bit.
* Copy to texture with matching alignment
This extends the copy to work for some videos with unusual size, such as tutorial videos in SMO. It will only occur if the destination texture already exists at XCount size.
* Track reads for buffer copies. Synchronize new buffers before copying overlaps.
* Remove old texture flushing mechanisms.
Range tracking all the way, baby.
* Wake the background thread when disposing.
Avoids a deadlock when games are closed.
* Address Feedback 1
* Separate TextureCopy instance for background thread
Also `BackgroundContextWorker.InBackground` for a more sensible idenfifier for if we're in a background thread.
* Add missing XML docs.
* Address Feedback
* Maybe I should start drinking coffee.
* Some more feedback.
* Remove flush warning, Refocus window after making background context
2020-10-16 22:18:35 +02:00
|
|
|
ulong address = _context.MemoryManager.Translate(cbp.DstAddress.Pack());
|
2020-03-20 04:17:11 +01:00
|
|
|
|
2020-12-09 23:26:05 +01:00
|
|
|
if (address == MemoryManager.PteUnmapped)
|
2020-03-20 04:17:11 +01:00
|
|
|
{
|
Memory Read/Write Tracking using Region Handles (#1272)
* WIP Range Tracking
- Texture invalidation seems to have large problems
- Buffer/Pool invalidation may have problems
- Mirror memory tracking puts an additional `add` in compiled code, we likely just want to make HLE access slower if this is the final solution.
- Native project is in the messiest possible location.
- [HACK] JIT memory access always uses native "fast" path
- [HACK] Trying some things with texture invalidation and views.
It works :)
Still a few hacks, messy things, slow things
More work in progress stuff (also move to memory project)
Quite a bit faster now.
- Unmapping GPU VA and CPU VA will now correctly update write tracking regions, and invalidate textures for the former.
- The Virtual range list is now non-overlapping like the physical one.
- Fixed some bugs where regions could leak.
- Introduced a weird bug that I still need to track down (consistent invalid buffer in MK8 ribbon road)
Move some stuff.
I think we'll eventually just put the dll and so for this in a nuget package.
Fix rebase.
[WIP] MultiRegionHandle variable size ranges
- Avoid reprotecting regions that change often (needs some tweaking)
- There's still a bug in buffers, somehow.
- Might want different api for minimum granularity
Fix rebase issue
Commit everything needed for software only tracking.
Remove native components.
Remove more native stuff.
Cleanup
Use a separate window for the background context, update opentk. (fixes linux)
Some experimental changes
Should get things working up to scratch - still need to try some things with flush/modification and res scale.
Include address with the region action.
Initial work to make range tracking work
Still a ton of bugs
Fix some issues with the new stuff.
* Fix texture flush instability
There's still some weird behaviour, but it's much improved without this. (textures with cpu modified data were flushing over it)
* Find the destination texture for Buffer->Texture full copy
Greatly improves performance for nvdec videos (with range tracking)
* Further improve texture tracking
* Disable Memory Tracking for view parents
This is a temporary approach to better match behaviour on master (where invalidations would be soaked up by views, rather than trigger twice)
The assumption is that when views are created to a texture, they will cover all of its data anyways. Of course, this can easily be improved in future.
* Introduce some tracking tests.
WIP
* Complete base tests.
* Add more tests for multiregion, fix existing test.
* Cleanup Part 1
* Remove unnecessary code from memory tracking
* Fix some inconsistencies with 3D texture rule.
* Add dispose tests.
* Use a background thread for the background context.
Rather than setting and unsetting a context as current, doing the work on a dedicated thread with signals seems to be a bit faster.
Also nerf the multithreading test a bit.
* Copy to texture with matching alignment
This extends the copy to work for some videos with unusual size, such as tutorial videos in SMO. It will only occur if the destination texture already exists at XCount size.
* Track reads for buffer copies. Synchronize new buffers before copying overlaps.
* Remove old texture flushing mechanisms.
Range tracking all the way, baby.
* Wake the background thread when disposing.
Avoids a deadlock when games are closed.
* Address Feedback 1
* Separate TextureCopy instance for background thread
Also `BackgroundContextWorker.InBackground` for a more sensible idenfifier for if we're in a background thread.
* Add missing XML docs.
* Address Feedback
* Maybe I should start drinking coffee.
* Some more feedback.
* Remove flush warning, Refocus window after making background context
2020-10-16 22:18:35 +02:00
|
|
|
return null;
|
2020-03-20 04:17:11 +01:00
|
|
|
}
|
2020-02-06 22:49:26 +01:00
|
|
|
|
Memory Read/Write Tracking using Region Handles (#1272)
* WIP Range Tracking
- Texture invalidation seems to have large problems
- Buffer/Pool invalidation may have problems
- Mirror memory tracking puts an additional `add` in compiled code, we likely just want to make HLE access slower if this is the final solution.
- Native project is in the messiest possible location.
- [HACK] JIT memory access always uses native "fast" path
- [HACK] Trying some things with texture invalidation and views.
It works :)
Still a few hacks, messy things, slow things
More work in progress stuff (also move to memory project)
Quite a bit faster now.
- Unmapping GPU VA and CPU VA will now correctly update write tracking regions, and invalidate textures for the former.
- The Virtual range list is now non-overlapping like the physical one.
- Fixed some bugs where regions could leak.
- Introduced a weird bug that I still need to track down (consistent invalid buffer in MK8 ribbon road)
Move some stuff.
I think we'll eventually just put the dll and so for this in a nuget package.
Fix rebase.
[WIP] MultiRegionHandle variable size ranges
- Avoid reprotecting regions that change often (needs some tweaking)
- There's still a bug in buffers, somehow.
- Might want different api for minimum granularity
Fix rebase issue
Commit everything needed for software only tracking.
Remove native components.
Remove more native stuff.
Cleanup
Use a separate window for the background context, update opentk. (fixes linux)
Some experimental changes
Should get things working up to scratch - still need to try some things with flush/modification and res scale.
Include address with the region action.
Initial work to make range tracking work
Still a ton of bugs
Fix some issues with the new stuff.
* Fix texture flush instability
There's still some weird behaviour, but it's much improved without this. (textures with cpu modified data were flushing over it)
* Find the destination texture for Buffer->Texture full copy
Greatly improves performance for nvdec videos (with range tracking)
* Further improve texture tracking
* Disable Memory Tracking for view parents
This is a temporary approach to better match behaviour on master (where invalidations would be soaked up by views, rather than trigger twice)
The assumption is that when views are created to a texture, they will cover all of its data anyways. Of course, this can easily be improved in future.
* Introduce some tracking tests.
WIP
* Complete base tests.
* Add more tests for multiregion, fix existing test.
* Cleanup Part 1
* Remove unnecessary code from memory tracking
* Fix some inconsistencies with 3D texture rule.
* Add dispose tests.
* Use a background thread for the background context.
Rather than setting and unsetting a context as current, doing the work on a dedicated thread with signals seems to be a bit faster.
Also nerf the multithreading test a bit.
* Copy to texture with matching alignment
This extends the copy to work for some videos with unusual size, such as tutorial videos in SMO. It will only occur if the destination texture already exists at XCount size.
* Track reads for buffer copies. Synchronize new buffers before copying overlaps.
* Remove old texture flushing mechanisms.
Range tracking all the way, baby.
* Wake the background thread when disposing.
Avoids a deadlock when games are closed.
* Address Feedback 1
* Separate TextureCopy instance for background thread
Also `BackgroundContextWorker.InBackground` for a more sensible idenfifier for if we're in a background thread.
* Add missing XML docs.
* Address Feedback
* Maybe I should start drinking coffee.
* Some more feedback.
* Remove flush warning, Refocus window after making background context
2020-10-16 22:18:35 +02:00
|
|
|
int bpp = swizzle.UnpackDstComponentsCount() * swizzle.UnpackComponentSize();
|
2020-03-20 04:17:11 +01:00
|
|
|
|
Memory Read/Write Tracking using Region Handles (#1272)
* WIP Range Tracking
- Texture invalidation seems to have large problems
- Buffer/Pool invalidation may have problems
- Mirror memory tracking puts an additional `add` in compiled code, we likely just want to make HLE access slower if this is the final solution.
- Native project is in the messiest possible location.
- [HACK] JIT memory access always uses native "fast" path
- [HACK] Trying some things with texture invalidation and views.
It works :)
Still a few hacks, messy things, slow things
More work in progress stuff (also move to memory project)
Quite a bit faster now.
- Unmapping GPU VA and CPU VA will now correctly update write tracking regions, and invalidate textures for the former.
- The Virtual range list is now non-overlapping like the physical one.
- Fixed some bugs where regions could leak.
- Introduced a weird bug that I still need to track down (consistent invalid buffer in MK8 ribbon road)
Move some stuff.
I think we'll eventually just put the dll and so for this in a nuget package.
Fix rebase.
[WIP] MultiRegionHandle variable size ranges
- Avoid reprotecting regions that change often (needs some tweaking)
- There's still a bug in buffers, somehow.
- Might want different api for minimum granularity
Fix rebase issue
Commit everything needed for software only tracking.
Remove native components.
Remove more native stuff.
Cleanup
Use a separate window for the background context, update opentk. (fixes linux)
Some experimental changes
Should get things working up to scratch - still need to try some things with flush/modification and res scale.
Include address with the region action.
Initial work to make range tracking work
Still a ton of bugs
Fix some issues with the new stuff.
* Fix texture flush instability
There's still some weird behaviour, but it's much improved without this. (textures with cpu modified data were flushing over it)
* Find the destination texture for Buffer->Texture full copy
Greatly improves performance for nvdec videos (with range tracking)
* Further improve texture tracking
* Disable Memory Tracking for view parents
This is a temporary approach to better match behaviour on master (where invalidations would be soaked up by views, rather than trigger twice)
The assumption is that when views are created to a texture, they will cover all of its data anyways. Of course, this can easily be improved in future.
* Introduce some tracking tests.
WIP
* Complete base tests.
* Add more tests for multiregion, fix existing test.
* Cleanup Part 1
* Remove unnecessary code from memory tracking
* Fix some inconsistencies with 3D texture rule.
* Add dispose tests.
* Use a background thread for the background context.
Rather than setting and unsetting a context as current, doing the work on a dedicated thread with signals seems to be a bit faster.
Also nerf the multithreading test a bit.
* Copy to texture with matching alignment
This extends the copy to work for some videos with unusual size, such as tutorial videos in SMO. It will only occur if the destination texture already exists at XCount size.
* Track reads for buffer copies. Synchronize new buffers before copying overlaps.
* Remove old texture flushing mechanisms.
Range tracking all the way, baby.
* Wake the background thread when disposing.
Avoids a deadlock when games are closed.
* Address Feedback 1
* Separate TextureCopy instance for background thread
Also `BackgroundContextWorker.InBackground` for a more sensible idenfifier for if we're in a background thread.
* Add missing XML docs.
* Address Feedback
* Maybe I should start drinking coffee.
* Some more feedback.
* Remove flush warning, Refocus window after making background context
2020-10-16 22:18:35 +02:00
|
|
|
int addressMatches = _textures.FindOverlaps(address, ref _textureOverlaps);
|
|
|
|
|
|
|
|
for (int i = 0; i < addressMatches; i++)
|
2020-03-20 04:17:11 +01:00
|
|
|
{
|
Memory Read/Write Tracking using Region Handles (#1272)
* WIP Range Tracking
- Texture invalidation seems to have large problems
- Buffer/Pool invalidation may have problems
- Mirror memory tracking puts an additional `add` in compiled code, we likely just want to make HLE access slower if this is the final solution.
- Native project is in the messiest possible location.
- [HACK] JIT memory access always uses native "fast" path
- [HACK] Trying some things with texture invalidation and views.
It works :)
Still a few hacks, messy things, slow things
More work in progress stuff (also move to memory project)
Quite a bit faster now.
- Unmapping GPU VA and CPU VA will now correctly update write tracking regions, and invalidate textures for the former.
- The Virtual range list is now non-overlapping like the physical one.
- Fixed some bugs where regions could leak.
- Introduced a weird bug that I still need to track down (consistent invalid buffer in MK8 ribbon road)
Move some stuff.
I think we'll eventually just put the dll and so for this in a nuget package.
Fix rebase.
[WIP] MultiRegionHandle variable size ranges
- Avoid reprotecting regions that change often (needs some tweaking)
- There's still a bug in buffers, somehow.
- Might want different api for minimum granularity
Fix rebase issue
Commit everything needed for software only tracking.
Remove native components.
Remove more native stuff.
Cleanup
Use a separate window for the background context, update opentk. (fixes linux)
Some experimental changes
Should get things working up to scratch - still need to try some things with flush/modification and res scale.
Include address with the region action.
Initial work to make range tracking work
Still a ton of bugs
Fix some issues with the new stuff.
* Fix texture flush instability
There's still some weird behaviour, but it's much improved without this. (textures with cpu modified data were flushing over it)
* Find the destination texture for Buffer->Texture full copy
Greatly improves performance for nvdec videos (with range tracking)
* Further improve texture tracking
* Disable Memory Tracking for view parents
This is a temporary approach to better match behaviour on master (where invalidations would be soaked up by views, rather than trigger twice)
The assumption is that when views are created to a texture, they will cover all of its data anyways. Of course, this can easily be improved in future.
* Introduce some tracking tests.
WIP
* Complete base tests.
* Add more tests for multiregion, fix existing test.
* Cleanup Part 1
* Remove unnecessary code from memory tracking
* Fix some inconsistencies with 3D texture rule.
* Add dispose tests.
* Use a background thread for the background context.
Rather than setting and unsetting a context as current, doing the work on a dedicated thread with signals seems to be a bit faster.
Also nerf the multithreading test a bit.
* Copy to texture with matching alignment
This extends the copy to work for some videos with unusual size, such as tutorial videos in SMO. It will only occur if the destination texture already exists at XCount size.
* Track reads for buffer copies. Synchronize new buffers before copying overlaps.
* Remove old texture flushing mechanisms.
Range tracking all the way, baby.
* Wake the background thread when disposing.
Avoids a deadlock when games are closed.
* Address Feedback 1
* Separate TextureCopy instance for background thread
Also `BackgroundContextWorker.InBackground` for a more sensible idenfifier for if we're in a background thread.
* Add missing XML docs.
* Address Feedback
* Maybe I should start drinking coffee.
* Some more feedback.
* Remove flush warning, Refocus window after making background context
2020-10-16 22:18:35 +02:00
|
|
|
Texture texture = _textureOverlaps[i];
|
|
|
|
FormatInfo format = texture.Info.FormatInfo;
|
|
|
|
|
|
|
|
if (texture.Info.DepthOrLayers > 1)
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool match;
|
|
|
|
|
|
|
|
if (linear)
|
|
|
|
{
|
|
|
|
// Size is not available for linear textures. Use the stride and end of the copy region instead.
|
|
|
|
|
|
|
|
match = texture.Info.IsLinear && texture.Info.Stride == cbp.DstStride && tex.RegionY + cbp.YCount <= texture.Info.Height;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2020-10-29 22:57:34 +01:00
|
|
|
// Bpp may be a mismatch between the target texture and the param.
|
Memory Read/Write Tracking using Region Handles (#1272)
* WIP Range Tracking
- Texture invalidation seems to have large problems
- Buffer/Pool invalidation may have problems
- Mirror memory tracking puts an additional `add` in compiled code, we likely just want to make HLE access slower if this is the final solution.
- Native project is in the messiest possible location.
- [HACK] JIT memory access always uses native "fast" path
- [HACK] Trying some things with texture invalidation and views.
It works :)
Still a few hacks, messy things, slow things
More work in progress stuff (also move to memory project)
Quite a bit faster now.
- Unmapping GPU VA and CPU VA will now correctly update write tracking regions, and invalidate textures for the former.
- The Virtual range list is now non-overlapping like the physical one.
- Fixed some bugs where regions could leak.
- Introduced a weird bug that I still need to track down (consistent invalid buffer in MK8 ribbon road)
Move some stuff.
I think we'll eventually just put the dll and so for this in a nuget package.
Fix rebase.
[WIP] MultiRegionHandle variable size ranges
- Avoid reprotecting regions that change often (needs some tweaking)
- There's still a bug in buffers, somehow.
- Might want different api for minimum granularity
Fix rebase issue
Commit everything needed for software only tracking.
Remove native components.
Remove more native stuff.
Cleanup
Use a separate window for the background context, update opentk. (fixes linux)
Some experimental changes
Should get things working up to scratch - still need to try some things with flush/modification and res scale.
Include address with the region action.
Initial work to make range tracking work
Still a ton of bugs
Fix some issues with the new stuff.
* Fix texture flush instability
There's still some weird behaviour, but it's much improved without this. (textures with cpu modified data were flushing over it)
* Find the destination texture for Buffer->Texture full copy
Greatly improves performance for nvdec videos (with range tracking)
* Further improve texture tracking
* Disable Memory Tracking for view parents
This is a temporary approach to better match behaviour on master (where invalidations would be soaked up by views, rather than trigger twice)
The assumption is that when views are created to a texture, they will cover all of its data anyways. Of course, this can easily be improved in future.
* Introduce some tracking tests.
WIP
* Complete base tests.
* Add more tests for multiregion, fix existing test.
* Cleanup Part 1
* Remove unnecessary code from memory tracking
* Fix some inconsistencies with 3D texture rule.
* Add dispose tests.
* Use a background thread for the background context.
Rather than setting and unsetting a context as current, doing the work on a dedicated thread with signals seems to be a bit faster.
Also nerf the multithreading test a bit.
* Copy to texture with matching alignment
This extends the copy to work for some videos with unusual size, such as tutorial videos in SMO. It will only occur if the destination texture already exists at XCount size.
* Track reads for buffer copies. Synchronize new buffers before copying overlaps.
* Remove old texture flushing mechanisms.
Range tracking all the way, baby.
* Wake the background thread when disposing.
Avoids a deadlock when games are closed.
* Address Feedback 1
* Separate TextureCopy instance for background thread
Also `BackgroundContextWorker.InBackground` for a more sensible idenfifier for if we're in a background thread.
* Add missing XML docs.
* Address Feedback
* Maybe I should start drinking coffee.
* Some more feedback.
* Remove flush warning, Refocus window after making background context
2020-10-16 22:18:35 +02:00
|
|
|
// Due to the way linear strided and block layouts work, widths can be multiplied by Bpp for comparison.
|
|
|
|
// Note: tex.Width is the aligned texture size. Prefer param.XCount, as the destination should be a texture with that exact size.
|
|
|
|
|
|
|
|
bool sizeMatch = cbp.XCount * bpp == texture.Info.Width * format.BytesPerPixel && tex.Height == texture.Info.Height;
|
|
|
|
bool formatMatch = !texture.Info.IsLinear &&
|
|
|
|
texture.Info.GobBlocksInY == tex.MemoryLayout.UnpackGobBlocksInY() &&
|
|
|
|
texture.Info.GobBlocksInZ == tex.MemoryLayout.UnpackGobBlocksInZ();
|
|
|
|
|
|
|
|
match = sizeMatch && formatMatch;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (match)
|
|
|
|
{
|
|
|
|
return texture;
|
|
|
|
}
|
2020-03-20 04:17:11 +01:00
|
|
|
}
|
Memory Read/Write Tracking using Region Handles (#1272)
* WIP Range Tracking
- Texture invalidation seems to have large problems
- Buffer/Pool invalidation may have problems
- Mirror memory tracking puts an additional `add` in compiled code, we likely just want to make HLE access slower if this is the final solution.
- Native project is in the messiest possible location.
- [HACK] JIT memory access always uses native "fast" path
- [HACK] Trying some things with texture invalidation and views.
It works :)
Still a few hacks, messy things, slow things
More work in progress stuff (also move to memory project)
Quite a bit faster now.
- Unmapping GPU VA and CPU VA will now correctly update write tracking regions, and invalidate textures for the former.
- The Virtual range list is now non-overlapping like the physical one.
- Fixed some bugs where regions could leak.
- Introduced a weird bug that I still need to track down (consistent invalid buffer in MK8 ribbon road)
Move some stuff.
I think we'll eventually just put the dll and so for this in a nuget package.
Fix rebase.
[WIP] MultiRegionHandle variable size ranges
- Avoid reprotecting regions that change often (needs some tweaking)
- There's still a bug in buffers, somehow.
- Might want different api for minimum granularity
Fix rebase issue
Commit everything needed for software only tracking.
Remove native components.
Remove more native stuff.
Cleanup
Use a separate window for the background context, update opentk. (fixes linux)
Some experimental changes
Should get things working up to scratch - still need to try some things with flush/modification and res scale.
Include address with the region action.
Initial work to make range tracking work
Still a ton of bugs
Fix some issues with the new stuff.
* Fix texture flush instability
There's still some weird behaviour, but it's much improved without this. (textures with cpu modified data were flushing over it)
* Find the destination texture for Buffer->Texture full copy
Greatly improves performance for nvdec videos (with range tracking)
* Further improve texture tracking
* Disable Memory Tracking for view parents
This is a temporary approach to better match behaviour on master (where invalidations would be soaked up by views, rather than trigger twice)
The assumption is that when views are created to a texture, they will cover all of its data anyways. Of course, this can easily be improved in future.
* Introduce some tracking tests.
WIP
* Complete base tests.
* Add more tests for multiregion, fix existing test.
* Cleanup Part 1
* Remove unnecessary code from memory tracking
* Fix some inconsistencies with 3D texture rule.
* Add dispose tests.
* Use a background thread for the background context.
Rather than setting and unsetting a context as current, doing the work on a dedicated thread with signals seems to be a bit faster.
Also nerf the multithreading test a bit.
* Copy to texture with matching alignment
This extends the copy to work for some videos with unusual size, such as tutorial videos in SMO. It will only occur if the destination texture already exists at XCount size.
* Track reads for buffer copies. Synchronize new buffers before copying overlaps.
* Remove old texture flushing mechanisms.
Range tracking all the way, baby.
* Wake the background thread when disposing.
Avoids a deadlock when games are closed.
* Address Feedback 1
* Separate TextureCopy instance for background thread
Also `BackgroundContextWorker.InBackground` for a more sensible idenfifier for if we're in a background thread.
* Add missing XML docs.
* Address Feedback
* Maybe I should start drinking coffee.
* Some more feedback.
* Remove flush warning, Refocus window after making background context
2020-10-16 22:18:35 +02:00
|
|
|
|
|
|
|
return null;
|
2020-02-06 22:49:26 +01:00
|
|
|
}
|
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Resizes the temporary buffer used for range list intersection results, if it has grown too much.
|
|
|
|
/// </summary>
|
2019-11-25 01:29:37 +01:00
|
|
|
private void ShrinkOverlapsBufferIfNeeded()
|
|
|
|
{
|
|
|
|
if (_textureOverlaps.Length > OverlapsBufferMaxCapacity)
|
|
|
|
{
|
|
|
|
Array.Resize(ref _textureOverlaps, OverlapsBufferMaxCapacity);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Adjusts the size of the texture information for a given mipmap level,
|
|
|
|
/// based on the size of a parent texture.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="parent">The parent texture</param>
|
|
|
|
/// <param name="info">The texture information to be adjusted</param>
|
|
|
|
/// <param name="firstLevel">The first level of the texture view</param>
|
|
|
|
/// <returns>The adjusted texture information with the new size</returns>
|
2019-10-13 08:02:07 +02:00
|
|
|
private static TextureInfo AdjustSizes(Texture parent, TextureInfo info, int firstLevel)
|
|
|
|
{
|
|
|
|
// When the texture is used as view of another texture, we must
|
|
|
|
// ensure that the sizes are valid, otherwise data uploads would fail
|
|
|
|
// (and the size wouldn't match the real size used on the host API).
|
|
|
|
// Given a parent texture from where the view is created, we have the
|
|
|
|
// following rules:
|
|
|
|
// - The view size must be equal to the parent size, divided by (2 ^ l),
|
|
|
|
// where l is the first mipmap level of the view. The division result must
|
|
|
|
// be rounded down, and the result must be clamped to 1.
|
|
|
|
// - If the parent format is compressed, and the view format isn't, the
|
|
|
|
// view size is calculated as above, but the width and height of the
|
|
|
|
// view must be also divided by the compressed format block width and height.
|
|
|
|
// - If the parent format is not compressed, and the view is, the view
|
|
|
|
// size is calculated as described on the first point, but the width and height
|
|
|
|
// of the view must be also multiplied by the block width and height.
|
|
|
|
int width = Math.Max(1, parent.Info.Width >> firstLevel);
|
|
|
|
int height = Math.Max(1, parent.Info.Height >> firstLevel);
|
|
|
|
|
|
|
|
if (parent.Info.FormatInfo.IsCompressed && !info.FormatInfo.IsCompressed)
|
|
|
|
{
|
|
|
|
width = BitUtils.DivRoundUp(width, parent.Info.FormatInfo.BlockWidth);
|
|
|
|
height = BitUtils.DivRoundUp(height, parent.Info.FormatInfo.BlockHeight);
|
|
|
|
}
|
|
|
|
else if (!parent.Info.FormatInfo.IsCompressed && info.FormatInfo.IsCompressed)
|
|
|
|
{
|
|
|
|
width *= info.FormatInfo.BlockWidth;
|
|
|
|
height *= info.FormatInfo.BlockHeight;
|
|
|
|
}
|
|
|
|
|
|
|
|
int depthOrLayers;
|
|
|
|
|
|
|
|
if (info.Target == Target.Texture3D)
|
|
|
|
{
|
|
|
|
depthOrLayers = Math.Max(1, parent.Info.DepthOrLayers >> firstLevel);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
depthOrLayers = info.DepthOrLayers;
|
|
|
|
}
|
|
|
|
|
|
|
|
return new TextureInfo(
|
2021-01-17 19:44:34 +01:00
|
|
|
info.GpuAddress,
|
2019-10-13 08:02:07 +02:00
|
|
|
width,
|
|
|
|
height,
|
|
|
|
depthOrLayers,
|
|
|
|
info.Levels,
|
|
|
|
info.SamplesInX,
|
|
|
|
info.SamplesInY,
|
|
|
|
info.Stride,
|
|
|
|
info.IsLinear,
|
|
|
|
info.GobBlocksInY,
|
|
|
|
info.GobBlocksInZ,
|
|
|
|
info.GobBlocksInTileX,
|
|
|
|
info.Target,
|
|
|
|
info.FormatInfo,
|
|
|
|
info.DepthStencilMode,
|
|
|
|
info.SwizzleR,
|
|
|
|
info.SwizzleG,
|
|
|
|
info.SwizzleB,
|
|
|
|
info.SwizzleA);
|
|
|
|
}
|
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// Gets a texture creation information from texture information.
|
|
|
|
/// This can be used to create new host textures.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="info">Texture information</param>
|
|
|
|
/// <param name="caps">GPU capabilities</param>
|
2020-10-29 22:57:34 +01:00
|
|
|
/// <param name="scale">Texture scale factor, to be applied to the texture size</param>
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <returns>The texture creation information</returns>
|
2020-10-29 22:57:34 +01:00
|
|
|
public static TextureCreateInfo GetCreateInfo(TextureInfo info, Capabilities caps, float scale)
|
2019-10-13 08:02:07 +02:00
|
|
|
{
|
2020-11-01 19:32:53 +01:00
|
|
|
FormatInfo formatInfo = TextureCompatibility.ToHostCompatibleFormat(info, caps);
|
2019-10-13 08:02:07 +02:00
|
|
|
|
2020-05-27 16:07:10 +02:00
|
|
|
if (info.Target == Target.TextureBuffer)
|
|
|
|
{
|
|
|
|
// We assume that the host does not support signed normalized format
|
|
|
|
// (as is the case with OpenGL), so we just use a unsigned format.
|
|
|
|
// The shader will need the appropriate conversion code to compensate.
|
|
|
|
switch (formatInfo.Format)
|
|
|
|
{
|
2020-11-01 19:32:53 +01:00
|
|
|
case Format.R8Snorm:
|
|
|
|
formatInfo = new FormatInfo(Format.R8Sint, 1, 1, 1, 1);
|
|
|
|
break;
|
|
|
|
case Format.R16Snorm:
|
|
|
|
formatInfo = new FormatInfo(Format.R16Sint, 1, 1, 2, 1);
|
|
|
|
break;
|
|
|
|
case Format.R8G8Snorm:
|
|
|
|
formatInfo = new FormatInfo(Format.R8G8Sint, 1, 1, 2, 2);
|
|
|
|
break;
|
|
|
|
case Format.R16G16Snorm:
|
|
|
|
formatInfo = new FormatInfo(Format.R16G16Sint, 1, 1, 4, 2);
|
|
|
|
break;
|
|
|
|
case Format.R8G8B8A8Snorm:
|
|
|
|
formatInfo = new FormatInfo(Format.R8G8B8A8Sint, 1, 1, 4, 4);
|
|
|
|
break;
|
|
|
|
case Format.R16G16B16A16Snorm:
|
|
|
|
formatInfo = new FormatInfo(Format.R16G16B16A16Sint, 1, 1, 8, 4);
|
|
|
|
break;
|
2020-05-27 16:07:10 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-10-13 08:02:07 +02:00
|
|
|
int width = info.Width / info.SamplesInX;
|
|
|
|
int height = info.Height / info.SamplesInY;
|
|
|
|
|
|
|
|
int depth = info.GetDepth() * info.GetLayers();
|
|
|
|
|
2020-10-29 22:57:34 +01:00
|
|
|
if (scale != 1f)
|
|
|
|
{
|
|
|
|
width = (int)MathF.Ceiling(width * scale);
|
|
|
|
height = (int)MathF.Ceiling(height * scale);
|
|
|
|
}
|
|
|
|
|
2019-10-13 08:02:07 +02:00
|
|
|
return new TextureCreateInfo(
|
|
|
|
width,
|
|
|
|
height,
|
|
|
|
depth,
|
|
|
|
info.Levels,
|
|
|
|
info.Samples,
|
|
|
|
formatInfo.BlockWidth,
|
|
|
|
formatInfo.BlockHeight,
|
|
|
|
formatInfo.BytesPerPixel,
|
|
|
|
formatInfo.Format,
|
|
|
|
info.DepthStencilMode,
|
|
|
|
info.Target,
|
|
|
|
info.SwizzleR,
|
|
|
|
info.SwizzleG,
|
|
|
|
info.SwizzleB,
|
|
|
|
info.SwizzleA);
|
|
|
|
}
|
|
|
|
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <summary>
|
|
|
|
/// Removes a texture from the cache.
|
2020-01-01 16:39:09 +01:00
|
|
|
/// </summary>
|
|
|
|
/// <remarks>
|
2019-12-30 00:26:37 +01:00
|
|
|
/// This only removes the texture from the internal list, not from the auto-deletion cache.
|
|
|
|
/// It may still have live references after the removal.
|
2020-01-01 16:39:09 +01:00
|
|
|
/// </remarks>
|
2019-12-30 00:26:37 +01:00
|
|
|
/// <param name="texture">The texture to be removed</param>
|
2019-10-13 08:02:07 +02:00
|
|
|
public void RemoveTextureFromCache(Texture texture)
|
|
|
|
{
|
2020-09-10 21:44:04 +02:00
|
|
|
lock (_textures)
|
|
|
|
{
|
|
|
|
_textures.Remove(texture);
|
|
|
|
}
|
2019-10-13 08:02:07 +02:00
|
|
|
}
|
2019-12-31 23:09:49 +01:00
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
/// Disposes all textures in the cache.
|
|
|
|
/// It's an error to use the texture manager after disposal.
|
|
|
|
/// </summary>
|
|
|
|
public void Dispose()
|
|
|
|
{
|
2020-09-10 21:44:04 +02:00
|
|
|
lock (_textures)
|
2019-12-31 23:09:49 +01:00
|
|
|
{
|
2020-09-10 21:44:04 +02:00
|
|
|
foreach (Texture texture in _textures)
|
|
|
|
{
|
|
|
|
texture.Dispose();
|
|
|
|
}
|
2019-12-31 23:09:49 +01:00
|
|
|
}
|
|
|
|
}
|
2019-10-13 08:02:07 +02:00
|
|
|
}
|
2021-05-19 20:05:43 +02:00
|
|
|
}
|