aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2025-01-02 06:03:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: Removed some temporary fixes for system OpenGL drivers bugs

Browse source
This commit is contained in:
kervala 2010-12-08 13:43:53 +01:00
parent fb03ba45a1
commit f057b12488
3 changed files with 0 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
code/nel/src/3d/driver/opengl/driver_opengl_extension.cpp
View file

@ -1378,11 +1378,6 @@ void registerGlExtensions(CGlExtensions &ext)
// Check ATIXTextureEnvRoute // Check ATIXTextureEnvRoute
ext.ATIXTextureEnvRoute= setupATIXTextureEnvRoute(glext); ext.ATIXTextureEnvRoute= setupATIXTextureEnvRoute(glext);
if (ext.ATITextureEnvCombine3)
{
ext.IsATI9500OrAbove = setupARBFragmentProgram(glext);
}
// ARB extensions // ARB extensions
// ------------- // -------------
if(!ext.DisableHardwareVertexArrayAGP) if(!ext.DisableHardwareVertexArrayAGP)
@ -1390,8 +1385,6 @@ void registerGlExtensions(CGlExtensions &ext)
ext.ARBVertexBufferObject = setupARBVertexBufferObject(glext); ext.ARBVertexBufferObject = setupARBVertexBufferObject(glext);
} }
ext.IsGeforceFXOrAbove = setupNVVertexProgram(glext) && setupARBFragmentProgram(glext);
// fix for radeon 7200 -> disable agp // fix for radeon 7200 -> disable agp
if (ext.NbTextureStages == 3 && (ext.ATIVertexArrayObject || ext.ARBVertexBufferObject)) if (ext.NbTextureStages == 3 && (ext.ATIVertexArrayObject || ext.ARBVertexBufferObject))
{ {

11
code/nel/src/3d/driver/opengl/driver_opengl_extension.h
View file

@ -115,11 +115,6 @@ struct CGlExtensions
bool ARBVertexProgram; bool ARBVertexProgram;
bool ARBTextureNonPowerOfTwo; bool ARBTextureNonPowerOfTwo;
// hint : is it an ATI 9500 or above ?
bool IsATI9500OrAbove;
// hint : is it a GeForce FX or above ?
bool IsGeforceFXOrAbove;
public: public:
/// \name Disable Hardware feature. False by default. setuped by IDriver /// \name Disable Hardware feature. False by default. setuped by IDriver
@ -182,18 +177,12 @@ public:
DisableHardwareVertexProgram= false; DisableHardwareVertexProgram= false;
DisableHardwareVertexArrayAGP= false; DisableHardwareVertexArrayAGP= false;
DisableHardwareTextureShader= false; DisableHardwareTextureShader= false;
// misc
IsATI9500OrAbove = false;
IsGeforceFXOrAbove = false;
}; };
std::string toString() std::string toString()
{ {
std::string result = "OpenGL version "; std::string result = "OpenGL version ";
result += Version1_2 ? "1.2 or above(*)" : "1.1 or below"; 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 += "; Available extensions:";
result += "\n Texturing: "; result += "\n Texturing: ";

2
code/nel/src/3d/driver/opengl/driver_opengl_light.cpp
View file

@ -157,8 +157,6 @@ void CDriverGL::enableLight (uint8 num, bool enable)
{ {
H_AUTO_OGL(CDriverGL_enableLight ) H_AUTO_OGL(CDriverGL_enableLight )
// User call => set the User flag // User call => set the User flag
// Geforce FX tmp fix
if (_Extensions.IsGeforceFXOrAbove && num >=3) return;
if(num<_MaxDriverLight) if(num<_MaxDriverLight)
{ {
_UserLightEnable[num]= enable; _UserLightEnable[num]= enable;