Unify and improve texture updating (Do not create new references)

This commit is contained in:
Flamefire committed 2014-09-20 17:17:34 +02:00
1 parent 632b90a0e3
commit be67b039d6
9 files changed
+74 -97

No files matched your search

+2 -7
View File
@@ -165,14 +165,9 @@ namespace Vocaluxe.Base
return _Draw.EnqueueTexture(w, h, data); return _Draw.EnqueueTexture(w, h, data);
} }
public static bool UpdateTexture(CTextureRef texture, int w, int h, byte[] data) public static void UpdateTexture(CTextureRef texture, int w, int h, byte[] data)
{ {
return _Draw.UpdateTexture(texture, w, h, data); _Draw.UpdateTexture(texture, w, h, data);
}
public static bool UpdateOrAddTexture(ref CTextureRef texture, int w, int h, byte[] data)
{
return _Draw.UpdateOrAddTexture(ref texture, w, h, data);
} }
public static void RemoveTexture(ref CTextureRef texture) public static void RemoveTexture(ref CTextureRef texture)
-25
View File
@@ -601,31 +601,6 @@ namespace Vocaluxe.Lib.Draw
texture.D3DTexture.UnlockRectangle(0); texture.D3DTexture.UnlockRectangle(0);
} }
/// <summary>
/// Updates the data of a texture
/// </summary>
/// <param name="textureRef">The texture to update</param>
/// <param name="w"></param>
/// <param name="h"></param>
/// <param name="data">A byte array containing the new texture's data</param>
/// <returns>True if succeeded</returns>
public override bool UpdateTexture(CTextureRef textureRef, int w, int h, byte[] data)
{
CD3DTexture texture;
if (!_GetTexture(textureRef, out texture))
return false;
if (texture.DataSize.Width != w || texture.DataSize.Height != h)
{
if (texture.W2 > w || texture.H2 > h)
return false; // Texture memory to small
if (texture.W2 * 0.9 < w || texture.H2 * 0.9 < h)
return false; // Texture memory to big
texture.DataSize = new Size(w, h);
}
_WriteDataToTexture(texture, data);
return true;
}
#region drawing #region drawing
/// <summary> /// <summary>
/// Draws a texture /// Draws a texture
+53 -28
View File
@@ -173,7 +173,7 @@ namespace Vocaluxe.Lib.Draw
/// <param name="dataSize"></param> /// <param name="dataSize"></param>
/// <param name="data"></param> /// <param name="data"></param>
/// <returns></returns> /// <returns></returns>
protected TTextureType _CreateTexture(Size dataSize, byte[] data) private TTextureType _CreateAndFillTexture(Size dataSize, byte[] data)
{ {
TTextureType texture = _CreateTexture(dataSize); TTextureType texture = _CreateTexture(dataSize);
_WriteDataToTexture(texture, data); _WriteDataToTexture(texture, data);
@@ -187,7 +187,7 @@ namespace Vocaluxe.Lib.Draw
/// <param name="dataSize"></param> /// <param name="dataSize"></param>
/// <param name="data"></param> /// <param name="data"></param>
/// <returns></returns> /// <returns></returns>
protected TTextureType _CreateTexture(Size dataSize, IntPtr data) private TTextureType _CreateAndFillTexture(Size dataSize, IntPtr data)
{ {
TTextureType texture = _CreateTexture(dataSize); TTextureType texture = _CreateTexture(dataSize);
_WriteDataToTexture(texture, data); _WriteDataToTexture(texture, data);
@@ -326,7 +326,7 @@ namespace Vocaluxe.Lib.Draw
//Fill the new Bitmap with the texture data //Fill the new Bitmap with the texture data
BitmapData bmpData = bmp.LockBits(new Rectangle(0, 0, w, h), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb); BitmapData bmpData = bmp.LockBits(new Rectangle(0, 0, w, h), ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
texture = _CreateTexture(new Size(w, h), bmpData.Scan0); texture = _CreateAndFillTexture(new Size(w, h), bmpData.Scan0);
bmp.UnlockBits(bmpData); bmp.UnlockBits(bmpData);
} }
finally finally
@@ -341,7 +341,7 @@ namespace Vocaluxe.Lib.Draw
public CTextureRef AddTexture(int w, int h, byte[] data) public CTextureRef AddTexture(int w, int h, byte[] data)
{ {
TTextureType texture = _CreateTexture(new Size(w, h), data); TTextureType texture = _CreateAndFillTexture(new Size(w, h), data);
return _GetTextureReference(w, h, texture); return _GetTextureReference(w, h, texture);
} }
@@ -398,21 +398,37 @@ namespace Vocaluxe.Lib.Draw
/// <summary> /// <summary>
/// Updates the data of a texture /// Updates the data of a texture
/// </summary> /// </summary>
/// <param name="texture">The texture to update</param> /// <param name="textureRef">The texture to update</param>
/// <param name="w"></param> /// <param name="w"></param>
/// <param name="h"></param> /// <param name="h"></param>
/// <param name="data">A byte array containing the new texture's data</param> /// <param name="data">A byte array containing the new texture's data</param>
/// <returns>True if succeeded</returns> /// <returns>True if succeeded</returns>
public abstract bool UpdateTexture(CTextureRef texture, int w, int h, byte[] data); public void UpdateTexture(CTextureRef textureRef, int w, int h, byte[] data)
public bool UpdateOrAddTexture(ref CTextureRef texture, int w, int h, byte[] data)
{ {
if (!UpdateTexture(texture, w, h, data)) TTextureType texture;
if (_GetTexture(textureRef, out texture))
return;
bool reuseTexture = true;
if (texture.DataSize.Width != w || texture.DataSize.Height != h)
{ {
RemoveTexture(ref texture); if (texture.W2 > w || texture.H2 > h)
texture = AddTexture(w, h, data); reuseTexture = false; // Texture memory to small
else if (texture.W2 * 0.9 < w || texture.H2 * 0.9 < h)
reuseTexture = false; // Texture memory to big
else
texture.DataSize = new Size(w, h);
} }
return true; if (!reuseTexture)
{
_DisposeTexture(texture);
texture = _CreateAndFillTexture(new Size(w, h), data);
lock (_Textures)
{
_Textures[textureRef.ID] = texture;
}
}
else
_WriteDataToTexture(texture, data);
} }
protected bool _GetTexture(CTextureRef textureRef, out TTextureType texture) protected bool _GetTexture(CTextureRef textureRef, out TTextureType texture)
@@ -428,31 +444,40 @@ namespace Vocaluxe.Lib.Draw
} }
} }
/// <summary>
/// Decreases the RefCount of a texture and disposes it if necessary
/// </summary>
/// <param name="texture"></param>
private void _DisposeTexture(TTextureType texture)
{
if (texture != null && --texture.RefCount <= 0)
{
if (texture.TexturePath != null)
_TextureCache.Remove(texture.TexturePath);
texture.Dispose();
_TextureCount--;
}
}
/// <summary> /// <summary>
/// Removes a texture from the Vram /// Removes a texture from the Vram
/// </summary> /// </summary>
/// <param name="texture">The texture to be removed</param> /// <param name="textureRef">The texture to be removed</param>
public void RemoveTexture(ref CTextureRef texture) public void RemoveTexture(ref CTextureRef textureRef)
{ {
if (texture == null) if (textureRef == null)
return; return;
lock (_Textures) lock (_Textures)
{ {
TTextureType t; TTextureType t;
if (_Textures.TryGetValue(texture.ID, out t)) if (_Textures.TryGetValue(textureRef.ID, out t))
{ {
if (t != null && --t.RefCount <= 0) _DisposeTexture(t);
{ _Textures.Remove(textureRef.ID);
if (t.TexturePath != null)
_TextureCache.Remove(t.TexturePath);
t.Dispose();
_TextureCount--;
}
_Textures.Remove(texture.ID);
} }
texture.ID = -1; textureRef.ID = -1;
} }
texture = null; textureRef = null;
} }
private void _CheckQueue() private void _CheckQueue()
@@ -465,7 +490,7 @@ namespace Vocaluxe.Lib.Draw
if (!_Textures.ContainsKey(q.TextureID)) if (!_Textures.ContainsKey(q.TextureID))
continue; continue;
TTextureType texture = _CreateTexture(q.DataSize, q.Data); TTextureType texture = _CreateAndFillTexture(q.DataSize, q.Data);
texture.RefCount = 1; //Currently no more than 1 reference to queued textures is possible texture.RefCount = 1; //Currently no more than 1 reference to queued textures is possible
_Textures[q.TextureID] = texture; _Textures[q.TextureID] = texture;
} }
@@ -566,7 +591,7 @@ namespace Vocaluxe.Lib.Draw
} }
} }
protected void _ToggleFullScreen() private void _ToggleFullScreen()
{ {
if (!_Fullscreen) if (!_Fullscreen)
_EnterFullScreen(); _EnterFullScreen();
+2 -14
View File
@@ -343,7 +343,7 @@ namespace Vocaluxe.Lib.Draw
using (var bmp = new Bitmap(texturePath)) using (var bmp = new Bitmap(texturePath))
{ {
texture = AddTexture(bmp); texture = AddTexture(bmp);
_TextureCache.Add(texturePath,texture); _TextureCache.Add(texturePath, texture);
} }
return texture; return texture;
} }
@@ -382,7 +382,7 @@ namespace Vocaluxe.Lib.Draw
} }
} }
public bool UpdateTexture(CTextureRef texture, int w, int h, byte[] data) public void UpdateTexture(CTextureRef texture, int w, int h, byte[] data)
{ {
if (_TextureExists(texture)) if (_TextureExists(texture))
{ {
@@ -390,19 +390,7 @@ namespace Vocaluxe.Lib.Draw
ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb); ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
Marshal.Copy(data, 0, bmpData.Scan0, data.Length); Marshal.Copy(data, 0, bmpData.Scan0, data.Length);
_Bitmaps[texture.ID].UnlockBits(bmpData); _Bitmaps[texture.ID].UnlockBits(bmpData);
return true;
} }
return false;
}
public bool UpdateOrAddTexture(ref CTextureRef texture, int w, int h, byte[] data)
{
if (!UpdateTexture(texture, w, h, data))
{
RemoveTexture(ref texture);
texture = AddTexture(w, h, data);
}
return true;
} }
public void DrawTexture(CTextureRef texture) public void DrawTexture(CTextureRef texture)
-19
View File
@@ -434,25 +434,6 @@ namespace Vocaluxe.Lib.Draw
GL.BindTexture(TextureTarget.Texture2D, 0); GL.BindTexture(TextureTarget.Texture2D, 0);
} }
public override bool UpdateTexture(CTextureRef textureRef, int w, int h, byte[] data)
{
COGLTexture texture;
if (_GetTexture(textureRef, out texture))
return false;
if (texture.DataSize.Width != w || texture.DataSize.Height != h)
{
if (texture.W2 > w || texture.H2 > h)
return false; // Texture memory to small
if (texture.W2 * 0.9 < w || texture.H2 * 0.9 < h)
return false; // Texture memory to big
texture.DataSize = new Size(w, h);
}
_WriteDataToTexture(texture, data);
return true;
}
#region drawing #region drawing
public override void DrawTexture(CTextureRef textureRef, SRectF rect, SColorF color, bool mirrored = false) public override void DrawTexture(CTextureRef textureRef, SRectF rect, SColorF color, bool mirrored = false)
{ {
+1 -2
View File
@@ -41,8 +41,7 @@ namespace Vocaluxe.Lib.Draw
CTextureRef AddTexture(Bitmap bitmap); CTextureRef AddTexture(Bitmap bitmap);
CTextureRef AddTexture(int w, int h, byte[] data); CTextureRef AddTexture(int w, int h, byte[] data);
CTextureRef EnqueueTexture(int w, int h, byte[] data); CTextureRef EnqueueTexture(int w, int h, byte[] data);
bool UpdateTexture(CTextureRef texture, int w, int h, byte[] data); void UpdateTexture(CTextureRef texture, int w, int h, byte[] data);
bool UpdateOrAddTexture(ref CTextureRef texture, int w, int h, byte[] data);
void RemoveTexture(ref CTextureRef texture); void RemoveTexture(ref CTextureRef texture);
// Basic Draw Methods // Basic Draw Methods
@@ -206,7 +206,10 @@ namespace Vocaluxe.Lib.Video.Acinerella
CFramebuffer.CFrame curFrame = _FindFrame(time); CFramebuffer.CFrame curFrame = _FindFrame(time);
if (curFrame != null) if (curFrame != null)
{ {
CDraw.UpdateOrAddTexture(ref frame, _Width, _Height, curFrame.Data); if (frame == null)
frame = CDraw.AddTexture(_Width, _Height, curFrame.Data);
else
CDraw.UpdateTexture(frame, _Width, _Height, curFrame.Data);
if (!_Paused) if (!_Paused)
curFrame.SetRead(); curFrame.SetRead();
time = curFrame.Time; time = curFrame.Time;
+4 -1
View File
@@ -207,7 +207,10 @@ namespace Vocaluxe.Lib.Webcam
{ {
if (_Data != null && _Data.Length == _Width * _Height * 4 && _NewFrameAvailable) if (_Data != null && _Data.Length == _Width * _Height * 4 && _NewFrameAvailable)
{ {
CDraw.UpdateOrAddTexture(ref frame, _Width, _Height, _Data); if (frame == null)
frame = CDraw.AddTexture(_Width, _Height, _Data);
else
CDraw.UpdateTexture(frame, _Width, _Height, _Data);
_NewFrameAvailable = false; _NewFrameAvailable = false;
return true; return true;
} }
+8
View File
@@ -56,6 +56,14 @@ namespace VocaluxeLib.Draw
Rect = new SRectF(0f, 0f, origSize.Width, origSize.Height, 0f); Rect = new SRectF(0f, 0f, origSize.Width, origSize.Height, 0f);
} }
public void CopyFieldsFrom(CTextureRef other)
{
ID = other.ID;
OrigSize = other.OrigSize;
Rect = other.Rect;
Color = other.Color;
}
~CTextureRef() ~CTextureRef()
{ {
if (ID >= 0) if (ID >= 0)