Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Don't enforce native fragment programs on modern hardware. Fixes water for the open source ATI/AMD driver, which reports fragment programs as not native (as they are translated to modern hardware).

Browse source
This commit is contained in:
kaetemi 2014-06-21 06:41:14 +02:00
parent c5d8bd6ec4
commit 8172d78b1b
3 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
code/nel/src/3d/driver/opengl/driver_opengl.cpp
View file

@ -484,6 +484,11 @@ bool CDriverGL::setupDisplay()
#endif #endif
} }
if (_Extensions.ARBFragmentShader)
{
_ForceNativeFragmentPrograms = false;
}
_VertexProgramEnabled= false; _VertexProgramEnabled= false;
_PixelProgramEnabled= false; _PixelProgramEnabled= false;
_LastSetupGLArrayVertexProgram= false; _LastSetupGLArrayVertexProgram= false;

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

@ -1249,6 +1249,15 @@ static bool setupNVFragmentProgram2(const char *glext)
return true; return true;
} }
// *********************************
static bool setupARBFragmentShader(const char *glext)
{
H_AUTO_OGL(setupNVFragmentProgram2);
CHECK_EXT("GL_ARB_fragment_shader");
return true;
}
// *************************************************************************** // ***************************************************************************
static bool setupARBVertexBufferObject(const char *glext) static bool setupARBVertexBufferObject(const char *glext)
{ {
@ -1627,7 +1636,7 @@ void registerGlExtensions(CGlExtensions &ext)
{ {
ext.NVVertexProgram = setupNVVertexProgram(glext); ext.NVVertexProgram = setupNVVertexProgram(glext);
ext.EXTVertexShader = setupEXTVertexShader(glext); ext.EXTVertexShader = setupEXTVertexShader(glext);
ext.ARBVertexProgram= setupARBVertexProgram(glext); ext.ARBVertexProgram = setupARBVertexProgram(glext);
} }
else else
{ {
@ -1642,6 +1651,7 @@ void registerGlExtensions(CGlExtensions &ext)
{ {
ext.ARBFragmentProgram = setupARBFragmentProgram(glext); ext.ARBFragmentProgram = setupARBFragmentProgram(glext);
ext.NVFragmentProgram2 = setupNVFragmentProgram2(glext); ext.NVFragmentProgram2 = setupNVFragmentProgram2(glext);
ext.ARBFragmentShader = setupARBFragmentShader(glext);
} }
else else
{ {

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

@ -104,6 +104,7 @@ struct CGlExtensions
bool ARBVertexProgram; bool ARBVertexProgram;
bool ARBTextureNonPowerOfTwo; bool ARBTextureNonPowerOfTwo;
bool ARBMultisample; bool ARBMultisample;
bool ARBFragmentShader;
// NV Pixel Programs // NV Pixel Programs
bool NVFragmentProgram2; bool NVFragmentProgram2;
@ -178,6 +179,7 @@ public:
ARBTextureRectangle = false; ARBTextureRectangle = false;
ARBTextureNonPowerOfTwo = false; ARBTextureNonPowerOfTwo = false;
ARBMultisample = false; ARBMultisample = false;
ARBFragmentShader = false;
NVOcclusionQuery = false; NVOcclusionQuery = false;
ARBOcclusionQuery = false; ARBOcclusionQuery = false;
FrameBufferObject = false; FrameBufferObject = false;