Better fix for older OpenGL versions
This commit is contained in:
1 parent
e8f85454e8
commit
f950b1f3ad
3 files changed
+5
-34
No files matched your search
@@ -52,7 +52,6 @@ namespace Vocaluxe.Base
|
|||||||
public static int ScreenH = 576;
|
public static int ScreenH = 576;
|
||||||
|
|
||||||
public static EAntiAliasingModes AAMode = EAntiAliasingModes.X0;
|
public static EAntiAliasingModes AAMode = EAntiAliasingModes.X0;
|
||||||
public static EColorDepth ColorDepth = EColorDepth.Bit32;
|
|
||||||
|
|
||||||
public static EOffOn VSync = EOffOn.TR_CONFIG_ON;
|
public static EOffOn VSync = EOffOn.TR_CONFIG_ON;
|
||||||
public static EOffOn FullScreen = EOffOn.TR_CONFIG_ON;
|
public static EOffOn FullScreen = EOffOn.TR_CONFIG_ON;
|
||||||
@@ -166,7 +165,6 @@ namespace Vocaluxe.Base
|
|||||||
xmlReader.TryGetIntValue("//root/Graphics/ScreenW", ref ScreenW);
|
xmlReader.TryGetIntValue("//root/Graphics/ScreenW", ref ScreenW);
|
||||||
xmlReader.TryGetIntValue("//root/Graphics/ScreenH", ref ScreenH);
|
xmlReader.TryGetIntValue("//root/Graphics/ScreenH", ref ScreenH);
|
||||||
xmlReader.TryGetEnumValue("//root/Graphics/AAMode", ref AAMode);
|
xmlReader.TryGetEnumValue("//root/Graphics/AAMode", ref AAMode);
|
||||||
xmlReader.TryGetEnumValue("//root/Graphics/Colors", ref ColorDepth);
|
|
||||||
xmlReader.TryGetFloatValue("//root/Graphics/MaxFPS", ref MaxFPS);
|
xmlReader.TryGetFloatValue("//root/Graphics/MaxFPS", ref MaxFPS);
|
||||||
xmlReader.TryGetEnumValue("//root/Graphics/VSync", ref VSync);
|
xmlReader.TryGetEnumValue("//root/Graphics/VSync", ref VSync);
|
||||||
xmlReader.TryGetEnumValue("//root/Graphics/FullScreen", ref FullScreen);
|
xmlReader.TryGetEnumValue("//root/Graphics/FullScreen", ref FullScreen);
|
||||||
@@ -330,9 +328,6 @@ namespace Vocaluxe.Base
|
|||||||
writer.WriteComment("AAMode: " + CHelper.ListStrings(Enum.GetNames(typeof(EAntiAliasingModes))));
|
writer.WriteComment("AAMode: " + CHelper.ListStrings(Enum.GetNames(typeof(EAntiAliasingModes))));
|
||||||
writer.WriteElementString("AAMode", Enum.GetName(typeof(EAntiAliasingModes), AAMode));
|
writer.WriteElementString("AAMode", Enum.GetName(typeof(EAntiAliasingModes), AAMode));
|
||||||
|
|
||||||
writer.WriteComment("Colors: " + CHelper.ListStrings(Enum.GetNames(typeof(EColorDepth))));
|
|
||||||
writer.WriteElementString("Colors", Enum.GetName(typeof(EColorDepth), ColorDepth));
|
|
||||||
|
|
||||||
writer.WriteComment("MaxFPS should be between 1..200");
|
writer.WriteComment("MaxFPS should be between 1..200");
|
||||||
writer.WriteElementString("MaxFPS", MaxFPS.ToString("#"));
|
writer.WriteElementString("MaxFPS", MaxFPS.ToString("#"));
|
||||||
|
|
||||||
|
|||||||
@@ -83,8 +83,6 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
private SClientRect _Restore;
|
private SClientRect _Restore;
|
||||||
private bool _Fullscreen;
|
private bool _Fullscreen;
|
||||||
|
|
||||||
private bool _IsV3OrHigher;
|
|
||||||
|
|
||||||
private readonly Dictionary<int, STexture> _Textures;
|
private readonly Dictionary<int, STexture> _Textures;
|
||||||
private readonly Queue<int> _IDs;
|
private readonly Queue<int> _IDs;
|
||||||
private readonly List<STextureQueue> _Queue;
|
private readonly List<STextureQueue> _Queue;
|
||||||
@@ -112,12 +110,11 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
|
|
||||||
//Check AA Mode
|
//Check AA Mode
|
||||||
CConfig.AAMode = (EAntiAliasingModes)_CheckAntiAliasingMode((int)CConfig.AAMode);
|
CConfig.AAMode = (EAntiAliasingModes)_CheckAntiAliasingMode((int)CConfig.AAMode);
|
||||||
CConfig.ColorDepth = (EColorDepth)_CheckColorDepth((int)CConfig.ColorDepth);
|
|
||||||
|
|
||||||
bool ok = false;
|
bool ok = false;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
GraphicsMode gm = new GraphicsMode((int)CConfig.ColorDepth, 24, 0, (int)CConfig.AAMode);
|
GraphicsMode gm = new GraphicsMode(32, 24, 0, (int)CConfig.AAMode);
|
||||||
_Control = new GLControl(gm, 2, 1, GraphicsContextFlags.Default);
|
_Control = new GLControl(gm, 2, 1, GraphicsContextFlags.Default);
|
||||||
if (_Control.GraphicsMode != null)
|
if (_Control.GraphicsMode != null)
|
||||||
ok = true;
|
ok = true;
|
||||||
@@ -156,7 +153,6 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
|
|
||||||
ClientSize = new Size(CConfig.ScreenW, CConfig.ScreenH);
|
ClientSize = new Size(CConfig.ScreenW, CConfig.ScreenH);
|
||||||
CenterToScreen();
|
CenterToScreen();
|
||||||
_IsV3OrHigher = int.Parse(GL.GetString(OpenTK.Graphics.OpenGL.StringName.Version)[0].ToString()) >= 3;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#region Helpers
|
#region Helpers
|
||||||
@@ -759,8 +755,6 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
|
|
||||||
BitmapData bmpData = bmp2.LockBits(new Rectangle(0, 0, bmp2.Width, bmp2.Height), ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
|
BitmapData bmpData = bmp2.LockBits(new Rectangle(0, 0, bmp2.Width, bmp2.Height), ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
|
||||||
|
|
||||||
if (!_IsV3OrHigher)
|
|
||||||
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.GenerateMipmap, 1);
|
|
||||||
GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, (int)texture.W2, (int)texture.H2, 0, PixelFormat.Bgra, PixelType.UnsignedByte, IntPtr.Zero);
|
GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, (int)texture.W2, (int)texture.H2, 0, PixelFormat.Bgra, PixelType.UnsignedByte, IntPtr.Zero);
|
||||||
|
|
||||||
GL.TexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, bmpData.Width, bmpData.Height, PixelFormat.Bgra, PixelType.UnsignedByte, bmpData.Scan0);
|
GL.TexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, bmpData.Width, bmpData.Height, PixelFormat.Bgra, PixelType.UnsignedByte, bmpData.Scan0);
|
||||||
@@ -780,8 +774,7 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Linear);
|
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Linear);
|
||||||
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.LinearMipmapLinear);
|
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.LinearMipmapLinear);
|
||||||
//GL.GenerateMipmap(GenerateMipmapTarget.Texture2D);
|
//GL.GenerateMipmap(GenerateMipmapTarget.Texture2D);
|
||||||
if (_IsV3OrHigher)
|
GL.Ext.GenerateMipmap(GenerateMipmapTarget.Texture2D);
|
||||||
GL.Ext.GenerateMipmap(GenerateMipmapTarget.Texture2D);
|
|
||||||
|
|
||||||
|
|
||||||
// Add to Texture List
|
// Add to Texture List
|
||||||
@@ -959,8 +952,6 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
GL.UnmapBuffer(BufferTarget.PixelUnpackBuffer);
|
GL.UnmapBuffer(BufferTarget.PixelUnpackBuffer);
|
||||||
|
|
||||||
GL.BindTexture(TextureTarget.Texture2D, texture.ID);
|
GL.BindTexture(TextureTarget.Texture2D, texture.ID);
|
||||||
if (!_IsV3OrHigher)
|
|
||||||
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.GenerateMipmap, 1);
|
|
||||||
GL.TexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, (int)texture.Width, (int)texture.Height, PixelFormat.Bgra, PixelType.UnsignedByte, IntPtr.Zero);
|
GL.TexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, (int)texture.Width, (int)texture.Height, PixelFormat.Bgra, PixelType.UnsignedByte, IntPtr.Zero);
|
||||||
|
|
||||||
GL.BindTexture(TextureTarget.Texture2D, 0);
|
GL.BindTexture(TextureTarget.Texture2D, 0);
|
||||||
@@ -985,9 +976,8 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Linear);
|
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Linear);
|
||||||
|
|
||||||
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.LinearMipmapLinear);
|
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.LinearMipmapLinear);
|
||||||
if (_IsV3OrHigher)
|
//GL.GenerateMipmap(GenerateMipmapTarget.Texture2D);
|
||||||
//GL.GenerateMipmap(GenerateMipmapTarget.Texture2D);
|
GL.Ext.GenerateMipmap(GenerateMipmapTarget.Texture2D);
|
||||||
GL.Ext.GenerateMipmap(GenerateMipmapTarget.Texture2D);
|
|
||||||
|
|
||||||
GL.BindTexture(TextureTarget.Texture2D, 0);
|
GL.BindTexture(TextureTarget.Texture2D, 0);
|
||||||
|
|
||||||
@@ -1381,9 +1371,6 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
texture.WidthRatio = texture.Width / texture.W2;
|
texture.WidthRatio = texture.Width / texture.W2;
|
||||||
texture.HeightRatio = texture.Height / texture.H2;
|
texture.HeightRatio = texture.Height / texture.H2;
|
||||||
|
|
||||||
if (!_IsV3OrHigher)
|
|
||||||
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.GenerateMipmap, 1);
|
|
||||||
|
|
||||||
GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, (int)texture.W2, (int)texture.H2, 0, PixelFormat.Bgra, PixelType.UnsignedByte, IntPtr.Zero);
|
GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, (int)texture.W2, (int)texture.H2, 0, PixelFormat.Bgra, PixelType.UnsignedByte, IntPtr.Zero);
|
||||||
|
|
||||||
GL.TexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, q.Width, q.Height, PixelFormat.Bgra, PixelType.UnsignedByte, q.Data);
|
GL.TexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, q.Width, q.Height, PixelFormat.Bgra, PixelType.UnsignedByte, q.Data);
|
||||||
@@ -1395,8 +1382,7 @@ namespace Vocaluxe.Lib.Draw
|
|||||||
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Linear);
|
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Linear);
|
||||||
|
|
||||||
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.LinearMipmapLinear);
|
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.LinearMipmapLinear);
|
||||||
if (!_IsV3OrHigher)
|
GL.Ext.GenerateMipmap(GenerateMipmapTarget.Texture2D);
|
||||||
GL.Ext.GenerateMipmap(GenerateMipmapTarget.Texture2D);
|
|
||||||
|
|
||||||
GL.BindTexture(TextureTarget.Texture2D, 0);
|
GL.BindTexture(TextureTarget.Texture2D, 0);
|
||||||
|
|
||||||
|
|||||||
@@ -93,16 +93,6 @@ namespace VocaluxeLib.Menu
|
|||||||
X32 = 32
|
X32 = 32
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum EColorDepth
|
|
||||||
{
|
|
||||||
// ReSharper disable UnusedMember.Global
|
|
||||||
Bit8 = 8,
|
|
||||||
Bit16 = 16,
|
|
||||||
Bit24 = 24,
|
|
||||||
Bit32 = 32
|
|
||||||
// ReSharper restore UnusedMember.Global
|
|
||||||
}
|
|
||||||
|
|
||||||
public enum ETextureQuality
|
public enum ETextureQuality
|
||||||
{
|
{
|
||||||
// ReSharper disable InconsistentNaming
|
// ReSharper disable InconsistentNaming
|
||||||
|
|||||||
Reference in new issue
Block a user