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

Renormalize line endings and fix copyright headers again.

Browse Source
This commit is contained in:
Paul Chote
2011-04-07 21:15:42 +12:00
parent 1a49b46af1
commit b0425aff3b
144 changed files with 8076 additions and 7746 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Renderer.Gl/GraphicsDevice.cs
View File

@@ -283,7 +283,7 @@ namespace OpenRA.Renderer.Glsl
public void DrawIndexedPrimitives( PrimitiveType pt, int numVerts, int numPrimitives )
{
Gl.glDrawElements( ModeFromPrimitiveType( pt ), numPrimitives * IndicesPerPrimitive( pt ),
Gl.glDrawElements( ModeFromPrimitiveType( pt ), numPrimitives * IndicesPerPrimitive( pt ),
Gl.GL_UNSIGNED_INT, IntPtr.Zero);
CheckGlError();
}
@@ -314,8 +314,8 @@ namespace OpenRA.Renderer.Glsl
public IIndexBuffer CreateIndexBuffer( int size ) { return new IndexBuffer( this, size ); }
public ITexture CreateTexture() { return new Texture( this ); }
public ITexture CreateTexture( Bitmap bitmap ) { return new Texture( this, bitmap ); }
public IShader CreateShader( string name ) { return new Shader( this, name ); }
public int GpuMemoryUsed { get; internal set; }
public IShader CreateShader( string name ) { return new Shader( this, name ); }
public int GpuMemoryUsed { get; internal set; }
}
}

6
OpenRA.Renderer.Gl/IndexBuffer.cs
View File

@@ -30,13 +30,13 @@ namespace OpenRA.Renderer.Glsl
new ElemType[ size ],
Gl.GL_DYNAMIC_DRAW);
GraphicsDevice.CheckGlError();
}
}
public void SetData(ElemType[] data, int length)
{
Bind();
Gl.glBufferSubData(Gl.GL_ELEMENT_ARRAY_BUFFER,
IntPtr.Zero,
IntPtr.Zero,
new IntPtr(sizeof(ElemType) * length),
data);
GraphicsDevice.CheckGlError();

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

@@ -6,25 +6,25 @@
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using System;
using System.Drawing;
using System.Drawing.Imaging;
using System.IO;
using OpenRA.FileFormats.Graphics;
#endregion
using System;
using System.Drawing;
using System.Drawing.Imaging;
using System.IO;
using OpenRA.FileFormats.Graphics;
using Tao.OpenGl;
namespace OpenRA.Renderer.Glsl
{
public class Texture : ITexture
{
internal int texture;
internal int memory;
internal int texture;
internal int memory;
GraphicsDevice dev;
public Texture(GraphicsDevice dev)
{
{
this.dev = dev;
Gl.glGenTextures(1, out texture);
@@ -32,7 +32,7 @@ namespace OpenRA.Renderer.Glsl
}
public Texture(GraphicsDevice dev, Bitmap bitmap)
{
{
this.dev = dev;
Gl.glGenTextures(1, out texture);
@@ -54,18 +54,18 @@ namespace OpenRA.Renderer.Glsl
GraphicsDevice.CheckGlError();
Gl.glTexParameteri(Gl.GL_TEXTURE_2D, Gl.GL_TEXTURE_MAX_LEVEL, 0);
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);
}
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)
@@ -83,8 +83,8 @@ namespace OpenRA.Renderer.Glsl
0, Gl.GL_BGRA, Gl.GL_UNSIGNED_BYTE, intPtr);
GraphicsDevice.CheckGlError();
}
}
}
UpdateMemoryUsage(colors.Length);
}
@@ -107,8 +107,8 @@ namespace OpenRA.Renderer.Glsl
0, Gl.GL_BGRA, Gl.GL_UNSIGNED_BYTE, intPtr);
GraphicsDevice.CheckGlError();
}
}
}
UpdateMemoryUsage(width * height * sizeof(uint));
}
@@ -129,8 +129,8 @@ namespace OpenRA.Renderer.Glsl
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
GraphicsDevice.CheckGlError();
bitmap.UnlockBits(bits);
bitmap.UnlockBits(bits);
UpdateMemoryUsage(bitmap.Width * bitmap.Height * sizeof(uint));
}