2020-04-25 15:02:18 +02:00
|
|
|
|
using OpenTK.Graphics.OpenGL;
|
|
|
|
|
using Ryujinx.Graphics.GAL;
|
|
|
|
|
using System;
|
|
|
|
|
|
2020-05-23 11:46:09 +02:00
|
|
|
|
namespace Ryujinx.Graphics.OpenGL.Image
|
2020-04-25 15:02:18 +02:00
|
|
|
|
{
|
|
|
|
|
class TextureBuffer : TextureBase, ITexture
|
|
|
|
|
{
|
2021-03-08 22:43:39 +01:00
|
|
|
|
private Renderer _renderer;
|
2020-04-25 15:02:18 +02:00
|
|
|
|
private int _bufferOffset;
|
|
|
|
|
private int _bufferSize;
|
2021-03-08 22:43:39 +01:00
|
|
|
|
private int _bufferCount;
|
2020-04-25 15:02:18 +02:00
|
|
|
|
|
2020-05-23 11:46:09 +02:00
|
|
|
|
private BufferHandle _buffer;
|
2020-04-25 15:02:18 +02:00
|
|
|
|
|
2021-03-08 22:43:39 +01:00
|
|
|
|
public TextureBuffer(Renderer renderer, TextureCreateInfo info) : base(info)
|
|
|
|
|
{
|
|
|
|
|
_renderer = renderer;
|
|
|
|
|
}
|
2020-04-25 15:02:18 +02:00
|
|
|
|
|
|
|
|
|
public void CopyTo(ITexture destination, int firstLayer, int firstLevel)
|
|
|
|
|
{
|
|
|
|
|
throw new NotSupportedException();
|
|
|
|
|
}
|
|
|
|
|
|
2021-03-02 23:30:54 +01:00
|
|
|
|
public void CopyTo(ITexture destination, int srcLayer, int dstLayer, int srcLevel, int dstLevel)
|
|
|
|
|
{
|
|
|
|
|
throw new NotSupportedException();
|
|
|
|
|
}
|
|
|
|
|
|
2020-04-25 15:02:18 +02:00
|
|
|
|
public void CopyTo(ITexture destination, Extents2D srcRegion, Extents2D dstRegion, bool linearFilter)
|
|
|
|
|
{
|
|
|
|
|
throw new NotSupportedException();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public ITexture CreateView(TextureCreateInfo info, int firstLayer, int firstLevel)
|
|
|
|
|
{
|
|
|
|
|
throw new NotSupportedException();
|
|
|
|
|
}
|
|
|
|
|
|
Return mapped buffer pointer directly for flush, WriteableRegion for textures (#2494)
* Return mapped buffer pointer directly for flush, WriteableRegion for textures
A few changes here to generally improve performance, even for platforms not using the persistent buffer flush.
- Texture and buffer flush now return a ReadOnlySpan<byte>. It's guaranteed that this span is pinned in memory, but it will be overwritten on the next flush from that thread, so it is expected that the data is used before calling again.
- As a result, persistent mappings no longer copy to a new array - rather the persistent map is returned directly as a Span<>. A similar host array is used for the glGet flushes instead of allocating new arrays each time.
- Texture flushes now do their layout conversion into a WriteableRegion when the texture is not MultiRange, which allows the flush to happen directly into guest memory rather than into a temporary span, then copied over. This avoids another copy when doing layout conversion.
Overall, this saves 1 data copy for buffer flush, 1 copy for linear textures with matching source/target stride, and 2 copies for block textures or linear textures with mismatching strides.
* Fix tests
* Fix array pointer for Mesa/Intel path
* Address some feedback
* Update method for getting array pointer.
2021-07-20 00:10:54 +02:00
|
|
|
|
public ReadOnlySpan<byte> GetData()
|
2020-04-25 15:02:18 +02:00
|
|
|
|
{
|
Return mapped buffer pointer directly for flush, WriteableRegion for textures (#2494)
* Return mapped buffer pointer directly for flush, WriteableRegion for textures
A few changes here to generally improve performance, even for platforms not using the persistent buffer flush.
- Texture and buffer flush now return a ReadOnlySpan<byte>. It's guaranteed that this span is pinned in memory, but it will be overwritten on the next flush from that thread, so it is expected that the data is used before calling again.
- As a result, persistent mappings no longer copy to a new array - rather the persistent map is returned directly as a Span<>. A similar host array is used for the glGet flushes instead of allocating new arrays each time.
- Texture flushes now do their layout conversion into a WriteableRegion when the texture is not MultiRange, which allows the flush to happen directly into guest memory rather than into a temporary span, then copied over. This avoids another copy when doing layout conversion.
Overall, this saves 1 data copy for buffer flush, 1 copy for linear textures with matching source/target stride, and 2 copies for block textures or linear textures with mismatching strides.
* Fix tests
* Fix array pointer for Mesa/Intel path
* Address some feedback
* Update method for getting array pointer.
2021-07-20 00:10:54 +02:00
|
|
|
|
return Buffer.GetData(_renderer, _buffer, _bufferOffset, _bufferSize);
|
2020-04-25 15:02:18 +02:00
|
|
|
|
}
|
|
|
|
|
|
2022-01-09 17:28:48 +01:00
|
|
|
|
public ReadOnlySpan<byte> GetData(int layer, int level)
|
|
|
|
|
{
|
|
|
|
|
return GetData();
|
|
|
|
|
}
|
|
|
|
|
|
2020-04-25 15:02:18 +02:00
|
|
|
|
public void SetData(ReadOnlySpan<byte> data)
|
|
|
|
|
{
|
2020-05-23 11:46:09 +02:00
|
|
|
|
Buffer.SetData(_buffer, _bufferOffset, data.Slice(0, Math.Min(data.Length, _bufferSize)));
|
2020-04-25 15:02:18 +02:00
|
|
|
|
}
|
|
|
|
|
|
2021-03-02 23:30:54 +01:00
|
|
|
|
public void SetData(ReadOnlySpan<byte> data, int layer, int level)
|
|
|
|
|
{
|
|
|
|
|
throw new NotSupportedException();
|
|
|
|
|
}
|
|
|
|
|
|
2020-04-25 15:02:18 +02:00
|
|
|
|
public void SetStorage(BufferRange buffer)
|
|
|
|
|
{
|
2021-03-08 22:43:39 +01:00
|
|
|
|
if (_buffer != BufferHandle.Null &&
|
2021-12-19 15:50:44 +01:00
|
|
|
|
_buffer == buffer.Handle &&
|
2020-04-25 15:02:18 +02:00
|
|
|
|
buffer.Offset == _bufferOffset &&
|
2021-03-08 22:43:39 +01:00
|
|
|
|
buffer.Size == _bufferSize &&
|
|
|
|
|
_renderer.BufferCount == _bufferCount)
|
2020-04-25 15:02:18 +02:00
|
|
|
|
{
|
2021-03-08 22:43:39 +01:00
|
|
|
|
// Only rebind the buffer when more have been created.
|
2020-04-25 15:02:18 +02:00
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2020-05-23 11:46:09 +02:00
|
|
|
|
_buffer = buffer.Handle;
|
2020-04-25 15:02:18 +02:00
|
|
|
|
_bufferOffset = buffer.Offset;
|
|
|
|
|
_bufferSize = buffer.Size;
|
2021-03-08 22:43:39 +01:00
|
|
|
|
_bufferCount = _renderer.BufferCount;
|
2020-04-25 15:02:18 +02:00
|
|
|
|
|
|
|
|
|
Bind(0);
|
|
|
|
|
|
|
|
|
|
SizedInternalFormat format = (SizedInternalFormat)FormatTable.GetFormatInfo(Info.Format).PixelInternalFormat;
|
|
|
|
|
|
2020-05-23 11:46:09 +02:00
|
|
|
|
GL.TexBufferRange(TextureBufferTarget.TextureBuffer, format, _buffer.ToInt32(), (IntPtr)buffer.Offset, buffer.Size);
|
2020-04-25 15:02:18 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void Dispose()
|
|
|
|
|
{
|
|
|
|
|
if (Handle != 0)
|
|
|
|
|
{
|
|
|
|
|
GL.DeleteTexture(Handle);
|
|
|
|
|
|
|
|
|
|
Handle = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
2020-09-10 21:44:04 +02:00
|
|
|
|
|
|
|
|
|
public void Release()
|
|
|
|
|
{
|
|
|
|
|
Dispose();
|
|
|
|
|
}
|
2020-04-25 15:02:18 +02:00
|
|
|
|
}
|
|
|
|
|
}
|