Skip to content

Commit

Permalink
Merge branch 'develop3d' of https://github.com/mono/MonoGame into dev…
Browse files Browse the repository at this point in the history
…elop3d
  • Loading branch information
Alexandre Zollinger Chohfi committed Nov 30, 2012
2 parents 34bbc10 + 045d1dc commit 0cb4b7c
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions MonoGame.Framework/Graphics/Texture2D.cs
Expand Up @@ -72,7 +72,9 @@ 1. Definitions
using TextureMinFilter = OpenTK.Graphics.ES20.All;
using PixelInternalFormat = OpenTK.Graphics.ES20.All;
using PixelType = OpenTK.Graphics.ES20.All;
using PixelStoreParameter = OpenTK.Graphics.ES20.All;
using ErrorCode = OpenTK.Graphics.ES20.All;

#endif

using Microsoft.Xna.Framework.Content;
Expand Down Expand Up @@ -348,7 +350,7 @@ public int Height
else
{
// Set pixel alignment to match texel size in bytes
GL.PixelStore(All.UnpackAlignment, GraphicsExtensions.Size(this.Format));
GL.PixelStore(PixelStoreParameter.UnpackAlignment, GraphicsExtensions.Size(this.Format));
if (rect.HasValue)
{
GL.TexSubImage2D(TextureTarget.Texture2D, level,
Expand All @@ -368,7 +370,7 @@ public int Height
GraphicsExtensions.CheckGLError();
}
// Return to default pixel alignment
GL.PixelStore(All.UnpackAlignment, 4);
GL.PixelStore(PixelStoreParameter.UnpackAlignment, 4);
}
#if !ANDROID
Expand Down

0 comments on commit 0cb4b7c

Please sign in to comment.