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

Unify framebuffer api naming.

Browse Source
This commit is contained in:
Paul Chote
2015-12-28 12:31:55 +00:00
parent e69c3360f6
commit 6b0e4cf645
2 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenRA.Platforms.Default/FrameBuffer.cs
View File

@@ -28,28 +28,28 @@ namespace OpenRA.Platforms.Default
if (!Exts.IsPowerOf2(size.Width) || !Exts.IsPowerOf2(size.Height)) 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)); 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.CheckGLError();
OpenGL.glBindFramebufferEXT(OpenGL.FRAMEBUFFER_EXT, framebuffer); OpenGL.glBindFramebuffer(OpenGL.FRAMEBUFFER_EXT, framebuffer);
OpenGL.CheckGLError(); OpenGL.CheckGLError();
// Color // Color
texture = new Texture(); texture = new Texture();
texture.SetEmpty(size.Width, size.Height); 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(); OpenGL.CheckGLError();
// Depth // Depth
OpenGL.glGenRenderbuffersEXT(1, out depth); OpenGL.glGenRenderbuffers(1, out depth);
OpenGL.CheckGLError(); OpenGL.CheckGLError();
OpenGL.glBindRenderbufferEXT(OpenGL.RENDERBUFFER_EXT, depth); OpenGL.glBindRenderbuffer(OpenGL.RENDERBUFFER_EXT, depth);
OpenGL.CheckGLError(); 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.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(); OpenGL.CheckGLError();
// Test for completeness // Test for completeness
@@ -62,7 +62,7 @@ namespace OpenRA.Platforms.Default
} }
// Restore default buffer // Restore default buffer
OpenGL.glBindFramebufferEXT(OpenGL.FRAMEBUFFER_EXT, 0); OpenGL.glBindFramebuffer(OpenGL.FRAMEBUFFER_EXT, 0);
OpenGL.CheckGLError(); OpenGL.CheckGLError();
} }
@@ -89,7 +89,7 @@ namespace OpenRA.Platforms.Default
OpenGL.glFlush(); OpenGL.glFlush();
OpenGL.CheckGLError(); OpenGL.CheckGLError();
OpenGL.glBindFramebufferEXT(OpenGL.FRAMEBUFFER_EXT, framebuffer); OpenGL.glBindFramebuffer(OpenGL.FRAMEBUFFER_EXT, framebuffer);
OpenGL.CheckGLError(); OpenGL.CheckGLError();
OpenGL.glViewport(0, 0, size.Width, size.Height); OpenGL.glViewport(0, 0, size.Width, size.Height);
OpenGL.CheckGLError(); OpenGL.CheckGLError();
@@ -104,7 +104,7 @@ namespace OpenRA.Platforms.Default
VerifyThreadAffinity(); VerifyThreadAffinity();
OpenGL.glFlush(); OpenGL.glFlush();
OpenGL.CheckGLError(); OpenGL.CheckGLError();
OpenGL.glBindFramebufferEXT(OpenGL.FRAMEBUFFER_EXT, 0); OpenGL.glBindFramebuffer(OpenGL.FRAMEBUFFER_EXT, 0);
OpenGL.CheckGLError(); OpenGL.CheckGLError();
OpenGL.glViewport(cv[0], cv[1], cv[2], cv[3]); OpenGL.glViewport(cv[0], cv[1], cv[2], cv[3]);
OpenGL.CheckGLError(); OpenGL.CheckGLError();
@@ -138,9 +138,9 @@ namespace OpenRA.Platforms.Default
if (disposing) if (disposing)
texture.Dispose(); texture.Dispose();
OpenGL.glDeleteFramebuffersEXT(1, ref framebuffer); OpenGL.glDeleteFramebuffers(1, ref framebuffer);
OpenGL.CheckGLError(); OpenGL.CheckGLError();
OpenGL.glDeleteRenderbuffersEXT(1, ref depth); OpenGL.glDeleteRenderbuffers(1, ref depth);
OpenGL.CheckGLError(); OpenGL.CheckGLError();
} }
} }

56
OpenRA.Platforms.Default/OpenGL.cs
View File

@@ -312,35 +312,35 @@ namespace OpenRA.Platforms.Default
public delegate void TexParameterf(int target, int pname, float param); public delegate void TexParameterf(int target, int pname, float param);
public static TexParameterf glTexParameterf { get; private set; } public static TexParameterf glTexParameterf { get; private set; }
public delegate void GenFramebuffersEXT(int n, out uint framebuffers); public delegate void GenFramebuffers(int n, out uint framebuffers);
public static GenFramebuffersEXT glGenFramebuffersEXT { get; private set; } public static GenFramebuffers glGenFramebuffers { get; private set; }
public delegate void BindFramebufferEXT(int target, uint framebuffer); public delegate void BindFramebuffer(int target, uint framebuffer);
public static BindFramebufferEXT glBindFramebufferEXT { get; private set; } 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); 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 delegate void DeleteFramebuffers(int n, ref uint framebuffers);
public static DeleteFramebuffersEXT glDeleteFramebuffersEXT { get; private set; } public static DeleteFramebuffers glDeleteFramebuffers { get; private set; }
public delegate void GenRenderbuffersEXT(int n, out uint renderbuffers); public delegate void GenRenderbuffers(int n, out uint renderbuffers);
public static GenRenderbuffersEXT glGenRenderbuffersEXT { get; private set; } public static GenRenderbuffers glGenRenderbuffers { get; private set; }
public delegate void BindRenderbufferEXT(int target, uint renderbuffer); public delegate void BindRenderbuffer(int target, uint renderbuffer);
public static BindRenderbufferEXT glBindRenderbufferEXT { get; private set; } 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); 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 delegate void DeleteRenderbuffers(int n, ref uint renderbuffers);
public static DeleteRenderbuffersEXT glDeleteRenderbuffersEXT { get; private set; } 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); 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 delegate int CheckFramebufferStatus(int target);
public static CheckFramebufferStatus glCheckFramebufferStatus { get; private set; } public static CheckFramebufferStatus glCheckFramebufferStatus { get; private set; }
@@ -424,16 +424,16 @@ namespace OpenRA.Platforms.Default
glGetTexImage = Bind<GetTexImage>("glGetTexImage"); glGetTexImage = Bind<GetTexImage>("glGetTexImage");
glTexParameteri = Bind<TexParameteri>("glTexParameteri"); glTexParameteri = Bind<TexParameteri>("glTexParameteri");
glTexParameterf = Bind<TexParameterf>("glTexParameterf"); glTexParameterf = Bind<TexParameterf>("glTexParameterf");
glGenFramebuffersEXT = Bind<GenFramebuffersEXT>("glGenFramebuffersEXT"); glGenFramebuffers = Bind<GenFramebuffers>("glGenFramebuffersEXT");
glBindFramebufferEXT = Bind<BindFramebufferEXT>("glBindFramebufferEXT"); glBindFramebuffer = Bind<BindFramebuffer>("glBindFramebufferEXT");
glFramebufferTexture2DEXT = Bind<FramebufferTexture2DEXT>("glFramebufferTexture2DEXT"); glFramebufferTexture2D = Bind<FramebufferTexture2D>("glFramebufferTexture2DEXT");
glDeleteFramebuffersEXT = Bind<DeleteFramebuffersEXT>("glDeleteFramebuffersEXT"); glDeleteFramebuffers = Bind<DeleteFramebuffers>("glDeleteFramebuffersEXT");
glGenRenderbuffersEXT = Bind<GenRenderbuffersEXT>("glGenRenderbuffersEXT"); glGenRenderbuffers = Bind<GenRenderbuffers>("glGenRenderbuffersEXT");
glBindRenderbufferEXT = Bind<BindRenderbufferEXT>("glBindRenderbufferEXT"); glBindRenderbuffer = Bind<BindRenderbuffer>("glBindRenderbufferEXT");
glRenderbufferStorageEXT = Bind<RenderbufferStorageEXT>("glRenderbufferStorageEXT"); glRenderbufferStorage = Bind<RenderbufferStorage>("glRenderbufferStorageEXT");
glDeleteRenderbuffersEXT = Bind<DeleteRenderbuffersEXT>("glDeleteRenderbuffersEXT"); glDeleteRenderbuffers = Bind<DeleteRenderbuffers>("glDeleteRenderbuffersEXT");
glFramebufferRenderbufferEXT = Bind<FramebufferRenderbufferEXT>("glFramebufferRenderbufferEXT"); glFramebufferRenderbuffer = Bind<FramebufferRenderbuffer>("glFramebufferRenderbufferEXT");
glCheckFramebufferStatus = Bind<CheckFramebufferStatus>("glCheckFramebufferStatus"); glCheckFramebufferStatus = Bind<CheckFramebufferStatus>("glCheckFramebufferStatusEXT");
} }
catch (Exception e) catch (Exception e)
{ {