From d96a32a89fe5ef048a0f47dfdd8f88f735ced1e9 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Mon, 28 Dec 2015 10:57:43 +0000 Subject: [PATCH 1/5] Move WriteGraphicsLog to OpenGL. --- OpenRA.Platforms.Default/ErrorHandler.cs | 26 ++----------------- OpenRA.Platforms.Default/FrameBuffer.cs | 2 +- OpenRA.Platforms.Default/OpenGL.cs | 22 ++++++++++++++++ .../Sdl2GraphicsDevice.cs | 2 +- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/OpenRA.Platforms.Default/ErrorHandler.cs b/OpenRA.Platforms.Default/ErrorHandler.cs index 18f11ee57f..10b0e5e764 100644 --- a/OpenRA.Platforms.Default/ErrorHandler.cs +++ b/OpenRA.Platforms.Default/ErrorHandler.cs @@ -31,7 +31,7 @@ namespace OpenRA.Platforms.Default Console.WriteLine("Detected OpenGL version: {0}.{1}".F(major, minor)); if (major < 2) { - WriteGraphicsLog("OpenRA requires OpenGL version 2.0 or greater and detected {0}.{1}".F(major, minor)); + OpenGL.WriteGraphicsLog("OpenRA requires OpenGL version 2.0 or greater and detected {0}.{1}".F(major, minor)); throw new InvalidProgramException("OpenGL Version Error: See graphics.log for details."); } } @@ -42,31 +42,9 @@ namespace OpenRA.Platforms.Default if (n != OpenGL.GL_NO_ERROR) { var error = "GL Error: {0}\n{1}".F(n, new StackTrace()); - WriteGraphicsLog(error); + OpenGL.WriteGraphicsLog(error); throw new InvalidOperationException("OpenGL Error: See graphics.log for details."); } } - - public static void WriteGraphicsLog(string message) - { - Log.Write("graphics", message); - Log.Write("graphics", ""); - Log.Write("graphics", "OpenGL Information:"); - var vendor = OpenGL.glGetString(OpenGL.GL_VENDOR); - Log.Write("graphics", "Vendor: {0}", vendor); - if (vendor.Contains("Microsoft")) - { - var msg = ""; - msg += "Note: The default driver provided by Microsoft does not include full OpenGL support.\n"; - msg += "Please install the latest drivers from your graphics card manufacturer's website.\n"; - Log.Write("graphics", msg); - } - - Log.Write("graphics", "Renderer: {0}", OpenGL.glGetString(OpenGL.GL_RENDERER)); - Log.Write("graphics", "GL Version: {0}", OpenGL.glGetString(OpenGL.GL_VERSION)); - Log.Write("graphics", "Shader Version: {0}", OpenGL.glGetString(OpenGL.GL_SHADING_LANGUAGE_VERSION)); - Log.Write("graphics", "Available extensions:"); - Log.Write("graphics", OpenGL.glGetString(OpenGL.GL_EXTENSIONS)); - } } } \ No newline at end of file diff --git a/OpenRA.Platforms.Default/FrameBuffer.cs b/OpenRA.Platforms.Default/FrameBuffer.cs index 274dfd327a..7abdc417a6 100644 --- a/OpenRA.Platforms.Default/FrameBuffer.cs +++ b/OpenRA.Platforms.Default/FrameBuffer.cs @@ -57,7 +57,7 @@ namespace OpenRA.Platforms.Default if (status != OpenGL.FRAMEBUFFER_COMPLETE_EXT) { var error = "Error creating framebuffer: {0}\n{1}".F(status, new StackTrace()); - ErrorHandler.WriteGraphicsLog(error); + OpenGL.WriteGraphicsLog(error); throw new InvalidOperationException("OpenGL Error: See graphics.log for details."); } diff --git a/OpenRA.Platforms.Default/OpenGL.cs b/OpenRA.Platforms.Default/OpenGL.cs index 604f763e24..43edffbc7e 100644 --- a/OpenRA.Platforms.Default/OpenGL.cs +++ b/OpenRA.Platforms.Default/OpenGL.cs @@ -409,5 +409,27 @@ namespace OpenRA.Platforms.Default { return (T)(object)Marshal.GetDelegateForFunctionPointer(SDL.SDL_GL_GetProcAddress(name), typeof(T)); } + + public static void WriteGraphicsLog(string message) + { + Log.Write("graphics", message); + Log.Write("graphics", ""); + Log.Write("graphics", "OpenGL Information:"); + var vendor = OpenGL.glGetString(OpenGL.GL_VENDOR); + Log.Write("graphics", "Vendor: {0}", vendor); + if (vendor.Contains("Microsoft")) + { + var msg = ""; + msg += "Note: The default driver provided by Microsoft does not include full OpenGL support.\n"; + msg += "Please install the latest drivers from your graphics card manufacturer's website.\n"; + Log.Write("graphics", msg); + } + + Log.Write("graphics", "Renderer: {0}", OpenGL.glGetString(OpenGL.GL_RENDERER)); + Log.Write("graphics", "GL Version: {0}", OpenGL.glGetString(OpenGL.GL_VERSION)); + Log.Write("graphics", "Shader Version: {0}", OpenGL.glGetString(OpenGL.GL_SHADING_LANGUAGE_VERSION)); + Log.Write("graphics", "Available extensions:"); + Log.Write("graphics", OpenGL.glGetString(OpenGL.GL_EXTENSIONS)); + } } } diff --git a/OpenRA.Platforms.Default/Sdl2GraphicsDevice.cs b/OpenRA.Platforms.Default/Sdl2GraphicsDevice.cs index 1c6acb1ccc..0577a6587d 100644 --- a/OpenRA.Platforms.Default/Sdl2GraphicsDevice.cs +++ b/OpenRA.Platforms.Default/Sdl2GraphicsDevice.cs @@ -82,7 +82,7 @@ namespace OpenRA.Platforms.Default if (SDL.SDL_GL_ExtensionSupported("GL_EXT_framebuffer_object") == SDL.SDL_bool.SDL_FALSE) { - ErrorHandler.WriteGraphicsLog("OpenRA requires the OpenGL extension GL_EXT_framebuffer_object.\n" + OpenGL.WriteGraphicsLog("OpenRA requires the OpenGL extension GL_EXT_framebuffer_object.\n" + "Please try updating your GPU driver to the latest version provided by the manufacturer."); throw new InvalidProgramException("Missing OpenGL extension GL_EXT_framebuffer_object. See graphics.log for details."); } From 4372ed650ed099955d4050ead4e13626a8019ccd Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Mon, 28 Dec 2015 10:59:43 +0000 Subject: [PATCH 2/5] Move CheckGlVersion to OpenGL. --- OpenRA.Platforms.Default/ErrorHandler.cs | 21 ------------ OpenRA.Platforms.Default/OpenGL.cs | 34 ++++++++++++++++++- .../Sdl2GraphicsDevice.cs | 11 +----- 3 files changed, 34 insertions(+), 32 deletions(-) diff --git a/OpenRA.Platforms.Default/ErrorHandler.cs b/OpenRA.Platforms.Default/ErrorHandler.cs index 10b0e5e764..6b0d5afa48 100644 --- a/OpenRA.Platforms.Default/ErrorHandler.cs +++ b/OpenRA.Platforms.Default/ErrorHandler.cs @@ -15,27 +15,6 @@ namespace OpenRA.Platforms.Default { static class ErrorHandler { - public static void CheckGlVersion() - { - var versionString = OpenGL.glGetString(OpenGL.GL_VERSION); - var version = versionString.Contains(" ") ? versionString.Split(' ')[0].Split('.') : versionString.Split('.'); - - var major = 0; - if (version.Length > 0) - int.TryParse(version[0], out major); - - var minor = 0; - if (version.Length > 1) - int.TryParse(version[1], out minor); - - Console.WriteLine("Detected OpenGL version: {0}.{1}".F(major, minor)); - if (major < 2) - { - OpenGL.WriteGraphicsLog("OpenRA requires OpenGL version 2.0 or greater and detected {0}.{1}".F(major, minor)); - throw new InvalidProgramException("OpenGL Version Error: See graphics.log for details."); - } - } - public static void CheckGlError() { var n = OpenGL.glGetError(); diff --git a/OpenRA.Platforms.Default/OpenGL.cs b/OpenRA.Platforms.Default/OpenGL.cs index 43edffbc7e..ffb5a38d9e 100644 --- a/OpenRA.Platforms.Default/OpenGL.cs +++ b/OpenRA.Platforms.Default/OpenGL.cs @@ -335,8 +335,17 @@ namespace OpenRA.Platforms.Default public delegate int CheckFramebufferStatus(int target); public static CheckFramebufferStatus glCheckFramebufferStatus { get; private set; } - public static void LoadDelegates() + public static void Initialize() { + CheckGlVersion(); + + if (SDL.SDL_GL_ExtensionSupported("GL_EXT_framebuffer_object") == SDL.SDL_bool.SDL_FALSE) + { + OpenGL.WriteGraphicsLog("OpenRA requires the OpenGL extension GL_EXT_framebuffer_object.\n" + + "Please try updating your GPU driver to the latest version provided by the manufacturer."); + throw new InvalidProgramException("Missing OpenGL extension GL_EXT_framebuffer_object. See graphics.log for details."); + } + glFlush = Bind("glFlush"); glViewport = Bind("glViewport"); glClear = Bind("glClear"); @@ -410,6 +419,29 @@ namespace OpenRA.Platforms.Default return (T)(object)Marshal.GetDelegateForFunctionPointer(SDL.SDL_GL_GetProcAddress(name), typeof(T)); } + static void CheckGlVersion() + { + var versionString = OpenGL.glGetString(OpenGL.GL_VERSION); + var version = versionString.Contains(" ") ? versionString.Split(' ')[0].Split('.') : versionString.Split('.'); + + var major = 0; + if (version.Length > 0) + int.TryParse(version[0], out major); + + var minor = 0; + if (version.Length > 1) + int.TryParse(version[1], out minor); + + Console.WriteLine("Detected OpenGL version: {0}.{1}".F(major, minor)); + if (major < 2) + { + OpenGL.WriteGraphicsLog("OpenRA requires OpenGL version 2.0 or greater and detected {0}.{1}".F(major, minor)); + throw new InvalidProgramException("OpenGL Version Error: See graphics.log for details."); + } + + ErrorHandler.CheckGlError(); + } + public static void WriteGraphicsLog(string message) { Log.Write("graphics", message); diff --git a/OpenRA.Platforms.Default/Sdl2GraphicsDevice.cs b/OpenRA.Platforms.Default/Sdl2GraphicsDevice.cs index 0577a6587d..858aa0c0c2 100644 --- a/OpenRA.Platforms.Default/Sdl2GraphicsDevice.cs +++ b/OpenRA.Platforms.Default/Sdl2GraphicsDevice.cs @@ -76,16 +76,7 @@ namespace OpenRA.Platforms.Default if (context == IntPtr.Zero || SDL.SDL_GL_MakeCurrent(window, context) < 0) throw new InvalidOperationException("Can not create OpenGL context. (Error: {0})".F(SDL.SDL_GetError())); - OpenGL.LoadDelegates(); - ErrorHandler.CheckGlVersion(); - ErrorHandler.CheckGlError(); - - if (SDL.SDL_GL_ExtensionSupported("GL_EXT_framebuffer_object") == SDL.SDL_bool.SDL_FALSE) - { - OpenGL.WriteGraphicsLog("OpenRA requires the OpenGL extension GL_EXT_framebuffer_object.\n" - + "Please try updating your GPU driver to the latest version provided by the manufacturer."); - throw new InvalidProgramException("Missing OpenGL extension GL_EXT_framebuffer_object. See graphics.log for details."); - } + OpenGL.Initialize(); OpenGL.glEnableVertexAttribArray(Shader.VertexPosAttributeIndex); ErrorHandler.CheckGlError(); From e63fc00b7661dc47c81905de5d15cf3cb457691f Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Mon, 28 Dec 2015 11:02:22 +0000 Subject: [PATCH 3/5] Unify framebuffer api naming. --- OpenRA.Platforms.Default/ErrorHandler.cs | 29 --------- OpenRA.Platforms.Default/FrameBuffer.cs | 38 +++++------ OpenRA.Platforms.Default/OpenGL.cs | 14 +++- .../OpenRA.Platforms.Default.csproj | 1 - .../Sdl2GraphicsDevice.cs | 40 ++++++------ OpenRA.Platforms.Default/Sdl2Input.cs | 2 +- OpenRA.Platforms.Default/Shader.cs | 64 +++++++++---------- OpenRA.Platforms.Default/Texture.cs | 32 +++++----- OpenRA.Platforms.Default/VertexBuffer.cs | 14 ++-- 9 files changed, 108 insertions(+), 126 deletions(-) delete mode 100644 OpenRA.Platforms.Default/ErrorHandler.cs diff --git a/OpenRA.Platforms.Default/ErrorHandler.cs b/OpenRA.Platforms.Default/ErrorHandler.cs deleted file mode 100644 index 6b0d5afa48..0000000000 --- a/OpenRA.Platforms.Default/ErrorHandler.cs +++ /dev/null @@ -1,29 +0,0 @@ -#region Copyright & License Information -/* - * Copyright 2007-2015 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.Diagnostics; - -namespace OpenRA.Platforms.Default -{ - static class ErrorHandler - { - public static void CheckGlError() - { - var n = OpenGL.glGetError(); - if (n != OpenGL.GL_NO_ERROR) - { - var error = "GL Error: {0}\n{1}".F(n, new StackTrace()); - OpenGL.WriteGraphicsLog(error); - throw new InvalidOperationException("OpenGL Error: See graphics.log for details."); - } - } - } -} \ No newline at end of file diff --git a/OpenRA.Platforms.Default/FrameBuffer.cs b/OpenRA.Platforms.Default/FrameBuffer.cs index 7abdc417a6..f2090c6755 100644 --- a/OpenRA.Platforms.Default/FrameBuffer.cs +++ b/OpenRA.Platforms.Default/FrameBuffer.cs @@ -29,28 +29,28 @@ namespace OpenRA.Platforms.Default throw new InvalidDataException("Frame buffer size ({0}x{1}) must be a power of two".F(size.Width, size.Height)); OpenGL.glGenFramebuffersEXT(1, out framebuffer); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glBindFramebufferEXT(OpenGL.FRAMEBUFFER_EXT, framebuffer); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); // Color texture = new Texture(); texture.SetEmpty(size.Width, size.Height); OpenGL.glFramebufferTexture2DEXT(OpenGL.FRAMEBUFFER_EXT, OpenGL.COLOR_ATTACHMENT0_EXT, OpenGL.GL_TEXTURE_2D, texture.ID, 0); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); // Depth OpenGL.glGenRenderbuffersEXT(1, out depth); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glBindRenderbufferEXT(OpenGL.RENDERBUFFER_EXT, depth); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glRenderbufferStorageEXT(OpenGL.RENDERBUFFER_EXT, OpenGL.GL_DEPTH_COMPONENT, size.Width, size.Height); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glFramebufferRenderbufferEXT(OpenGL.FRAMEBUFFER_EXT, OpenGL.DEPTH_ATTACHMENT_EXT, OpenGL.RENDERBUFFER_EXT, depth); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); // Test for completeness var status = OpenGL.glCheckFramebufferStatus(OpenGL.FRAMEBUFFER_EXT); @@ -63,7 +63,7 @@ namespace OpenRA.Platforms.Default // Restore default buffer OpenGL.glBindFramebufferEXT(OpenGL.FRAMEBUFFER_EXT, 0); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } static int[] ViewportRectangle() @@ -75,7 +75,7 @@ namespace OpenRA.Platforms.Default OpenGL.glGetIntegerv(OpenGL.GL_VIEWPORT, ptr); } - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); return v; } @@ -88,26 +88,26 @@ namespace OpenRA.Platforms.Default cv = ViewportRectangle(); OpenGL.glFlush(); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glBindFramebufferEXT(OpenGL.FRAMEBUFFER_EXT, framebuffer); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glViewport(0, 0, size.Width, size.Height); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glClearColor(0, 0, 0, 0); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glClear(OpenGL.GL_COLOR_BUFFER_BIT | OpenGL.GL_DEPTH_BUFFER_BIT); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } public void Unbind() { VerifyThreadAffinity(); OpenGL.glFlush(); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glBindFramebufferEXT(OpenGL.FRAMEBUFFER_EXT, 0); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glViewport(cv[0], cv[1], cv[2], cv[3]); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } public ITexture Texture @@ -139,9 +139,9 @@ namespace OpenRA.Platforms.Default texture.Dispose(); OpenGL.glDeleteFramebuffersEXT(1, ref framebuffer); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glDeleteRenderbuffersEXT(1, ref depth); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } } } diff --git a/OpenRA.Platforms.Default/OpenGL.cs b/OpenRA.Platforms.Default/OpenGL.cs index ffb5a38d9e..d23d536881 100644 --- a/OpenRA.Platforms.Default/OpenGL.cs +++ b/OpenRA.Platforms.Default/OpenGL.cs @@ -9,6 +9,7 @@ #endregion using System; +using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; using System.Text; @@ -439,7 +440,18 @@ namespace OpenRA.Platforms.Default throw new InvalidProgramException("OpenGL Version Error: See graphics.log for details."); } - ErrorHandler.CheckGlError(); + CheckGlError(); + } + + public static void CheckGLError() + { + var n = OpenGL.glGetError(); + if (n != OpenGL.GL_NO_ERROR) + { + var error = "GL Error: {0}\n{1}".F(n, new StackTrace()); + WriteGraphicsLog(error); + throw new InvalidOperationException("OpenGL Error: See graphics.log for details."); + } } public static void WriteGraphicsLog(string message) diff --git a/OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj b/OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj index d00b2d3c9a..b71de0ca90 100644 --- a/OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj +++ b/OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj @@ -49,7 +49,6 @@ - diff --git a/OpenRA.Platforms.Default/Sdl2GraphicsDevice.cs b/OpenRA.Platforms.Default/Sdl2GraphicsDevice.cs index 858aa0c0c2..d67a02c50d 100644 --- a/OpenRA.Platforms.Default/Sdl2GraphicsDevice.cs +++ b/OpenRA.Platforms.Default/Sdl2GraphicsDevice.cs @@ -79,9 +79,9 @@ namespace OpenRA.Platforms.Default OpenGL.Initialize(); OpenGL.glEnableVertexAttribArray(Shader.VertexPosAttributeIndex); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glEnableVertexAttribArray(Shader.TexCoordAttributeIndex); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); SDL.SDL_SetModState(SDL.SDL_Keymod.KMOD_NONE); input = new Sdl2Input(); @@ -206,39 +206,39 @@ namespace OpenRA.Platforms.Default { VerifyThreadAffinity(); OpenGL.glDrawArrays(ModeFromPrimitiveType(pt), firstVertex, numVertices); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } public void Clear() { VerifyThreadAffinity(); OpenGL.glClearColor(0, 0, 0, 1); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glClear(OpenGL.GL_COLOR_BUFFER_BIT); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } public void EnableDepthBuffer() { VerifyThreadAffinity(); OpenGL.glClear(OpenGL.GL_DEPTH_BUFFER_BIT); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glEnable(OpenGL.GL_DEPTH_TEST); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } public void DisableDepthBuffer() { VerifyThreadAffinity(); OpenGL.glDisable(OpenGL.GL_DEPTH_TEST); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } public void SetBlendMode(BlendMode mode) { VerifyThreadAffinity(); OpenGL.glBlendEquation(OpenGL.GL_FUNC_ADD); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); switch (mode) { @@ -247,40 +247,40 @@ namespace OpenRA.Platforms.Default break; case BlendMode.Alpha: OpenGL.glEnable(OpenGL.GL_BLEND); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glBlendFunc(OpenGL.GL_ONE, OpenGL.GL_ONE_MINUS_SRC_ALPHA); break; case BlendMode.Additive: case BlendMode.Subtractive: OpenGL.glEnable(OpenGL.GL_BLEND); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glBlendFunc(OpenGL.GL_ONE, OpenGL.GL_ONE); if (mode == BlendMode.Subtractive) { - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glBlendEquation(OpenGL.GL_FUNC_REVERSE_SUBTRACT); } break; case BlendMode.Multiply: OpenGL.glEnable(OpenGL.GL_BLEND); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glBlendFunc(OpenGL.GL_DST_COLOR, OpenGL.GL_ONE_MINUS_SRC_ALPHA); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); break; case BlendMode.Multiplicative: OpenGL.glEnable(OpenGL.GL_BLEND); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glBlendFunc(OpenGL.GL_ZERO, OpenGL.GL_SRC_COLOR); break; case BlendMode.DoubleMultiplicative: OpenGL.glEnable(OpenGL.GL_BLEND); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glBlendFunc(OpenGL.GL_DST_COLOR, OpenGL.GL_SRC_COLOR); break; } - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } public void GrabWindowMouseFocus() @@ -306,16 +306,16 @@ namespace OpenRA.Platforms.Default height = 0; OpenGL.glScissor(left, WindowSize.Height - (top + height), width, height); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glEnable(OpenGL.GL_SCISSOR_TEST); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } public void DisableScissor() { VerifyThreadAffinity(); OpenGL.glDisable(OpenGL.GL_SCISSOR_TEST); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } public Bitmap TakeScreenshot() diff --git a/OpenRA.Platforms.Default/Sdl2Input.cs b/OpenRA.Platforms.Default/Sdl2Input.cs index 8944240c14..e0f74255b8 100644 --- a/OpenRA.Platforms.Default/Sdl2Input.cs +++ b/OpenRA.Platforms.Default/Sdl2Input.cs @@ -179,7 +179,7 @@ namespace OpenRA.Platforms.Default pendingMotion = null; } - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } } } diff --git a/OpenRA.Platforms.Default/Shader.cs b/OpenRA.Platforms.Default/Shader.cs index 0a011b7223..7b225a88ff 100644 --- a/OpenRA.Platforms.Default/Shader.cs +++ b/OpenRA.Platforms.Default/Shader.cs @@ -31,19 +31,19 @@ namespace OpenRA.Platforms.Default var code = File.ReadAllText(filename); var shader = OpenGL.glCreateShader(type); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); unsafe { var length = code.Length; OpenGL.glShaderSource(shader, 1, new string[] { code }, new IntPtr(&length)); } - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glCompileShader(shader); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); int success; OpenGL.glGetShaderiv(shader, OpenGL.GL_COMPILE_STATUS, out success); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); if (success == (int)OpenGL.GL_FALSE) { int len; @@ -66,23 +66,23 @@ namespace OpenRA.Platforms.Default // Assemble program program = OpenGL.glCreateProgram(); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glBindAttribLocation(program, VertexPosAttributeIndex, "aVertexPosition"); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glBindAttribLocation(program, TexCoordAttributeIndex, "aVertexTexCoord"); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glAttachShader(program, vertexShader); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glAttachShader(program, fragmentShader); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glLinkProgram(program); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); int success; OpenGL.glGetProgramiv(program, OpenGL.GL_LINK_STATUS, out success); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); if (success == (int)OpenGL.GL_FALSE) { int len; @@ -96,12 +96,12 @@ namespace OpenRA.Platforms.Default } OpenGL.glUseProgram(program); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); int numUniforms; OpenGL.glGetProgramiv(program, OpenGL.GL_ACTIVE_UNIFORMS, out numUniforms); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); var nextTexUnit = 0; for (var i = 0; i < numUniforms; i++) @@ -111,16 +111,16 @@ namespace OpenRA.Platforms.Default var sb = new StringBuilder(128); OpenGL.glGetActiveUniform(program, i, 128, out length, out size, out type, sb); var sampler = sb.ToString(); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); if (type == OpenGL.GL_SAMPLER_2D) { samplers.Add(sampler, nextTexUnit); var loc = OpenGL.glGetUniformLocation(program, sampler); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glUniform1i(loc, nextTexUnit); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); nextTexUnit++; } @@ -139,9 +139,9 @@ namespace OpenRA.Platforms.Default OpenGL.glBindTexture(OpenGL.GL_TEXTURE_2D, ((Texture)kv.Value).ID); } - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); a(); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } public void SetTexture(string name, ITexture t) @@ -159,40 +159,40 @@ namespace OpenRA.Platforms.Default { VerifyThreadAffinity(); OpenGL.glUseProgram(program); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); var param = OpenGL.glGetUniformLocation(program, name); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glUniform1i(param, value ? 1 : 0); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } public void SetVec(string name, float x) { VerifyThreadAffinity(); OpenGL.glUseProgram(program); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); var param = OpenGL.glGetUniformLocation(program, name); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glUniform1f(param, x); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } public void SetVec(string name, float x, float y) { VerifyThreadAffinity(); OpenGL.glUseProgram(program); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); var param = OpenGL.glGetUniformLocation(program, name); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glUniform2f(param, x, y); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } public void SetVec(string name, float[] vec, int length) { VerifyThreadAffinity(); var param = OpenGL.glGetUniformLocation(program, name); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); unsafe { fixed (float* pVec = vec) @@ -209,7 +209,7 @@ namespace OpenRA.Platforms.Default } } - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } public void SetMatrix(string name, float[] mtx) @@ -219,9 +219,9 @@ namespace OpenRA.Platforms.Default throw new InvalidDataException("Invalid 4x4 matrix"); OpenGL.glUseProgram(program); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); var param = OpenGL.glGetUniformLocation(program, name); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); unsafe { @@ -229,7 +229,7 @@ namespace OpenRA.Platforms.Default OpenGL.glUniformMatrix4fv(param, 1, false, new IntPtr(pMtx)); } - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } } } diff --git a/OpenRA.Platforms.Default/Texture.cs b/OpenRA.Platforms.Default/Texture.cs index e00d58e95c..365f1247bb 100644 --- a/OpenRA.Platforms.Default/Texture.cs +++ b/OpenRA.Platforms.Default/Texture.cs @@ -46,37 +46,37 @@ namespace OpenRA.Platforms.Default public Texture() { OpenGL.glGenTextures(1, out texture); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } public Texture(Bitmap bitmap) { OpenGL.glGenTextures(1, out texture); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); SetData(bitmap); } void PrepareTexture() { - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glBindTexture(OpenGL.GL_TEXTURE_2D, texture); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); var filter = scaleFilter == TextureScaleFilter.Linear ? OpenGL.GL_LINEAR : OpenGL.GL_NEAREST; OpenGL.glTexParameteri(OpenGL.GL_TEXTURE_2D, OpenGL.GL_TEXTURE_MAG_FILTER, (int)filter); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glTexParameteri(OpenGL.GL_TEXTURE_2D, OpenGL.GL_TEXTURE_MIN_FILTER, (int)filter); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glTexParameterf(OpenGL.GL_TEXTURE_2D, OpenGL.GL_TEXTURE_WRAP_S, (float)OpenGL.GL_CLAMP_TO_EDGE); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glTexParameterf(OpenGL.GL_TEXTURE_2D, OpenGL.GL_TEXTURE_WRAP_T, (float)OpenGL.GL_CLAMP_TO_EDGE); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glTexParameteri(OpenGL.GL_TEXTURE_2D, OpenGL.GL_TEXTURE_BASE_LEVEL, 0); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glTexParameteri(OpenGL.GL_TEXTURE_2D, OpenGL.GL_TEXTURE_MAX_LEVEL, 0); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } public void SetData(byte[] colors, int width, int height) @@ -94,7 +94,7 @@ namespace OpenRA.Platforms.Default PrepareTexture(); OpenGL.glTexImage2D(OpenGL.GL_TEXTURE_2D, 0, OpenGL.GL_RGBA8, width, height, 0, OpenGL.GL_BGRA, OpenGL.GL_UNSIGNED_BYTE, intPtr); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } } } @@ -118,7 +118,7 @@ namespace OpenRA.Platforms.Default PrepareTexture(); OpenGL.glTexImage2D(OpenGL.GL_TEXTURE_2D, 0, OpenGL.GL_RGBA8, width, height, 0, OpenGL.GL_BGRA, OpenGL.GL_UNSIGNED_BYTE, intPtr); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } } } @@ -142,7 +142,7 @@ namespace OpenRA.Platforms.Default PrepareTexture(); OpenGL.glTexImage2D(OpenGL.GL_TEXTURE_2D, 0, OpenGL.GL_RGBA8, bits.Width, bits.Height, 0, OpenGL.GL_BGRA, OpenGL.GL_UNSIGNED_BYTE, bits.Scan0); // TODO: weird strides - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); bitmap.UnlockBits(bits); } finally @@ -157,7 +157,7 @@ namespace OpenRA.Platforms.Default VerifyThreadAffinity(); var data = new byte[4 * Size.Width * Size.Height]; - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glBindTexture(OpenGL.GL_TEXTURE_2D, texture); unsafe { @@ -169,7 +169,7 @@ namespace OpenRA.Platforms.Default } } - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); return data; } @@ -183,7 +183,7 @@ namespace OpenRA.Platforms.Default PrepareTexture(); OpenGL.glTexImage2D(OpenGL.GL_TEXTURE_2D, 0, OpenGL.GL_RGBA8, width, height, 0, OpenGL.GL_BGRA, OpenGL.GL_UNSIGNED_BYTE, IntPtr.Zero); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } ~Texture() diff --git a/OpenRA.Platforms.Default/VertexBuffer.cs b/OpenRA.Platforms.Default/VertexBuffer.cs index 4e56911b99..80344cf027 100644 --- a/OpenRA.Platforms.Default/VertexBuffer.cs +++ b/OpenRA.Platforms.Default/VertexBuffer.cs @@ -23,7 +23,7 @@ namespace OpenRA.Platforms.Default public VertexBuffer(int size) { OpenGL.glGenBuffers(1, out buffer); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); Bind(); var ptr = GCHandle.Alloc(new T[size], GCHandleType.Pinned); @@ -39,7 +39,7 @@ namespace OpenRA.Platforms.Default ptr.Free(); } - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } public void SetData(T[] data, int length) @@ -64,7 +64,7 @@ namespace OpenRA.Platforms.Default ptr.Free(); } - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } public void SetData(IntPtr data, int start, int length) @@ -74,18 +74,18 @@ namespace OpenRA.Platforms.Default new IntPtr(VertexSize * start), new IntPtr(VertexSize * length), data); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } public void Bind() { VerifyThreadAffinity(); OpenGL.glBindBuffer(OpenGL.GL_ARRAY_BUFFER, buffer); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glVertexAttribPointer(Shader.VertexPosAttributeIndex, 3, OpenGL.GL_FLOAT, false, VertexSize, IntPtr.Zero); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); OpenGL.glVertexAttribPointer(Shader.TexCoordAttributeIndex, 4, OpenGL.GL_FLOAT, false, VertexSize, new IntPtr(12)); - ErrorHandler.CheckGlError(); + OpenGL.CheckGLError(); } ~VertexBuffer() From e69c3360f6c5085a49bd33caee098d5708c712aa Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Mon, 28 Dec 2015 11:18:03 +0000 Subject: [PATCH 4/5] Reorganise GL initialisation. --- OpenRA.Platforms.Default/OpenGL.cs | 209 ++++++++++++++++------------- 1 file changed, 119 insertions(+), 90 deletions(-) diff --git a/OpenRA.Platforms.Default/OpenGL.cs b/OpenRA.Platforms.Default/OpenGL.cs index d23d536881..c65de6aea4 100644 --- a/OpenRA.Platforms.Default/OpenGL.cs +++ b/OpenRA.Platforms.Default/OpenGL.cs @@ -23,6 +23,15 @@ namespace OpenRA.Platforms.Default Justification = "C-style naming is kept for consistency with the underlying native API.")] internal static class OpenGL { + public enum GLFeatures + { + None = 0, + GL2OrGreater = 1, + FramebufferExt = 4, + } + + public static GLFeatures Features { get; private set; } + public const int GL_FALSE = 0; // ClearBufferMask @@ -338,81 +347,99 @@ namespace OpenRA.Platforms.Default public static void Initialize() { - CheckGlVersion(); - - if (SDL.SDL_GL_ExtensionSupported("GL_EXT_framebuffer_object") == SDL.SDL_bool.SDL_FALSE) + // glGetError and glGetString are used in our error handlers + // so we want these to be available early. + try { - OpenGL.WriteGraphicsLog("OpenRA requires the OpenGL extension GL_EXT_framebuffer_object.\n" - + "Please try updating your GPU driver to the latest version provided by the manufacturer."); - throw new InvalidProgramException("Missing OpenGL extension GL_EXT_framebuffer_object. See graphics.log for details."); + glGetError = Bind("glGetError"); + glGetStringInternal = Bind("glGetString"); + } + catch (Exception) + { + throw new InvalidProgramException("Failed to initialize low-level OpenGL bindings. GPU information is not available"); } - glFlush = Bind("glFlush"); - glViewport = Bind("glViewport"); - glClear = Bind("glClear"); - glClearColor = Bind("glClearColor"); - glGetError = Bind("glGetError"); - glGetStringInternal = Bind("glGetString"); - glGetIntegerv = Bind("glGetIntegerv"); - glFinish = Bind("glFinish"); - glCreateProgram = Bind("glCreateProgram"); - glUseProgram = Bind("glUseProgram"); - glGetProgramiv = Bind("glGetProgramiv"); - glCreateShader = Bind("glCreateShader"); - glShaderSource = Bind("glShaderSource"); - glCompileShader = Bind("glCompileShader"); - glGetShaderiv = Bind("glGetShaderiv"); - glAttachShader = Bind("glAttachShader"); - glGetShaderInfoLog = Bind("glGetShaderInfoLog"); - glLinkProgram = Bind("glLinkProgram"); - glGetProgramInfoLog = Bind("glGetProgramInfoLog"); - glGetUniformLocation = Bind("glGetUniformLocation"); - glGetActiveUniform = Bind("glGetActiveUniform"); - glUniform1i = Bind("glUniform1i"); - glUniform1f = Bind("glUniform1f"); - glUniform2f = Bind("glUniform2f"); - glUniform1fv = Bind("glUniform1fv"); - glUniform2fv = Bind("glUniform2fv"); - glUniform3fv = Bind("glUniform3fv"); - glUniform4fv = Bind("glUniform4fv"); - glUniformMatrix4fv = Bind("glUniformMatrix4fv"); - glGenBuffers = Bind("glGenBuffers"); - glBindBuffer = Bind("glBindBuffer"); - glBufferData = Bind("glBufferData"); - glBufferSubData = Bind("glBufferSubData"); - glDeleteBuffers = Bind("glDeleteBuffers"); - glBindAttribLocation = Bind("glBindAttribLocation"); - glVertexAttribPointer = Bind("glVertexAttribPointer"); - glEnableVertexAttribArray = Bind("glEnableVertexAttribArray"); - glDisableVertexAttribArray = Bind("glDisableVertexAttribArray"); - glDrawArrays = Bind("glDrawArrays"); - glEnable = Bind("glEnable"); - glDisable = Bind("glDisable"); - glBlendEquation = Bind("glBlendEquation"); - glBlendFunc = Bind("glBlendFunc"); - glScissor = Bind("glScissor"); - glPushClientAttrib = Bind("glPushClientAttrib"); - glPopClientAttrib = Bind("glPopClientAttrib"); - glPixelStoref = Bind("glPixelStoref"); - glReadPixels = Bind("glReadPixels"); - glGenTextures = Bind("glGenTextures"); - glDeleteTextures = Bind("glDeleteTextures"); - glBindTexture = Bind("glBindTexture"); - glActiveTexture = Bind("glActiveTexture"); - glTexImage2D = Bind("glTexImage2D"); - glGetTexImage = Bind("glGetTexImage"); - glTexParameteri = Bind("glTexParameteri"); - glTexParameterf = Bind("glTexParameterf"); - glGenFramebuffersEXT = Bind("glGenFramebuffersEXT"); - glBindFramebufferEXT = Bind("glBindFramebufferEXT"); - glFramebufferTexture2DEXT = Bind("glFramebufferTexture2DEXT"); - glDeleteFramebuffersEXT = Bind("glDeleteFramebuffersEXT"); - glGenRenderbuffersEXT = Bind("glGenRenderbuffersEXT"); - glBindRenderbufferEXT = Bind("glBindRenderbufferEXT"); - glRenderbufferStorageEXT = Bind("glRenderbufferStorageEXT"); - glDeleteRenderbuffersEXT = Bind("glDeleteRenderbuffersEXT"); - glFramebufferRenderbufferEXT = Bind("glFramebufferRenderbufferEXT"); - glCheckFramebufferStatus = Bind("glCheckFramebufferStatus"); + DetectGLFeatures(); + if (!Features.HasFlag(GLFeatures.GL2OrGreater) || !Features.HasFlag(GLFeatures.FramebufferExt)) + { + WriteGraphicsLog("Unsupported OpenGL version: " + glGetString(OpenGL.GL_VERSION)); + throw new InvalidProgramException("OpenGL Version Error: See graphics.log for details."); + } + else + Console.WriteLine("OpenGL version: " + glGetString(OpenGL.GL_VERSION)); + + try + { + glFlush = Bind("glFlush"); + glViewport = Bind("glViewport"); + glClear = Bind("glClear"); + glClearColor = Bind("glClearColor"); + glGetIntegerv = Bind("glGetIntegerv"); + glFinish = Bind("glFinish"); + glCreateProgram = Bind("glCreateProgram"); + glUseProgram = Bind("glUseProgram"); + glGetProgramiv = Bind("glGetProgramiv"); + glCreateShader = Bind("glCreateShader"); + glShaderSource = Bind("glShaderSource"); + glCompileShader = Bind("glCompileShader"); + glGetShaderiv = Bind("glGetShaderiv"); + glAttachShader = Bind("glAttachShader"); + glGetShaderInfoLog = Bind("glGetShaderInfoLog"); + glLinkProgram = Bind("glLinkProgram"); + glGetProgramInfoLog = Bind("glGetProgramInfoLog"); + glGetUniformLocation = Bind("glGetUniformLocation"); + glGetActiveUniform = Bind("glGetActiveUniform"); + glUniform1i = Bind("glUniform1i"); + glUniform1f = Bind("glUniform1f"); + glUniform2f = Bind("glUniform2f"); + glUniform1fv = Bind("glUniform1fv"); + glUniform2fv = Bind("glUniform2fv"); + glUniform3fv = Bind("glUniform3fv"); + glUniform4fv = Bind("glUniform4fv"); + glUniformMatrix4fv = Bind("glUniformMatrix4fv"); + glGenBuffers = Bind("glGenBuffers"); + glBindBuffer = Bind("glBindBuffer"); + glBufferData = Bind("glBufferData"); + glBufferSubData = Bind("glBufferSubData"); + glDeleteBuffers = Bind("glDeleteBuffers"); + glBindAttribLocation = Bind("glBindAttribLocation"); + glVertexAttribPointer = Bind("glVertexAttribPointer"); + glEnableVertexAttribArray = Bind("glEnableVertexAttribArray"); + glDisableVertexAttribArray = Bind("glDisableVertexAttribArray"); + glDrawArrays = Bind("glDrawArrays"); + glEnable = Bind("glEnable"); + glDisable = Bind("glDisable"); + glBlendEquation = Bind("glBlendEquation"); + glBlendFunc = Bind("glBlendFunc"); + glScissor = Bind("glScissor"); + glPushClientAttrib = Bind("glPushClientAttrib"); + glPopClientAttrib = Bind("glPopClientAttrib"); + glPixelStoref = Bind("glPixelStoref"); + glReadPixels = Bind("glReadPixels"); + glGenTextures = Bind("glGenTextures"); + glDeleteTextures = Bind("glDeleteTextures"); + glBindTexture = Bind("glBindTexture"); + glActiveTexture = Bind("glActiveTexture"); + glTexImage2D = Bind("glTexImage2D"); + glGetTexImage = Bind("glGetTexImage"); + glTexParameteri = Bind("glTexParameteri"); + glTexParameterf = Bind("glTexParameterf"); + glGenFramebuffersEXT = Bind("glGenFramebuffersEXT"); + glBindFramebufferEXT = Bind("glBindFramebufferEXT"); + glFramebufferTexture2DEXT = Bind("glFramebufferTexture2DEXT"); + glDeleteFramebuffersEXT = Bind("glDeleteFramebuffersEXT"); + glGenRenderbuffersEXT = Bind("glGenRenderbuffersEXT"); + glBindRenderbufferEXT = Bind("glBindRenderbufferEXT"); + glRenderbufferStorageEXT = Bind("glRenderbufferStorageEXT"); + glDeleteRenderbuffersEXT = Bind("glDeleteRenderbuffersEXT"); + glFramebufferRenderbufferEXT = Bind("glFramebufferRenderbufferEXT"); + glCheckFramebufferStatus = Bind("glCheckFramebufferStatus"); + } + catch (Exception e) + { + OpenGL.WriteGraphicsLog("Failed to initialize OpenGL bindings.\nInner exception was: {0}".F(e)); + throw new InvalidProgramException("Failed to initialize OpenGL. See graphics.log for details."); + } } static T Bind(string name) @@ -420,27 +447,29 @@ namespace OpenRA.Platforms.Default return (T)(object)Marshal.GetDelegateForFunctionPointer(SDL.SDL_GL_GetProcAddress(name), typeof(T)); } - static void CheckGlVersion() + public static void DetectGLFeatures() { - var versionString = OpenGL.glGetString(OpenGL.GL_VERSION); - var version = versionString.Contains(" ") ? versionString.Split(' ')[0].Split('.') : versionString.Split('.'); - - var major = 0; - if (version.Length > 0) - int.TryParse(version[0], out major); - - var minor = 0; - if (version.Length > 1) - int.TryParse(version[1], out minor); - - Console.WriteLine("Detected OpenGL version: {0}.{1}".F(major, minor)); - if (major < 2) + try { - OpenGL.WriteGraphicsLog("OpenRA requires OpenGL version 2.0 or greater and detected {0}.{1}".F(major, minor)); - throw new InvalidProgramException("OpenGL Version Error: See graphics.log for details."); - } + var versionString = glGetString(OpenGL.GL_VERSION); + var version = versionString.Contains(" ") ? versionString.Split(' ')[0].Split('.') : versionString.Split('.'); - CheckGlError(); + var major = 0; + if (version.Length > 0) + int.TryParse(version[0], out major); + + var minor = 0; + if (version.Length > 1) + int.TryParse(version[1], out minor); + + if (major >= 2 && minor >= 0) + Features |= GLFeatures.GL2OrGreater; + + var hasFramebufferExt = SDL.SDL_GL_ExtensionSupported("GL_EXT_framebuffer_object") == SDL.SDL_bool.SDL_TRUE; + if (hasFramebufferExt) + Features |= GLFeatures.FramebufferExt; + } + catch (Exception) { } } public static void CheckGLError() From 6b0e4cf64502648478e48bd06431e5690447300a Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Mon, 28 Dec 2015 12:31:55 +0000 Subject: [PATCH 5/5] Unify framebuffer api naming. --- OpenRA.Platforms.Default/FrameBuffer.cs | 24 +++++------ OpenRA.Platforms.Default/OpenGL.cs | 56 ++++++++++++------------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/OpenRA.Platforms.Default/FrameBuffer.cs b/OpenRA.Platforms.Default/FrameBuffer.cs index f2090c6755..1e73add538 100644 --- a/OpenRA.Platforms.Default/FrameBuffer.cs +++ b/OpenRA.Platforms.Default/FrameBuffer.cs @@ -28,28 +28,28 @@ namespace OpenRA.Platforms.Default if (!Exts.IsPowerOf2(size.Width) || !Exts.IsPowerOf2(size.Height)) throw new InvalidDataException("Frame buffer size ({0}x{1}) must be a power of two".F(size.Width, size.Height)); - OpenGL.glGenFramebuffersEXT(1, out framebuffer); + OpenGL.glGenFramebuffers(1, out framebuffer); OpenGL.CheckGLError(); - OpenGL.glBindFramebufferEXT(OpenGL.FRAMEBUFFER_EXT, framebuffer); + OpenGL.glBindFramebuffer(OpenGL.FRAMEBUFFER_EXT, framebuffer); OpenGL.CheckGLError(); // Color texture = new Texture(); texture.SetEmpty(size.Width, size.Height); - OpenGL.glFramebufferTexture2DEXT(OpenGL.FRAMEBUFFER_EXT, OpenGL.COLOR_ATTACHMENT0_EXT, OpenGL.GL_TEXTURE_2D, texture.ID, 0); + OpenGL.glFramebufferTexture2D(OpenGL.FRAMEBUFFER_EXT, OpenGL.COLOR_ATTACHMENT0_EXT, OpenGL.GL_TEXTURE_2D, texture.ID, 0); OpenGL.CheckGLError(); // Depth - OpenGL.glGenRenderbuffersEXT(1, out depth); + OpenGL.glGenRenderbuffers(1, out depth); OpenGL.CheckGLError(); - OpenGL.glBindRenderbufferEXT(OpenGL.RENDERBUFFER_EXT, depth); + OpenGL.glBindRenderbuffer(OpenGL.RENDERBUFFER_EXT, depth); OpenGL.CheckGLError(); - OpenGL.glRenderbufferStorageEXT(OpenGL.RENDERBUFFER_EXT, OpenGL.GL_DEPTH_COMPONENT, size.Width, size.Height); + OpenGL.glRenderbufferStorage(OpenGL.RENDERBUFFER_EXT, OpenGL.GL_DEPTH_COMPONENT, size.Width, size.Height); OpenGL.CheckGLError(); - OpenGL.glFramebufferRenderbufferEXT(OpenGL.FRAMEBUFFER_EXT, OpenGL.DEPTH_ATTACHMENT_EXT, OpenGL.RENDERBUFFER_EXT, depth); + OpenGL.glFramebufferRenderbuffer(OpenGL.FRAMEBUFFER_EXT, OpenGL.DEPTH_ATTACHMENT_EXT, OpenGL.RENDERBUFFER_EXT, depth); OpenGL.CheckGLError(); // Test for completeness @@ -62,7 +62,7 @@ namespace OpenRA.Platforms.Default } // Restore default buffer - OpenGL.glBindFramebufferEXT(OpenGL.FRAMEBUFFER_EXT, 0); + OpenGL.glBindFramebuffer(OpenGL.FRAMEBUFFER_EXT, 0); OpenGL.CheckGLError(); } @@ -89,7 +89,7 @@ namespace OpenRA.Platforms.Default OpenGL.glFlush(); OpenGL.CheckGLError(); - OpenGL.glBindFramebufferEXT(OpenGL.FRAMEBUFFER_EXT, framebuffer); + OpenGL.glBindFramebuffer(OpenGL.FRAMEBUFFER_EXT, framebuffer); OpenGL.CheckGLError(); OpenGL.glViewport(0, 0, size.Width, size.Height); OpenGL.CheckGLError(); @@ -104,7 +104,7 @@ namespace OpenRA.Platforms.Default VerifyThreadAffinity(); OpenGL.glFlush(); OpenGL.CheckGLError(); - OpenGL.glBindFramebufferEXT(OpenGL.FRAMEBUFFER_EXT, 0); + OpenGL.glBindFramebuffer(OpenGL.FRAMEBUFFER_EXT, 0); OpenGL.CheckGLError(); OpenGL.glViewport(cv[0], cv[1], cv[2], cv[3]); OpenGL.CheckGLError(); @@ -138,9 +138,9 @@ namespace OpenRA.Platforms.Default if (disposing) texture.Dispose(); - OpenGL.glDeleteFramebuffersEXT(1, ref framebuffer); + OpenGL.glDeleteFramebuffers(1, ref framebuffer); OpenGL.CheckGLError(); - OpenGL.glDeleteRenderbuffersEXT(1, ref depth); + OpenGL.glDeleteRenderbuffers(1, ref depth); OpenGL.CheckGLError(); } } diff --git a/OpenRA.Platforms.Default/OpenGL.cs b/OpenRA.Platforms.Default/OpenGL.cs index c65de6aea4..d9973fc25d 100644 --- a/OpenRA.Platforms.Default/OpenGL.cs +++ b/OpenRA.Platforms.Default/OpenGL.cs @@ -312,35 +312,35 @@ namespace OpenRA.Platforms.Default public delegate void TexParameterf(int target, int pname, float param); public static TexParameterf glTexParameterf { get; private set; } - public delegate void GenFramebuffersEXT(int n, out uint framebuffers); - public static GenFramebuffersEXT glGenFramebuffersEXT { get; private set; } + public delegate void GenFramebuffers(int n, out uint framebuffers); + public static GenFramebuffers glGenFramebuffers { get; private set; } - public delegate void BindFramebufferEXT(int target, uint framebuffer); - public static BindFramebufferEXT glBindFramebufferEXT { get; private set; } + public delegate void BindFramebuffer(int target, uint framebuffer); + public static BindFramebuffer glBindFramebuffer { get; private set; } - public delegate void FramebufferTexture2DEXT(int target, int attachment, + public delegate void FramebufferTexture2D(int target, int attachment, int textarget, uint texture, int level); - public static FramebufferTexture2DEXT glFramebufferTexture2DEXT { get; private set; } + public static FramebufferTexture2D glFramebufferTexture2D { get; private set; } - public delegate void DeleteFramebuffersEXT(int n, ref uint framebuffers); - public static DeleteFramebuffersEXT glDeleteFramebuffersEXT { get; private set; } + public delegate void DeleteFramebuffers(int n, ref uint framebuffers); + public static DeleteFramebuffers glDeleteFramebuffers { get; private set; } - public delegate void GenRenderbuffersEXT(int n, out uint renderbuffers); - public static GenRenderbuffersEXT glGenRenderbuffersEXT { get; private set; } + public delegate void GenRenderbuffers(int n, out uint renderbuffers); + public static GenRenderbuffers glGenRenderbuffers { get; private set; } - public delegate void BindRenderbufferEXT(int target, uint renderbuffer); - public static BindRenderbufferEXT glBindRenderbufferEXT { get; private set; } + public delegate void BindRenderbuffer(int target, uint renderbuffer); + public static BindRenderbuffer glBindRenderbuffer { get; private set; } - public delegate void RenderbufferStorageEXT(int target, int internalformat, + public delegate void RenderbufferStorage(int target, int internalformat, int width, int height); - public static RenderbufferStorageEXT glRenderbufferStorageEXT { get; private set; } + public static RenderbufferStorage glRenderbufferStorage { get; private set; } - public delegate void DeleteRenderbuffersEXT(int n, ref uint renderbuffers); - public static DeleteRenderbuffersEXT glDeleteRenderbuffersEXT { get; private set; } + public delegate void DeleteRenderbuffers(int n, ref uint renderbuffers); + public static DeleteRenderbuffers glDeleteRenderbuffers { get; private set; } - public delegate void FramebufferRenderbufferEXT(int target, int attachment, + public delegate void FramebufferRenderbuffer(int target, int attachment, int renderbuffertarget, uint renderbuffer); - public static FramebufferRenderbufferEXT glFramebufferRenderbufferEXT { get; private set; } + public static FramebufferRenderbuffer glFramebufferRenderbuffer { get; private set; } public delegate int CheckFramebufferStatus(int target); public static CheckFramebufferStatus glCheckFramebufferStatus { get; private set; } @@ -424,16 +424,16 @@ namespace OpenRA.Platforms.Default glGetTexImage = Bind("glGetTexImage"); glTexParameteri = Bind("glTexParameteri"); glTexParameterf = Bind("glTexParameterf"); - glGenFramebuffersEXT = Bind("glGenFramebuffersEXT"); - glBindFramebufferEXT = Bind("glBindFramebufferEXT"); - glFramebufferTexture2DEXT = Bind("glFramebufferTexture2DEXT"); - glDeleteFramebuffersEXT = Bind("glDeleteFramebuffersEXT"); - glGenRenderbuffersEXT = Bind("glGenRenderbuffersEXT"); - glBindRenderbufferEXT = Bind("glBindRenderbufferEXT"); - glRenderbufferStorageEXT = Bind("glRenderbufferStorageEXT"); - glDeleteRenderbuffersEXT = Bind("glDeleteRenderbuffersEXT"); - glFramebufferRenderbufferEXT = Bind("glFramebufferRenderbufferEXT"); - glCheckFramebufferStatus = Bind("glCheckFramebufferStatus"); + glGenFramebuffers = Bind("glGenFramebuffersEXT"); + glBindFramebuffer = Bind("glBindFramebufferEXT"); + glFramebufferTexture2D = Bind("glFramebufferTexture2DEXT"); + glDeleteFramebuffers = Bind("glDeleteFramebuffersEXT"); + glGenRenderbuffers = Bind("glGenRenderbuffersEXT"); + glBindRenderbuffer = Bind("glBindRenderbufferEXT"); + glRenderbufferStorage = Bind("glRenderbufferStorageEXT"); + glDeleteRenderbuffers = Bind("glDeleteRenderbuffersEXT"); + glFramebufferRenderbuffer = Bind("glFramebufferRenderbufferEXT"); + glCheckFramebufferStatus = Bind("glCheckFramebufferStatusEXT"); } catch (Exception e) {