ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-07-10 15:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Break up Id property into distinct methods.

Browse source
This commit is contained in:
the_fiddler 2008-11-29 18:04:15 +00:00
parent 2abc0461b0
commit 9f3919e0be
1 changed files with 36 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
Source/Utilities/Graphics/Texture2D.cs
View file

@ -116,7 +116,6 @@ namespace OpenTK.Graphics
throw new ArgumentNullException("data"); throw new ArgumentNullException("data");
GraphicsUnit unit = GraphicsUnit.Pixel; GraphicsUnit unit = GraphicsUnit.Pixel;
if (!bitmap.GetBounds(ref unit).Contains(source)) if (!bitmap.GetBounds(ref unit).Contains(source))
throw new InvalidOperationException("The source Rectangle is larger than the Bitmap."); throw new InvalidOperationException("The source Rectangle is larger than the Bitmap.");
@ -211,6 +210,40 @@ namespace OpenTK.Graphics
#endregion #endregion
#region Private Members
int CreateTexture(int width, int height)
{
int id = GL.GenTexture();
if (id == 0)
throw new GraphicsResourceException(String.Format("Texture creation failed, (Error: {0})", GL.GetError()));
GL.TexImage2D(TextureTarget.Texture2D, 0, InternalFormat, Width, Height, 0,
OpenTK.Graphics.PixelFormat.Rgba, PixelType.UnsignedByte, IntPtr.Zero);
return id;
}
void SetDefaultTextureParameters(int id)
{
// Ensure the texture is allocated.
GL.BindTexture(TextureTarget.Texture2D, id);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)All.Linear);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)All.Linear);
if (GL.SupportsExtension("Version12"))
{
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapS, (int)All.ClampToEdge);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapT, (int)All.ClampToEdge);
}
else
{
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapS, (int)All.Clamp);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapT, (int)All.Clamp);
}
}
#endregion
#region IGraphicsResource Members #region IGraphicsResource Members
#region IGraphicsResource.Context #region IGraphicsResource.Context
@ -230,27 +263,8 @@ namespace OpenTK.Graphics
GraphicsContext.Assert(); GraphicsContext.Assert();
context = GraphicsContext.CurrentContext; context = GraphicsContext.CurrentContext;
id = GL.GenTexture(); id = CreateTexture(Width, Height);
if (id == 0) SetDefaultTextureParameters(id);
throw new GraphicsResourceException(String.Format("Texture creation failed, (Error: {0})", GL.GetError()));
// Ensure the texture is allocated.
GL.BindTexture(TextureTarget.Texture2D, id);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)All.Linear);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)All.Linear);
if (GL.SupportsExtension("Version12"))
{
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapS, (int)All.ClampToEdge);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapT, (int)All.ClampToEdge);
}
else
{
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapS, (int)All.Clamp);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapT, (int)All.Clamp);
}
GL.TexImage2D(TextureTarget.Texture2D, 0, InternalFormat, Width, Height, 0,
OpenTK.Graphics.PixelFormat.Rgba, PixelType.UnsignedByte, IntPtr.Zero);
} }
return id; return id;