remove duplicated GL setup code
This commit is contained in:
@@ -53,76 +53,16 @@ namespace OpenRA.Renderer.Cg
|
||||
public GraphicsDevice( Size size, WindowMode window )
|
||||
{
|
||||
Console.WriteLine("Using Cg renderer");
|
||||
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);
|
||||
|
||||
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[]
|
||||
windowSize = size;
|
||||
|
||||
var extensions = new string[]
|
||||
{
|
||||
"GL_ARB_vertex_program",
|
||||
"GL_ARB_fragment_program",
|
||||
"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);
|
||||
|
||||
cgContext = Tao.Cg.Cg.cgCreateContext();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user