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

remove duplicated GL setup code

Browse Source
This commit is contained in:
Chris Forbes
2011-07-12 22:18:11 +12:00
parent 2fcb11d7cc
commit a95b59081f
4 changed files with 101 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,76 +53,16 @@ namespace OpenRA.Renderer.Cg
public GraphicsDevice( Size size, WindowMode window ) public GraphicsDevice( Size size, WindowMode window )
{ {
Console.WriteLine("Using Cg renderer"); Console.WriteLine("Using Cg renderer");
Sdl.SDL_Init( Sdl.SDL_INIT_NOPARACHUTE | Sdl.SDL_INIT_VIDEO ); windowSize = size;
Sdl.SDL_GL_SetAttribute( Sdl.SDL_GL_DOUBLEBUFFER, 1 );
Sdl.SDL_GL_SetAttribute( Sdl.SDL_GL_RED_SIZE, 8 ); var extensions = new string[]
Sdl.SDL_GL_SetAttribute( Sdl.SDL_GL_GREEN_SIZE, 8 );
Sdl.SDL_GL_SetAttribute( Sdl.SDL_GL_BLUE_SIZE, 8 );
Sdl.SDL_GL_SetAttribute( Sdl.SDL_GL_ALPHA_SIZE, 0 );
int windowFlags = 0;
switch( window )
{
case WindowMode.Fullscreen:
windowFlags |= Sdl.SDL_FULLSCREEN;
break;
case WindowMode.PseudoFullscreen:
windowFlags |= Sdl.SDL_NOFRAME;
Environment.SetEnvironmentVariable( "SDL_VIDEO_WINDOW_POS", "0,0" );
break;
case WindowMode.Windowed:
Environment.SetEnvironmentVariable( "SDL_VIDEO_CENTERED", "1" );
break;
default:
break;
}
var info = (Sdl.SDL_VideoInfo) Marshal.PtrToStructure(
Sdl.SDL_GetVideoInfo(), typeof(Sdl.SDL_VideoInfo));
Console.WriteLine("Desktop resolution: {0}x{1}",
info.current_w, info.current_h);
if (size.Width == 0 && size.Height == 0)
{
Console.WriteLine("No custom resolution provided, using desktop resolution");
size = new Size( info.current_w, info.current_h );
}
Console.WriteLine("Using resolution: {0}x{1}", size.Width, size.Height);
surf = Sdl.SDL_SetVideoMode( size.Width, size.Height, 0, Sdl.SDL_OPENGL | windowFlags );
if (surf == IntPtr.Zero)
Console.WriteLine("Failed to set video mode.");
Sdl.SDL_WM_SetCaption( "OpenRA", "OpenRA" );
Sdl.SDL_ShowCursor( 0 );
Sdl.SDL_EnableUNICODE( 1 );
Sdl.SDL_EnableKeyRepeat( Sdl.SDL_DEFAULT_REPEAT_DELAY, Sdl.SDL_DEFAULT_REPEAT_INTERVAL );
ErrorHandler.CheckGlError();
// Test for required extensions
var required = new string[]
{ {
"GL_ARB_vertex_program", "GL_ARB_vertex_program",
"GL_ARB_fragment_program", "GL_ARB_fragment_program",
"GL_ARB_vertex_buffer_object", "GL_ARB_vertex_buffer_object",
}; };
var extensions = Gl.glGetString(Gl.GL_EXTENSIONS); surf = SdlGraphics.InitializeSdlGl(ref windowSize, window, extensions);
if (extensions == null)
Console.WriteLine("Failed to fetch GL_EXTENSIONS, this is bad.");
var missingExtensions = required.Where( r => !extensions.Contains(r) ).ToArray();
if (missingExtensions.Any())
{
ErrorHandler.WriteGraphicsLog("Unsupported GPU: Missing extensions: {0}"
.F(string.Join(",", missingExtensions)));
throw new InvalidProgramException("Unsupported GPU. See graphics.log for details.");
}
windowSize = size;
cgContext = Tao.Cg.Cg.cgCreateContext(); cgContext = Tao.Cg.Cg.cgCreateContext();

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

@@ -42,72 +42,17 @@ namespace OpenRA.Renderer.Glsl
public GraphicsDevice( Size size, WindowMode window ) public GraphicsDevice( Size size, WindowMode window )
{ {
Console.WriteLine("Using Gl renderer"); Console.WriteLine("Using Gl renderer");
Sdl.SDL_Init( Sdl.SDL_INIT_NOPARACHUTE | Sdl.SDL_INIT_VIDEO ); windowSize = size;
Sdl.SDL_GL_SetAttribute( Sdl.SDL_GL_DOUBLEBUFFER, 1 );
Sdl.SDL_GL_SetAttribute( Sdl.SDL_GL_RED_SIZE, 8 );
Sdl.SDL_GL_SetAttribute( Sdl.SDL_GL_GREEN_SIZE, 8 );
Sdl.SDL_GL_SetAttribute( Sdl.SDL_GL_BLUE_SIZE, 8 );
Sdl.SDL_GL_SetAttribute( Sdl.SDL_GL_ALPHA_SIZE, 0 );
int windowFlags = 0;
switch( window )
{
case WindowMode.Fullscreen:
windowFlags |= Sdl.SDL_FULLSCREEN;
break;
case WindowMode.PseudoFullscreen:
windowFlags |= Sdl.SDL_NOFRAME;
Environment.SetEnvironmentVariable( "SDL_VIDEO_WINDOW_POS", "0,0" );
break;
default:
break;
}
var info = (Sdl.SDL_VideoInfo) Marshal.PtrToStructure(
Sdl.SDL_GetVideoInfo(), typeof(Sdl.SDL_VideoInfo));
Console.WriteLine("Desktop resolution: {0}x{1}",
info.current_w, info.current_h);
if (size.Width == 0 && size.Height == 0)
{
Console.WriteLine("No custom resolution provided, using desktop resolution");
size = new Size( info.current_w, info.current_h );
}
Console.WriteLine("Using resolution: {0}x{1}", size.Width, size.Height);
surf = Sdl.SDL_SetVideoMode( size.Width, size.Height, 0, Sdl.SDL_OPENGL | windowFlags );
Sdl.SDL_WM_SetCaption( "OpenRA", "OpenRA" );
Sdl.SDL_ShowCursor( 0 );
Sdl.SDL_EnableUNICODE( 1 );
Sdl.SDL_EnableKeyRepeat( Sdl.SDL_DEFAULT_REPEAT_DELAY, Sdl.SDL_DEFAULT_REPEAT_INTERVAL );
ErrorHandler.CheckGlError();
// Test for required extensions var extensions = new string[]
var required = new string[]
{ {
"GL_ARB_vertex_shader", "GL_ARB_vertex_shader",
"GL_ARB_fragment_shader", "GL_ARB_fragment_shader",
"GL_ARB_vertex_buffer_object", "GL_ARB_vertex_buffer_object",
}; };
var extensions = Gl.glGetString(Gl.GL_EXTENSIONS);
if (extensions == null)
Console.WriteLine("Failed to fetch GL_EXTENSIONS, this is bad.");
var missingExtensions = required.Where( r => !extensions.Contains(r) ).ToArray();
if (missingExtensions.Any())
{
ErrorHandler.WriteGraphicsLog("Unsupported GPU: Missing extensions: {0}"
.F(string.Join(",", missingExtensions)));
throw new InvalidProgramException("Unsupported GPU. See graphics.log for details.");
}
windowSize = size; surf = SdlGraphics.InitializeSdlGl( ref windowSize, window, extensions );
Gl.glEnableClientState( Gl.GL_VERTEX_ARRAY ); Gl.glEnableClientState( Gl.GL_VERTEX_ARRAY );
ErrorHandler.CheckGlError(); ErrorHandler.CheckGlError();
Gl.glEnableClientState( Gl.GL_TEXTURE_COORD_ARRAY ); Gl.glEnableClientState( Gl.GL_TEXTURE_COORD_ARRAY );

2
OpenRA.Renderer.SdlCommon/OpenRA.Renderer.SdlCommon.csproj
View File

@@ -1 +1 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>

91
OpenRA.Renderer.SdlCommon/SdlGraphics.cs Normal file
View File

@@ -0,0 +1,91 @@
#region Copyright & License Information
/*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using System;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using Tao.OpenGl;
using Tao.Sdl;
using OpenRA.FileFormats.Graphics;
namespace OpenRA.Renderer.SdlCommon
{
public static class SdlGraphics
{
public static IntPtr InitializeSdlGl( ref Size size, WindowMode window, string[] requiredExtensions )
{
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_RED_SIZE, 8 );
Sdl.SDL_GL_SetAttribute( Sdl.SDL_GL_GREEN_SIZE, 8 );
Sdl.SDL_GL_SetAttribute( Sdl.SDL_GL_BLUE_SIZE, 8 );
Sdl.SDL_GL_SetAttribute( Sdl.SDL_GL_ALPHA_SIZE, 0 );
int windowFlags = 0;
switch( window )
{
case WindowMode.Fullscreen:
windowFlags |= Sdl.SDL_FULLSCREEN;
break;
case WindowMode.PseudoFullscreen:
windowFlags |= Sdl.SDL_NOFRAME;
Environment.SetEnvironmentVariable( "SDL_VIDEO_WINDOW_POS", "0,0" );
break;
case WindowMode.Windowed:
Environment.SetEnvironmentVariable( "SDL_VIDEO_CENTERED", "1" );
break;
default:
break;
}
var info = (Sdl.SDL_VideoInfo) Marshal.PtrToStructure(
Sdl.SDL_GetVideoInfo(), typeof(Sdl.SDL_VideoInfo));
Console.WriteLine("Desktop resolution: {0}x{1}",
info.current_w, info.current_h);
if (size.Width == 0 && size.Height == 0)
{
Console.WriteLine("No custom resolution provided, using desktop resolution");
size = new Size( info.current_w, info.current_h );
}
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 );
if (surf == IntPtr.Zero)
Console.WriteLine("Failed to set video mode.");
Sdl.SDL_WM_SetCaption( "OpenRA", "OpenRA" );
Sdl.SDL_ShowCursor( 0 );
Sdl.SDL_EnableUNICODE( 1 );
Sdl.SDL_EnableKeyRepeat( Sdl.SDL_DEFAULT_REPEAT_DELAY, Sdl.SDL_DEFAULT_REPEAT_INTERVAL );
ErrorHandler.CheckGlError();
var extensions = Gl.glGetString(Gl.GL_EXTENSIONS);
if (extensions == null)
Console.WriteLine("Failed to fetch GL_EXTENSIONS, this is bad.");
var missingExtensions = requiredExtensions.Where( r => !extensions.Contains(r) ).ToArray();
if (missingExtensions.Any())
{
ErrorHandler.WriteGraphicsLog("Unsupported GPU: Missing extensions: {0}"
.F(string.Join(",", missingExtensions)));
throw new InvalidProgramException("Unsupported GPU. See graphics.log for details.");
}
return surf;
}
}
}