epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix leaky textures & vbos

Browse Source
This commit is contained in:
Chris Forbes
2011-05-05 19:16:45 +12:00
parent 75588b050e
commit a52d7fb496
4 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Renderer.Cg/Texture.cs
View File

@@ -34,6 +34,9 @@ namespace OpenRA.Renderer.Cg
SetData(bitmap);
}
void FinalizeInner() { Gl.glDeleteTextures( 1, ref texture ); }
~Texture() { Game.RunAfterTick( FinalizeInner ); }
void PrepareTexture()
{
Gl.glBindTexture(Gl.GL_TEXTURE_2D, texture);

18
OpenRA.Renderer.Cg/VertexBuffer.cs
View File

@@ -9,13 +9,14 @@
#endregion
using System;
using System.Drawing;
using System.Runtime.InteropServices;
using OpenRA.FileFormats.Graphics;
using Tao.OpenGl;
namespace OpenRA.Renderer.Cg
{
public class VertexBuffer<T> : IVertexBuffer<T>, IDisposable
public class VertexBuffer<T> : IVertexBuffer<T>
where T : struct
{
int buffer;
@@ -32,6 +33,9 @@ namespace OpenRA.Renderer.Cg
GraphicsDevice.CheckGlError();
}
void FinalizeInner() { Gl.glDeleteBuffers( 1, ref buffer ); }
~VertexBuffer() { Game.RunAfterTick( FinalizeInner ); }
public void SetData(T[] data, int length)
{
Bind();
@@ -51,17 +55,5 @@ namespace OpenRA.Renderer.Cg
Gl.glTexCoordPointer(4, Gl.GL_FLOAT, Marshal.SizeOf(typeof(T)), new IntPtr(12));
GraphicsDevice.CheckGlError();
}
bool disposed;
public void Dispose()
{
if (disposed) return;
GC.SuppressFinalize(this);
Gl.glDeleteBuffers(1, ref buffer);
GraphicsDevice.CheckGlError();
disposed = true;
}
//~VertexBuffer() { Dispose(); }
}
}

3
OpenRA.Renderer.Gl/Texture.cs
View File

@@ -40,6 +40,9 @@ namespace OpenRA.Renderer.Glsl
SetData(bitmap);
}
void FinalizeInner() { UpdateMemoryUsage(0); Gl.glDeleteTextures(1, ref texture); }
~Texture() { Game.RunAfterTick(FinalizeInner); }
void PrepareTexture()
{
GraphicsDevice.CheckGlError();

15
OpenRA.Renderer.Gl/VertexBuffer.cs
View File

@@ -15,7 +15,7 @@ using Tao.OpenGl;
namespace OpenRA.Renderer.Glsl
{
public class VertexBuffer<T> : IVertexBuffer<T>, IDisposable
public class VertexBuffer<T> : IVertexBuffer<T>
where T : struct
{
int buffer;
@@ -52,16 +52,7 @@ namespace OpenRA.Renderer.Glsl
GraphicsDevice.CheckGlError();
}
bool disposed;
public void Dispose()
{
if (disposed) return;
GC.SuppressFinalize(this);
Gl.glDeleteBuffers(1, ref buffer);
GraphicsDevice.CheckGlError();
disposed = true;
}
//~VertexBuffer() { Dispose(); }
void FinalizeInner() { Gl.glDeleteBuffers( 1, ref buffer ); }
~VertexBuffer() { Game.RunAfterTick( FinalizeInner ); }
}
}