remove the now confusing option to manually enable software ARB_vp if drm is not new enough on r200

This commit is contained in:
Roland Scheidegger 2006-08-19 08:54:03 +00:00
parent c6fc823987
commit bd4c8ec0ec
2 changed files with 2 additions and 4 deletions

View file

@ -478,8 +478,7 @@ GLboolean r200CreateContext( const __GLcontextModes *glVisual,
if (rmesa->r200Screen->drmSupportsBlendColor) {
driInitExtensions( ctx, blend_extensions, GL_FALSE );
}
if(rmesa->r200Screen->drmSupportsVertexProgram ||
driQueryOptionb(&rmesa->optionCache, "arb_vertex_program"))
if(rmesa->r200Screen->drmSupportsVertexProgram)
driInitSingleExtension( ctx, ARB_vp_extension );
if(driQueryOptionb(&rmesa->optionCache, "nv_vertex_program"))
driInitSingleExtension( ctx, NV_vp_extension );

View file

@ -121,11 +121,10 @@ DRI_CONF_BEGIN
DRI_CONF_NO_RAST(false)
DRI_CONF_SECTION_END
DRI_CONF_SECTION_SOFTWARE
DRI_CONF_ARB_VERTEX_PROGRAM(false)
DRI_CONF_NV_VERTEX_PROGRAM(false)
DRI_CONF_SECTION_END
DRI_CONF_END;
static const GLuint __driNConfigOptions = 17;
static const GLuint __driNConfigOptions = 16;
extern const struct dri_extension blend_extensions[];
extern const struct dri_extension ARB_vp_extension[];