report memory usage for textures
This commit is contained in:
@@ -35,7 +35,8 @@ namespace OpenRA.FileFormats.Graphics
|
|||||||
ITexture CreateTexture();
|
ITexture CreateTexture();
|
||||||
IShader CreateShader( string name );
|
IShader CreateShader( string name );
|
||||||
|
|
||||||
Size WindowSize { get; }
|
Size WindowSize { get; }
|
||||||
|
int GpuMemoryUsed { get; }
|
||||||
|
|
||||||
void Clear( Color color );
|
void Clear( Color color );
|
||||||
void Present( IInputHandler inputHandler );
|
void Present( IInputHandler inputHandler );
|
||||||
|
|||||||
@@ -317,6 +317,9 @@ namespace OpenRA.Renderer.Cg
|
|||||||
public IIndexBuffer CreateIndexBuffer( int size ) { return new IndexBuffer( this, size ); }
|
public IIndexBuffer CreateIndexBuffer( int size ) { return new IndexBuffer( this, size ); }
|
||||||
public ITexture CreateTexture() { return new Texture( this ); }
|
public ITexture CreateTexture() { return new Texture( this ); }
|
||||||
public ITexture CreateTexture( Bitmap bitmap ) { return new Texture( this, bitmap ); }
|
public ITexture CreateTexture( Bitmap bitmap ) { return new Texture( this, bitmap ); }
|
||||||
public IShader CreateShader( string name ) { return new Shader( this, name ); }
|
public IShader CreateShader( string name ) { return new Shader( this, name ); }
|
||||||
|
|
||||||
|
|
||||||
|
public int GpuMemoryUsed { get { return 0; } }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -310,6 +310,8 @@ namespace OpenRA.Renderer.Glsl
|
|||||||
public IIndexBuffer CreateIndexBuffer( int size ) { return new IndexBuffer( this, size ); }
|
public IIndexBuffer CreateIndexBuffer( int size ) { return new IndexBuffer( this, size ); }
|
||||||
public ITexture CreateTexture() { return new Texture( this ); }
|
public ITexture CreateTexture() { return new Texture( this ); }
|
||||||
public ITexture CreateTexture( Bitmap bitmap ) { return new Texture( this, bitmap ); }
|
public ITexture CreateTexture( Bitmap bitmap ) { return new Texture( this, bitmap ); }
|
||||||
public IShader CreateShader( string name ) { return new Shader( this, name ); }
|
public IShader CreateShader( string name ) { return new Shader( this, name ); }
|
||||||
|
|
||||||
|
public int GpuMemoryUsed { get; internal set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,16 +19,22 @@ namespace OpenRA.Renderer.Glsl
|
|||||||
{
|
{
|
||||||
public class Texture : ITexture
|
public class Texture : ITexture
|
||||||
{
|
{
|
||||||
internal int texture;
|
internal int texture;
|
||||||
|
internal int memory;
|
||||||
|
GraphicsDevice dev;
|
||||||
|
|
||||||
public Texture(GraphicsDevice dev)
|
public Texture(GraphicsDevice dev)
|
||||||
{
|
{
|
||||||
|
this.dev = dev;
|
||||||
|
|
||||||
Gl.glGenTextures(1, out texture);
|
Gl.glGenTextures(1, out texture);
|
||||||
GraphicsDevice.CheckGlError();
|
GraphicsDevice.CheckGlError();
|
||||||
}
|
}
|
||||||
|
|
||||||
public Texture(GraphicsDevice dev, Bitmap bitmap)
|
public Texture(GraphicsDevice dev, Bitmap bitmap)
|
||||||
{
|
{
|
||||||
|
this.dev = dev;
|
||||||
|
|
||||||
Gl.glGenTextures(1, out texture);
|
Gl.glGenTextures(1, out texture);
|
||||||
GraphicsDevice.CheckGlError();
|
GraphicsDevice.CheckGlError();
|
||||||
SetData(bitmap);
|
SetData(bitmap);
|
||||||
@@ -48,6 +54,18 @@ namespace OpenRA.Renderer.Glsl
|
|||||||
GraphicsDevice.CheckGlError();
|
GraphicsDevice.CheckGlError();
|
||||||
Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_MAX_LEVEL, 0);
|
Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_MAX_LEVEL, 0);
|
||||||
GraphicsDevice.CheckGlError();
|
GraphicsDevice.CheckGlError();
|
||||||
|
}
|
||||||
|
|
||||||
|
void UpdateMemoryUsage( int newSize )
|
||||||
|
{
|
||||||
|
if (newSize == memory)
|
||||||
|
return;
|
||||||
|
|
||||||
|
dev.GpuMemoryUsed -= memory;
|
||||||
|
memory = newSize;
|
||||||
|
dev.GpuMemoryUsed += memory;
|
||||||
|
|
||||||
|
Log.Write("debug", "GPU Memory: {0:F2} MiB", dev.GpuMemoryUsed / 1024 / 1024f);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetData(byte[] colors, int width, int height)
|
public void SetData(byte[] colors, int width, int height)
|
||||||
@@ -65,7 +83,9 @@ namespace OpenRA.Renderer.Glsl
|
|||||||
0, Gl.GL_BGRA, Gl.GL_UNSIGNED_BYTE, intPtr);
|
0, Gl.GL_BGRA, Gl.GL_UNSIGNED_BYTE, intPtr);
|
||||||
GraphicsDevice.CheckGlError();
|
GraphicsDevice.CheckGlError();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
UpdateMemoryUsage(colors.Length);
|
||||||
}
|
}
|
||||||
|
|
||||||
// An array of RGBA
|
// An array of RGBA
|
||||||
@@ -87,7 +107,9 @@ namespace OpenRA.Renderer.Glsl
|
|||||||
0, Gl.GL_BGRA, Gl.GL_UNSIGNED_BYTE, intPtr);
|
0, Gl.GL_BGRA, Gl.GL_UNSIGNED_BYTE, intPtr);
|
||||||
GraphicsDevice.CheckGlError();
|
GraphicsDevice.CheckGlError();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
UpdateMemoryUsage(width * height * sizeof(uint));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetData(Bitmap bitmap)
|
public void SetData(Bitmap bitmap)
|
||||||
@@ -107,7 +129,9 @@ namespace OpenRA.Renderer.Glsl
|
|||||||
Gl.glTexImage2D(Gl.GL_TEXTURE_2D, 0, Gl.GL_RGBA8, bits.Width, bits.Height,
|
Gl.glTexImage2D(Gl.GL_TEXTURE_2D, 0, Gl.GL_RGBA8, bits.Width, bits.Height,
|
||||||
0, Gl.GL_BGRA, Gl.GL_UNSIGNED_BYTE, bits.Scan0); // todo: weird strides
|
0, Gl.GL_BGRA, Gl.GL_UNSIGNED_BYTE, bits.Scan0); // todo: weird strides
|
||||||
GraphicsDevice.CheckGlError();
|
GraphicsDevice.CheckGlError();
|
||||||
bitmap.UnlockBits(bits);
|
bitmap.UnlockBits(bits);
|
||||||
|
|
||||||
|
UpdateMemoryUsage(bitmap.Width * bitmap.Height * sizeof(uint));
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IsPowerOf2(int v)
|
bool IsPowerOf2(int v)
|
||||||
|
|||||||
@@ -46,7 +46,9 @@ namespace OpenRA.Renderer.Null
|
|||||||
public IIndexBuffer CreateIndexBuffer(int size) { return new NullIndexBuffer(); }
|
public IIndexBuffer CreateIndexBuffer(int size) { return new NullIndexBuffer(); }
|
||||||
public ITexture CreateTexture() { return new NullTexture(); }
|
public ITexture CreateTexture() { return new NullTexture(); }
|
||||||
public ITexture CreateTexture(Bitmap bitmap) { return new NullTexture(); }
|
public ITexture CreateTexture(Bitmap bitmap) { return new NullTexture(); }
|
||||||
public IShader CreateShader(string name) { return new NullShader(); }
|
public IShader CreateShader(string name) { return new NullShader(); }
|
||||||
|
|
||||||
|
public int GpuMemoryUsed { get { return 0; } }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class NullIndexBuffer : IIndexBuffer
|
public class NullIndexBuffer : IIndexBuffer
|
||||||
|
|||||||
Reference in New Issue
Block a user