Added alternative method to update a texture, for now we just stick with the old one

Changed lockflags to discard old data to improve performance
This commit is contained in:
Stephan Sundermann committed 2012-05-13 17:37:32 +02:00
1 parent c5b03c7073
commit e8103dd80e
1 file changed
+22 -5
+22 -5
View File
@@ -477,7 +477,7 @@ namespace Vocaluxe.Lib.Draw
_IndexBuffer = new IndexBuffer(_Device, 6 * sizeof(Int16), Usage.WriteOnly, Pool.Managed, true); _IndexBuffer = new IndexBuffer(_Device, 6 * sizeof(Int16), Usage.WriteOnly, Pool.Managed, true);
DataStream stream = _IndexBuffer.Lock(0, 0, LockFlags.None); DataStream stream = _IndexBuffer.Lock(0, 0, LockFlags.Discard);
stream.WriteRange(indices); stream.WriteRange(indices);
_IndexBuffer.Unlock(); _IndexBuffer.Unlock();
_Device.Indices = _IndexBuffer; _Device.Indices = _IndexBuffer;
@@ -944,7 +944,7 @@ namespace Vocaluxe.Lib.Draw
//because a copy of the texture is hold in the Ram //because a copy of the texture is hold in the Ram
Texture t = new Texture(_Device, (int)texture.w2, (int)texture.h2, 0, Usage.AutoGenerateMipMap, Format.A8R8G8B8, Pool.Managed); Texture t = new Texture(_Device, (int)texture.w2, (int)texture.h2, 0, Usage.AutoGenerateMipMap, Format.A8R8G8B8, Pool.Managed);
//Lock the texture and fill it with the data //Lock the texture and fill it with the data
DataRectangle rect = t.LockRectangle(0, LockFlags.None); DataRectangle rect = t.LockRectangle(0, LockFlags.Discard);
for (int i = 0; i < Data.Length; ) for (int i = 0; i < Data.Length; )
{ {
rect.Data.Write(Data, i, 4 * bmp2.Width); rect.Data.Write(Data, i, 4 * bmp2.Width);
@@ -1020,7 +1020,7 @@ namespace Vocaluxe.Lib.Draw
texture.height_ratio = texture.height / texture.h2; texture.height_ratio = texture.height / texture.h2;
Texture t = new Texture(_Device, (int)texture.w2, (int)texture.h2, 0, Usage.AutoGenerateMipMap, Format.A8R8G8B8, Pool.Managed); Texture t = new Texture(_Device, (int)texture.w2, (int)texture.h2, 0, Usage.AutoGenerateMipMap, Format.A8R8G8B8, Pool.Managed);
DataRectangle rect = t.LockRectangle(0, LockFlags.None); DataRectangle rect = t.LockRectangle(0, LockFlags.Discard);
for (int i = 0; i < Data.Length; ) for (int i = 0; i < Data.Length; )
{ {
rect.Data.Write(Data, i, 4 * W); rect.Data.Write(Data, i, 4 * W);
@@ -1069,7 +1069,7 @@ namespace Vocaluxe.Lib.Draw
{ {
if ((Texture.index >= 0) && (_Textures.Count > 0) && _TextureExists(ref Texture)) if ((Texture.index >= 0) && (_Textures.Count > 0) && _TextureExists(ref Texture))
{ {
DataRectangle rect = _D3DTextures[Texture.index].LockRectangle(0, LockFlags.None); DataRectangle rect = _D3DTextures[Texture.index].LockRectangle(0, LockFlags.Discard);
for (int i = 0; i < Data.Length; ) for (int i = 0; i < Data.Length; )
{ {
rect.Data.Write(Data, i, 4 * (int)Texture.width); rect.Data.Write(Data, i, 4 * (int)Texture.width);
@@ -1082,6 +1082,23 @@ namespace Vocaluxe.Lib.Draw
Texture.height_ratio = Texture.height / NextPowerOfTwo(Texture.height); Texture.height_ratio = Texture.height / NextPowerOfTwo(Texture.height);
Texture.width_ratio = Texture.width / NextPowerOfTwo(Texture.width); Texture.width_ratio = Texture.width / NextPowerOfTwo(Texture.width);
return true; return true;
/*Surface s = _D3DTextures[Texture.index].GetSurfaceLevel(0);
DataRectangle d = s.LockRectangle(LockFlags.Discard);
for (int i = 0; i < Data.Length; )
{
d.Data.Write(Data, i, 4 * (int)Texture.width);
i += 4 * (int)Texture.width;
d.Data.Position = d.Data.Position - 4 * (int)Texture.width;
d.Data.Position += d.Pitch;
}
Texture.height_ratio = Texture.height / NextPowerOfTwo(Texture.height);
Texture.width_ratio = Texture.width / NextPowerOfTwo(Texture.width);
s.UnlockRectangle();
return true; */
} }
else else
return false; return false;
@@ -1424,7 +1441,7 @@ namespace Vocaluxe.Lib.Draw
texture.height_ratio = texture.height / texture.h2; texture.height_ratio = texture.height / texture.h2;
Texture t = new Texture(_Device, (int)texture.w2, (int)texture.h2, 0, Usage.AutoGenerateMipMap, Format.A8R8G8B8, Pool.Managed); Texture t = new Texture(_Device, (int)texture.w2, (int)texture.h2, 0, Usage.AutoGenerateMipMap, Format.A8R8G8B8, Pool.Managed);
DataRectangle rect = t.LockRectangle(0, LockFlags.None); DataRectangle rect = t.LockRectangle(0, LockFlags.Discard);
for (int i = 0; i < q.data.Length; ) for (int i = 0; i < q.data.Length; )
{ {
rect.Data.Write(q.data, i, 4 * q.width); rect.Data.Write(q.data, i, 4 * q.width);