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

Remove unnecessary duplication between renderers.

Browse Source
This commit is contained in:
Paul Chote
2013-03-04 20:17:22 +13:00
parent 786c3b1f1a
commit 21e8e3a78d
5 changed files with 83 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.FileFormats/Graphics/IGraphicsDevice.cs
View File

@@ -40,7 +40,6 @@ namespace OpenRA.FileFormats.Graphics
IShader CreateShader( string name ); IShader CreateShader( string name );
Size WindowSize { get; } Size WindowSize { get; }
int GpuMemoryUsed { get; }
void Clear(); void Clear();
void Present(); void Present();

77
OpenRA.Renderer.Cg/GraphicsDevice.cs
View File

@@ -24,21 +24,23 @@ namespace OpenRA.Renderer.Cg
{ {
public IGraphicsDevice Create(Size size, WindowMode windowMode) public IGraphicsDevice Create(Size size, WindowMode windowMode)
{ {
Console.WriteLine("Using Cg renderer");
return new GraphicsDevice(size, windowMode); return new GraphicsDevice(size, windowMode);
} }
} }
public class GraphicsDevice : IGraphicsDevice public class GraphicsDevice : SdlGraphics
{ {
Size windowSize; static string[] RequiredExtensions =
{
"GL_ARB_vertex_program",
"GL_ARB_fragment_program",
"GL_ARB_vertex_buffer_object"
};
internal IntPtr cgContext; internal IntPtr cgContext;
internal int vertexProfile, fragmentProfile; internal int vertexProfile, fragmentProfile;
IntPtr surf;
SdlInput input;
public Size WindowSize { get { return windowSize; } }
static Tao.Cg.Cg.CGerrorCallbackFuncDelegate CgErrorCallback = () => static Tao.Cg.Cg.CGerrorCallbackFuncDelegate CgErrorCallback = () =>
{ {
var err = Tao.Cg.Cg.cgGetError(); var err = Tao.Cg.Cg.cgGetError();
@@ -48,19 +50,8 @@ namespace OpenRA.Renderer.Cg
}; };
public GraphicsDevice(Size size, WindowMode window) public GraphicsDevice(Size size, WindowMode window)
: base(size, window, RequiredExtensions)
{ {
Console.WriteLine("Using Cg renderer");
windowSize = size;
var extensions = new []
{
"GL_ARB_vertex_program",
"GL_ARB_fragment_program",
"GL_ARB_vertex_buffer_object",
};
surf = SdlGraphics.InitializeSdlGl(ref windowSize, window, extensions);
cgContext = Tao.Cg.Cg.cgCreateContext(); cgContext = Tao.Cg.Cg.cgCreateContext();
Tao.Cg.Cg.cgSetErrorCallback(CgErrorCallback); Tao.Cg.Cg.cgSetErrorCallback(CgErrorCallback);
@@ -69,54 +60,8 @@ namespace OpenRA.Renderer.Cg
Tao.Cg.CgGl.cgGLSetManageTextureParameters(cgContext, true); Tao.Cg.CgGl.cgGLSetManageTextureParameters(cgContext, true);
vertexProfile = CgGl.cgGLGetLatestProfile(CgGl.CG_GL_VERTEX); vertexProfile = CgGl.cgGLGetLatestProfile(CgGl.CG_GL_VERTEX);
fragmentProfile = CgGl.cgGLGetLatestProfile(CgGl.CG_GL_FRAGMENT); fragmentProfile = CgGl.cgGLGetLatestProfile(CgGl.CG_GL_FRAGMENT);
Gl.glEnableClientState(Gl.GL_VERTEX_ARRAY);
ErrorHandler.CheckGlError();
Gl.glEnableClientState(Gl.GL_TEXTURE_COORD_ARRAY);
ErrorHandler.CheckGlError();
Sdl.SDL_SetModState(0); // i have had enough.
input = new SdlInput(surf);
} }
public void EnableScissor(int left, int top, int width, int height) public override IShader CreateShader(string name) { return new Shader(this, name); }
{
if (width < 0) width = 0;
if (height < 0) height = 0;
Gl.glScissor(left, windowSize.Height - ( top + height ), width, height);
ErrorHandler.CheckGlError();
Gl.glEnable(Gl.GL_SCISSOR_TEST);
ErrorHandler.CheckGlError();
}
public void DisableScissor()
{
Gl.glDisable(Gl.GL_SCISSOR_TEST);
ErrorHandler.CheckGlError();
}
public void Clear() { SdlGraphics.Clear(); }
public void Present() { Sdl.SDL_GL_SwapBuffers(); }
public void PumpInput(IInputHandler inputHandler) { input.PumpInput(inputHandler); }
public void DrawPrimitives(PrimitiveType pt, int firstVertex, int numVertices)
{
SdlGraphics.DrawPrimitives(pt, firstVertex, numVertices);
}
public void SetLineWidth(float width)
{
Gl.glLineWidth(width);
ErrorHandler.CheckGlError();
}
public IVertexBuffer<Vertex> CreateVertexBuffer(int size) { return new VertexBuffer<Vertex>(size); }
public ITexture CreateTexture() { return new Texture(); }
public ITexture CreateTexture(Bitmap bitmap) { return new Texture(bitmap); }
public IShader CreateShader(string name) { return new Shader(this, name); }
public int GpuMemoryUsed { get { return 0; } }
} }
} }

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

@@ -23,79 +23,23 @@ namespace OpenRA.Renderer.Glsl
{ {
public IGraphicsDevice Create(Size size, WindowMode windowMode) public IGraphicsDevice Create(Size size, WindowMode windowMode)
{ {
Console.WriteLine("Using Gl renderer");
return new GraphicsDevice(size, windowMode); return new GraphicsDevice(size, windowMode);
} }
} }
public class GraphicsDevice : IGraphicsDevice public class GraphicsDevice : SdlGraphics
{ {
Size windowSize; static string[] RequiredExtensions =
IntPtr surf; {
SdlInput input; "GL_ARB_vertex_shader",
"GL_ARB_fragment_shader",
public Size WindowSize { get { return windowSize; } } "GL_ARB_vertex_buffer_object"
};
public GraphicsDevice(Size size, WindowMode window) public GraphicsDevice(Size size, WindowMode window)
{ : base(size, window, RequiredExtensions) {}
Console.WriteLine("Using Gl renderer");
windowSize = size;
var extensions = new [] public override IShader CreateShader(string name) { return new Shader( this, name ); }
{
"GL_ARB_vertex_shader",
"GL_ARB_fragment_shader",
"GL_ARB_vertex_buffer_object",
};
surf = SdlGraphics.InitializeSdlGl(ref windowSize, window, extensions);
Gl.glEnableClientState(Gl.GL_VERTEX_ARRAY);
ErrorHandler.CheckGlError();
Gl.glEnableClientState(Gl.GL_TEXTURE_COORD_ARRAY);
ErrorHandler.CheckGlError();
Sdl.SDL_SetModState(0);
input = new SdlInput(surf);
}
public void EnableScissor(int left, int top, int width, int height)
{
if (width < 0) width = 0;
if (height < 0) height = 0;
Gl.glScissor(left, windowSize.Height - ( top + height ), width, height);
ErrorHandler.CheckGlError();
Gl.glEnable(Gl.GL_SCISSOR_TEST);
ErrorHandler.CheckGlError();
}
public void DisableScissor()
{
Gl.glDisable(Gl.GL_SCISSOR_TEST);
ErrorHandler.CheckGlError();
}
public void Clear() { SdlGraphics.Clear(); }
public void Present() { Sdl.SDL_GL_SwapBuffers(); }
public void PumpInput(IInputHandler inputHandler) { input.PumpInput(inputHandler); }
public void DrawPrimitives(PrimitiveType pt, int firstVertex, int numVertices)
{
SdlGraphics.DrawPrimitives(pt, firstVertex, numVertices);
}
public void SetLineWidth( float width )
{
Gl.glLineWidth(width);
ErrorHandler.CheckGlError();
}
public IVertexBuffer<Vertex> CreateVertexBuffer( int size ) { return new VertexBuffer<Vertex>( size ); }
public ITexture CreateTexture() { return new Texture(); }
public ITexture CreateTexture( Bitmap bitmap ) { return new Texture( bitmap ); }
public IShader CreateShader( string name ) { return new Shader( this, name ); }
public int GpuMemoryUsed { get; internal set; }
} }
} }

2
OpenRA.Renderer.Null/NullGraphicsDevice.cs
View File

@@ -54,8 +54,6 @@ namespace OpenRA.Renderer.Null
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 NullShader : IShader public class NullShader : IShader

73
OpenRA.Renderer.SdlCommon/SdlGraphics.cs
View File

@@ -18,9 +18,30 @@ using Tao.Sdl;
namespace OpenRA.Renderer.SdlCommon namespace OpenRA.Renderer.SdlCommon
{ {
public static class SdlGraphics public abstract class SdlGraphics : IGraphicsDevice
{ {
public static IntPtr InitializeSdlGl( ref Size size, WindowMode window, string[] requiredExtensions ) Size windowSize;
IntPtr surf;
SdlInput input;
public Size WindowSize { get { return windowSize; } }
public SdlGraphics(Size size, WindowMode window, string[] extensions)
{
windowSize = size;
surf = InitializeSdlGl(ref windowSize, window, extensions);
Gl.glEnableClientState(Gl.GL_VERTEX_ARRAY);
ErrorHandler.CheckGlError();
Gl.glEnableClientState(Gl.GL_TEXTURE_COORD_ARRAY);
ErrorHandler.CheckGlError();
Sdl.SDL_SetModState(0);
input = new SdlInput(surf);
}
IntPtr InitializeSdlGl(ref Size size, WindowMode window, string[] requiredExtensions)
{ {
Sdl.SDL_Init( Sdl.SDL_INIT_NOPARACHUTE | Sdl.SDL_INIT_VIDEO ); Sdl.SDL_Init( Sdl.SDL_INIT_NOPARACHUTE | Sdl.SDL_INIT_VIDEO );
Sdl.SDL_GL_SetAttribute( Sdl.SDL_GL_DOUBLEBUFFER, 1 ); Sdl.SDL_GL_SetAttribute( Sdl.SDL_GL_DOUBLEBUFFER, 1 );
@@ -30,7 +51,7 @@ namespace OpenRA.Renderer.SdlCommon
Sdl.SDL_GL_SetAttribute( Sdl.SDL_GL_ALPHA_SIZE, 0 ); Sdl.SDL_GL_SetAttribute( Sdl.SDL_GL_ALPHA_SIZE, 0 );
int windowFlags = 0; int windowFlags = 0;
switch( window ) switch (window)
{ {
case WindowMode.Fullscreen: case WindowMode.Fullscreen:
windowFlags |= Sdl.SDL_FULLSCREEN; windowFlags |= Sdl.SDL_FULLSCREEN;
@@ -59,14 +80,14 @@ namespace OpenRA.Renderer.SdlCommon
Console.WriteLine("Using resolution: {0}x{1}", size.Width, size.Height); Console.WriteLine("Using resolution: {0}x{1}", size.Width, size.Height);
var surf = Sdl.SDL_SetVideoMode( size.Width, size.Height, 0, Sdl.SDL_OPENGL | windowFlags ); var surf = Sdl.SDL_SetVideoMode(size.Width, size.Height, 0, Sdl.SDL_OPENGL | windowFlags);
if (surf == IntPtr.Zero) if (surf == IntPtr.Zero)
Console.WriteLine("Failed to set video mode."); Console.WriteLine("Failed to set video mode.");
Sdl.SDL_WM_SetCaption( "OpenRA", "OpenRA" ); Sdl.SDL_WM_SetCaption("OpenRA", "OpenRA");
Sdl.SDL_ShowCursor( 0 ); Sdl.SDL_ShowCursor(0);
Sdl.SDL_EnableUNICODE( 1 ); Sdl.SDL_EnableUNICODE(1);
Sdl.SDL_EnableKeyRepeat( Sdl.SDL_DEFAULT_REPEAT_DELAY, Sdl.SDL_DEFAULT_REPEAT_INTERVAL ); Sdl.SDL_EnableKeyRepeat(Sdl.SDL_DEFAULT_REPEAT_DELAY, Sdl.SDL_DEFAULT_REPEAT_INTERVAL);
ErrorHandler.CheckGlError(); ErrorHandler.CheckGlError();
@@ -86,7 +107,7 @@ namespace OpenRA.Renderer.SdlCommon
return surf; return surf;
} }
static int ModeFromPrimitiveType(PrimitiveType pt) int ModeFromPrimitiveType(PrimitiveType pt)
{ {
switch(pt) switch(pt)
{ {
@@ -98,19 +119,49 @@ namespace OpenRA.Renderer.SdlCommon
throw new NotImplementedException(); throw new NotImplementedException();
} }
public static void DrawPrimitives(PrimitiveType pt, int firstVertex, int numVertices) public void DrawPrimitives(PrimitiveType pt, int firstVertex, int numVertices)
{ {
Gl.glDrawArrays(ModeFromPrimitiveType(pt), firstVertex, numVertices); Gl.glDrawArrays(ModeFromPrimitiveType(pt), firstVertex, numVertices);
ErrorHandler.CheckGlError(); ErrorHandler.CheckGlError();
} }
public static void Clear() public void Clear()
{ {
Gl.glClearColor(0, 0, 0, 0); Gl.glClearColor(0, 0, 0, 0);
ErrorHandler.CheckGlError(); ErrorHandler.CheckGlError();
Gl.glClear(Gl.GL_COLOR_BUFFER_BIT); Gl.glClear(Gl.GL_COLOR_BUFFER_BIT);
ErrorHandler.CheckGlError(); ErrorHandler.CheckGlError();
} }
public void EnableScissor(int left, int top, int width, int height)
{
if (width < 0) width = 0;
if (height < 0) height = 0;
Gl.glScissor(left, windowSize.Height - (top + height), width, height);
ErrorHandler.CheckGlError();
Gl.glEnable(Gl.GL_SCISSOR_TEST);
ErrorHandler.CheckGlError();
}
public void DisableScissor()
{
Gl.glDisable(Gl.GL_SCISSOR_TEST);
ErrorHandler.CheckGlError();
}
public void SetLineWidth(float width)
{
Gl.glLineWidth(width);
ErrorHandler.CheckGlError();
}
public void Present() { Sdl.SDL_GL_SwapBuffers(); }
public void PumpInput(IInputHandler inputHandler) { input.PumpInput(inputHandler); }
public IVertexBuffer<Vertex> CreateVertexBuffer(int size) { return new VertexBuffer<Vertex>(size); }
public ITexture CreateTexture() { return new Texture(); }
public ITexture CreateTexture(Bitmap bitmap) { return new Texture(bitmap); }
public abstract IShader CreateShader(string name);
} }
} }