mirror of
https://github.com/ryujinx-mirror/ryujinx.git
synced 2024-10-20 08:01:40 +00:00
36749c358d
* Rewrite SurfaceFlinger Reimplement accurately SurfaceFlinger (based on my 8.1.0 reversing of it) TODO: support swap interval properly and reintroduce disabled "game vsync" support. * Some fixes for SetBufferCount * uncomment a test from last commit * SurfaceFlinger: don't free the graphic buffer in SetBufferCount * SurfaceFlinger: Implement swap interval correctly * SurfaceFlinger: Reintegrate Game VSync toggle * SurfaceFlinger: do not push a fence on buffer release on the consumer side * Revert "SurfaceFlinger: do not push a fence on buffer release on the consumer side" This reverts commit 586b52b0bfab2d11f361f4b59ab7b7141020bbad. * Make the game vsync toggle work dynamically again * Unregister producer's Binder object when closing layer * Address ripinperi's comments * Add a timeout on syncpoint wait operation Syncpoint aren't supposed to be waited on for more than a second. This effectively workaround issues caused by not having a channel scheduling in place yet. PS: Also introduce Android WaitForever warning about fence being not signaled for 3s * Fix a print of previous commit * Address Ac_K's comments * Address gdkchan's comments * Address final comments
75 lines
No EOL
2.2 KiB
C#
75 lines
No EOL
2.2 KiB
C#
using Ryujinx.HLE.HOS.Kernel.Process;
|
|
using Ryujinx.HLE.HOS.Services.Nv.NvDrvServices.NvMap;
|
|
using System;
|
|
using System.Runtime.CompilerServices;
|
|
using System.Runtime.InteropServices;
|
|
|
|
namespace Ryujinx.HLE.HOS.Services.SurfaceFlinger
|
|
{
|
|
[StructLayout(LayoutKind.Sequential, Pack = 1)]
|
|
struct GraphicBuffer : IFlattenable
|
|
{
|
|
public GraphicBufferHeader Header;
|
|
public NvGraphicBuffer Buffer;
|
|
|
|
public int Width => Header.Width;
|
|
public int Height => Header.Height;
|
|
public PixelFormat Format => Header.Format;
|
|
public int Usage => Header.Usage;
|
|
|
|
public Rect ToRect()
|
|
{
|
|
return new Rect(Width, Height);
|
|
}
|
|
|
|
public void Flatten(Parcel parcel)
|
|
{
|
|
parcel.WriteUnmanagedType(ref Header);
|
|
parcel.WriteUnmanagedType(ref Buffer);
|
|
}
|
|
|
|
public void Unflatten(Parcel parcel)
|
|
{
|
|
Header = parcel.ReadUnmanagedType<GraphicBufferHeader>();
|
|
|
|
int expectedSize = Unsafe.SizeOf<NvGraphicBuffer>() / 4;
|
|
|
|
if (Header.IntsCount != expectedSize)
|
|
{
|
|
throw new NotImplementedException($"Unexpected Graphic Buffer ints count (expected 0x{expectedSize:x}, found 0x{Header.IntsCount:x})");
|
|
}
|
|
|
|
Buffer = parcel.ReadUnmanagedType<NvGraphicBuffer>();
|
|
}
|
|
|
|
public void IncrementNvMapHandleRefCount(KProcess process)
|
|
{
|
|
NvMapDeviceFile.IncrementMapRefCount(process, Buffer.NvMapId);
|
|
|
|
for (int i = 0; i < Buffer.Surfaces.Length; i++)
|
|
{
|
|
NvMapDeviceFile.IncrementMapRefCount(process, Buffer.Surfaces[i].NvMapHandle);
|
|
}
|
|
}
|
|
|
|
public void DecrementNvMapHandleRefCount(KProcess process)
|
|
{
|
|
NvMapDeviceFile.DecrementMapRefCount(process, Buffer.NvMapId);
|
|
|
|
for (int i = 0; i < Buffer.Surfaces.Length; i++)
|
|
{
|
|
NvMapDeviceFile.DecrementMapRefCount(process, Buffer.Surfaces[i].NvMapHandle);
|
|
}
|
|
}
|
|
|
|
public uint GetFlattenedSize()
|
|
{
|
|
return (uint)Unsafe.SizeOf<GraphicBuffer>();
|
|
}
|
|
|
|
public uint GetFdCount()
|
|
{
|
|
return 0;
|
|
}
|
|
}
|
|
} |