NormalizedByte SurfaceFormat verification

flibitijibibo · Apr 23, 2015 · 27a3c31 · 27a3c31
1 parent 9d6f3f6
commit 27a3c31
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/Graphics/OpenGLDevice.cs b/src/Graphics/OpenGLDevice.cs
@@ -3298,8 +3298,8 @@ private static class XNAToGL
 				{ SurfaceFormat.Dxt1,			GLenum.GL_COMPRESSED_TEXTURE_FORMATS },
 				{ SurfaceFormat.Dxt3,			GLenum.GL_COMPRESSED_TEXTURE_FORMATS },
 				{ SurfaceFormat.Dxt5,			GLenum.GL_COMPRESSED_TEXTURE_FORMATS },
-				{ SurfaceFormat.NormalizedByte2,	GLenum.GL_RG }, // Unconfirmed!
-				{ SurfaceFormat.NormalizedByte4,	GLenum.GL_RGBA }, // Unconfirmed!
+				{ SurfaceFormat.NormalizedByte2,	GLenum.GL_RG },
+				{ SurfaceFormat.NormalizedByte4,	GLenum.GL_RGBA },
 				{ SurfaceFormat.Rgba1010102,		GLenum.GL_RGBA },
 				{ SurfaceFormat.Rg32,			GLenum.GL_RG },
 				{ SurfaceFormat.Rgba64,			GLenum.GL_RGBA },
@@ -3322,8 +3322,8 @@ private static class XNAToGL
 				{ SurfaceFormat.Dxt1,			GLenum.GL_COMPRESSED_RGBA_S3TC_DXT1_EXT },
 				{ SurfaceFormat.Dxt3,			GLenum.GL_COMPRESSED_RGBA_S3TC_DXT3_EXT },
 				{ SurfaceFormat.Dxt5,			GLenum.GL_COMPRESSED_RGBA_S3TC_DXT5_EXT },
-				{ SurfaceFormat.NormalizedByte2,	GLenum.GL_RG8I }, // Unconfirmed!
-				{ SurfaceFormat.NormalizedByte4,	GLenum.GL_RGBA8I }, // Unconfirmed!
+				{ SurfaceFormat.NormalizedByte2,	GLenum.GL_RG },
+				{ SurfaceFormat.NormalizedByte4,	GLenum.GL_RGBA },
 				{ SurfaceFormat.Rgba1010102,		GLenum.GL_RGB10_A2_EXT },
 				{ SurfaceFormat.Rg32,			GLenum.GL_RG16 },
 				{ SurfaceFormat.Rgba64,			GLenum.GL_RGBA16 },
@@ -3344,8 +3344,8 @@ private static class XNAToGL
 				{ SurfaceFormat.Bgra5551,		GLenum.GL_UNSIGNED_SHORT_5_5_5_1 },
 				{ SurfaceFormat.Bgra4444,		GLenum.GL_UNSIGNED_SHORT_4_4_4_4 },
 				// Ignoring Dxt1, Dxt3, Dxt5
-				{ SurfaceFormat.NormalizedByte2,	GLenum.GL_BYTE }, // Unconfirmed!
-				{ SurfaceFormat.NormalizedByte4,	GLenum.GL_BYTE }, // Unconfirmed!
+				{ SurfaceFormat.NormalizedByte2,	GLenum.GL_BYTE },
+				{ SurfaceFormat.NormalizedByte4,	GLenum.GL_BYTE },
 				{ SurfaceFormat.Rgba1010102,		GLenum.GL_UNSIGNED_INT_10_10_10_2 },
 				{ SurfaceFormat.Rg32,			GLenum.GL_UNSIGNED_SHORT },
 				{ SurfaceFormat.Rgba64,			GLenum.GL_UNSIGNED_SHORT },

diff --git a/src/Graphics/OpenGLDevice_GL.cs b/src/Graphics/OpenGLDevice_GL.cs
@@ -148,11 +148,9 @@ internal enum GLenum : int
 			GL_R32F =				0x822E,
 			GL_RG16F =				0x822F,
 			GL_RG32F =				0x8230,
-			GL_RG8I =				0x8237,
 			GL_RGBA32F =				0x8814,
 			GL_RGBA16F =				0x881A,
 			GL_DEPTH24_STENCIL8 =			0x88F0,
-			GL_RGBA8I =				0x8D8E,
 			GL_COMPRESSED_TEXTURE_FORMATS =		0x86A3,
 			GL_COMPRESSED_RGBA_S3TC_DXT1_EXT =	0x83F1,
 			GL_COMPRESSED_RGBA_S3TC_DXT3_EXT =	0x83F2,