diff options
| author | Roland Scheidegger <[email protected]> | 2006-08-19 08:54:03 +0000 |
|---|---|---|
| committer | Roland Scheidegger <[email protected]> | 2006-08-19 08:54:03 +0000 |
| commit | bd4c8ec0ec1edcc96fe841ccc7159b7856ade5c1 (patch) | |
| tree | bf32db5b8a0dd66ecfb2f4dd06a74253d3aa3e35 /src/mesa | |
| parent | c6fc82398722a165da4c5b89359035222b946d89 (diff) | |
remove the now confusing option to manually enable software ARB_vp if drm is not new enough on r200
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_context.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_screen.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c index 0e85b9680ce..7a8f270160f 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/src/mesa/drivers/dri/r200/r200_context.c @@ -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 ); diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c index 0a1c0bbc38b..154b40300fa 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c @@ -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[]; |