Fixed: Removed some temporary fixes for system OpenGL drivers bugs
This commit is contained in:
parent
fb03ba45a1
commit
f057b12488
3 changed files with 0 additions and 20 deletions
code/nel/src/3d/driver/opengl
|
@ -1378,11 +1378,6 @@ void registerGlExtensions(CGlExtensions &ext)
|
|||
// Check ATIXTextureEnvRoute
|
||||
ext.ATIXTextureEnvRoute= setupATIXTextureEnvRoute(glext);
|
||||
|
||||
if (ext.ATITextureEnvCombine3)
|
||||
{
|
||||
ext.IsATI9500OrAbove = setupARBFragmentProgram(glext);
|
||||
}
|
||||
|
||||
// ARB extensions
|
||||
// -------------
|
||||
if(!ext.DisableHardwareVertexArrayAGP)
|
||||
|
@ -1390,8 +1385,6 @@ void registerGlExtensions(CGlExtensions &ext)
|
|||
ext.ARBVertexBufferObject = setupARBVertexBufferObject(glext);
|
||||
}
|
||||
|
||||
ext.IsGeforceFXOrAbove = setupNVVertexProgram(glext) && setupARBFragmentProgram(glext);
|
||||
|
||||
// fix for radeon 7200 -> disable agp
|
||||
if (ext.NbTextureStages == 3 && (ext.ATIVertexArrayObject || ext.ARBVertexBufferObject))
|
||||
{
|
||||
|
|
|
@ -115,11 +115,6 @@ struct CGlExtensions
|
|||
bool ARBVertexProgram;
|
||||
bool ARBTextureNonPowerOfTwo;
|
||||
|
||||
// hint : is it an ATI 9500 or above ?
|
||||
bool IsATI9500OrAbove;
|
||||
// hint : is it a GeForce FX or above ?
|
||||
bool IsGeforceFXOrAbove;
|
||||
|
||||
public:
|
||||
|
||||
/// \name Disable Hardware feature. False by default. setuped by IDriver
|
||||
|
@ -182,18 +177,12 @@ public:
|
|||
DisableHardwareVertexProgram= false;
|
||||
DisableHardwareVertexArrayAGP= false;
|
||||
DisableHardwareTextureShader= false;
|
||||
|
||||
// misc
|
||||
IsATI9500OrAbove = false;
|
||||
IsGeforceFXOrAbove = false;
|
||||
};
|
||||
|
||||
std::string toString()
|
||||
{
|
||||
std::string result = "OpenGL version ";
|
||||
result += Version1_2 ? "1.2 or above(*)" : "1.1 or below";
|
||||
result += IsATI9500OrAbove ? "; ATI9500 or better" : "";
|
||||
result += IsGeforceFXOrAbove ? "; GeForce FX or better" : "";
|
||||
result += "; Available extensions:";
|
||||
|
||||
result += "\n Texturing: ";
|
||||
|
|
|
@ -157,8 +157,6 @@ void CDriverGL::enableLight (uint8 num, bool enable)
|
|||
{
|
||||
H_AUTO_OGL(CDriverGL_enableLight )
|
||||
// User call => set the User flag
|
||||
// Geforce FX tmp fix
|
||||
if (_Extensions.IsGeforceFXOrAbove && num >=3) return;
|
||||
if(num<_MaxDriverLight)
|
||||
{
|
||||
_UserLightEnable[num]= enable;
|
||||
|
|
Loading…
Reference in a new issue