Merge with default

--HG--
branch : opengl3
hg/feature/opengl3
kaetemi 11 years ago
commit 1896876b11

@ -1711,10 +1711,13 @@ void registerGlExtensions(CGlExtensions &ext)
// ARB extensions // ARB extensions
// ------------- // -------------
if(!ext.DisableHardwareVertexArrayAGP) if (!ext.DisableHardwareVertexArrayAGP)
{ {
ext.ARBVertexBufferObject = setupARBVertexBufferObject(glext); ext.ARBVertexBufferObject = setupARBVertexBufferObject(glext);
ext.ARBMapBufferRange = setupARBMapBufferRange(glext); if (ext.ARBVertexBufferObject)
{
ext.ARBMapBufferRange = setupARBMapBufferRange(glext);
}
} }
// fix for radeon 7200 -> disable agp // fix for radeon 7200 -> disable agp

@ -168,6 +168,7 @@ public:
EXTVertexShader= false; EXTVertexShader= false;
ARBFragmentProgram = false; ARBFragmentProgram = false;
ARBVertexBufferObject = false; ARBVertexBufferObject = false;
ARBMapBufferRange = false;
ARBVertexProgram = false; ARBVertexProgram = false;
NVTextureRectangle = false; NVTextureRectangle = false;
EXTTextureRectangle = false; EXTTextureRectangle = false;

Loading…
Cancel
Save