ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove pixels array from `DisplaySurface`; faster clearing

This commit is contained in:
kalimag 2023-01-07 05:35:38 +01:00 committed by James Groom
parent bc823f4795
commit abee97b449
1 changed files with 8 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
src/BizHawk.Client.Common/DisplayManager/DisplaySurface.cs
View File

@ -1,101 +1,36 @@
using System;
using System.Drawing;
using System.Drawing.Imaging;
using System.Runtime.InteropServices;
using BizHawk.Common;
namespace BizHawk.Client.Common
{
/// <summary>
/// This is a wrapper for a Bitmap, basically, which can also be a int[].
/// This is a wrapper for a Bitmap.
/// It should be phased out, in favor of BitmapBuffer and Texture2d's
/// </summary>
public unsafe class DisplaySurface : IDisplaySurface
{
private const PixelFormat Format = PixelFormat.Format32bppArgb;
private Bitmap _bmp;
private BitmapData _bmpData;
private readonly int[] _pixels;
public void Clear()
{
FromBitmap(false);
Util.Memset(PixelPtr, 0, Stride * Height);
var bmpData = _bmp.LockBits(new(0, 0, Width, Height), ImageLockMode.WriteOnly, Format);
new Span<byte>((void*)bmpData.Scan0, bmpData.Stride * bmpData.Height).Clear();
_bmp.UnlockBits(bmpData);
}
public Bitmap PeekBitmap()
{
ToBitmap();
return _bmp;
}
public Graphics GetGraphics()
{
ToBitmap();
return Graphics.FromImage(_bmp);
}
public void ToBitmap(bool copy = true)
{
if (_isBitmap) return;
_isBitmap = true;
if (_bmp == null)
{
_bmp = new Bitmap(Width, Height, PixelFormat.Format32bppArgb);
}
if (copy)
{
_bmpData = _bmp.LockBits(new Rectangle(0, 0, Width, Height), ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb);
int w = Width;
int h = Height;
int stride = _bmpData.Stride / 4;
int* bmpBuf = (int*)_bmpData.Scan0.ToPointer();
for (int y = 0, i = 0; y < h; y++)
{
for (int x = 0; x < w; x++)
{
bmpBuf[y * stride + x] = _pixels[i++];
}
}
_bmp.UnlockBits(_bmpData);
}
}
private bool _isBitmap;
public void FromBitmap(bool copy = true)
{
if (!_isBitmap)
{
return;
}
_isBitmap = false;
if (copy)
{
_bmpData = _bmp.LockBits(new Rectangle(0, 0, Width, Height), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
int w = Width;
int h = Height;
int stride = _bmpData.Stride / 4;
int* bmpBuf = (int*)_bmpData.Scan0.ToPointer();
for (int y = 0, i = 0; y < h; y++)
{
for (int x = 0; x < w; x++)
{
_pixels[i++] = bmpBuf[y * stride + x];
}
}
_bmp.UnlockBits(_bmpData);
}
}
public DisplaySurface(int width, int height)
{
// can't create a bitmap with zero dimensions, so for now, just bump it up to one
@ -112,28 +47,7 @@ namespace BizHawk.Client.Common
Width = width;
Height = height;
_pixels = new int[width * height];
LockPixels();
}
public int* PixelPtr => (int*)_ptr;
public int Stride => Width * 4;
private void* _ptr;
private GCHandle _handle;
private void LockPixels()
{
UnlockPixels();
_handle = GCHandle.Alloc(_pixels, GCHandleType.Pinned);
_ptr = _handle.AddrOfPinnedObject().ToPointer();
}
private void UnlockPixels()
{
if (_handle.IsAllocated)
{
_handle.Free();
}
_bmp = new Bitmap(Width, Height, Format);
}
public int Width { get; }
@ -143,7 +57,6 @@ namespace BizHawk.Client.Common
{
_bmp?.Dispose();
_bmp = null;
UnlockPixels();
}
}