Cleanup extensions

--HG--
branch : opengl3
hg/feature/opengl3
kaetemi 11 years ago
parent b12c15ab5d
commit b978ec5c8e

@ -373,11 +373,6 @@ bool CDriverGL3::setupDisplay()
#endif // NL_OS_WINDOWS #endif // NL_OS_WINDOWS
// Check required extensions!! // Check required extensions!!
if (!_Extensions.ARBShaderObjects)
{
nlwarning("Missing Required GL extension: GL_ARB_shader_objects. Update your driver");
throw EBadDisplay("Missing Required GL extension: GL_ARB_shader_objects. Update your driver");
}
if (!_Extensions.ARBSeparateShaderObjects) if (!_Extensions.ARBSeparateShaderObjects)
{ {
nlwarning("Missing Required GL extension: GL_ARB_separate_shader_objects. Update your driver"); nlwarning("Missing Required GL extension: GL_ARB_separate_shader_objects. Update your driver");
@ -385,7 +380,7 @@ bool CDriverGL3::setupDisplay()
} }
// ARBMultiTexture is a OpenGL 1.2 required extension. // ARBMultiTexture is a OpenGL 1.2 required extension.
if (!_Extensions.ARBMultiTexture) /*if (!_Extensions.ARBMultiTexture)
{ {
nlwarning("Missing Required GL extension: GL_ARB_multitexture. Update your driver"); nlwarning("Missing Required GL extension: GL_ARB_multitexture. Update your driver");
throw EBadDisplay("Missing Required GL extension: GL_ARB_multitexture. Update your driver"); throw EBadDisplay("Missing Required GL extension: GL_ARB_multitexture. Update your driver");
@ -394,7 +389,7 @@ bool CDriverGL3::setupDisplay()
if (!_Extensions.EXTTextureEnvCombine) if (!_Extensions.EXTTextureEnvCombine)
{ {
nlwarning("Missing Important GL extension: GL_EXT_texture_env_combine => All envcombine are setup to GL_MODULATE!!!"); nlwarning("Missing Important GL extension: GL_EXT_texture_env_combine => All envcombine are setup to GL_MODULATE!!!");
} }*/
// Get num of light for this driver // Get num of light for this driver
int numLight; int numLight;

@ -1000,6 +1000,9 @@ void registerGlExtensions(CGlExtensions &ext)
// Check GL_ARB_separate_shader_objects // Check GL_ARB_separate_shader_objects
ext.ARBSeparateShaderObjects = setupARBSeparateShaderObjects(glext); ext.ARBSeparateShaderObjects = setupARBSeparateShaderObjects(glext);
// Check GL_ARB_vertex_buffer_object
ext.ARBVertexBufferObject = setupARBVertexBufferObject(glext);
// Check ARBMultiTexture // Check ARBMultiTexture
ext.ARBMultiTexture= setupARBMultiTexture(glext); ext.ARBMultiTexture= setupARBMultiTexture(glext);
if (ext.ARBMultiTexture) if (ext.ARBMultiTexture)
@ -1080,8 +1083,6 @@ void registerGlExtensions(CGlExtensions &ext)
ext.ATITextureEnvCombine3= setupATITextureEnvCombine3(glext); ext.ATITextureEnvCombine3= setupATITextureEnvCombine3(glext);
// Check ATIXTextureEnvRoute // Check ATIXTextureEnvRoute
ext.ATIXTextureEnvRoute= setupATIXTextureEnvRoute(glext); ext.ATIXTextureEnvRoute= setupATIXTextureEnvRoute(glext);
setupARBVertexBufferObject(glext);
} }

@ -38,6 +38,8 @@ struct CGlExtensions
// Required Extensions. // Required Extensions.
bool ARBShaderObjects; bool ARBShaderObjects;
bool ARBSeparateShaderObjects; bool ARBSeparateShaderObjects;
bool ARBVertexBufferObject;
bool ARBMultiTexture; bool ARBMultiTexture;
uint NbTextureStages; uint NbTextureStages;
bool EXTTextureEnvCombine; bool EXTTextureEnvCombine;

Loading…
Cancel
Save