From d7361f294379c3b6d7f17c06fd520a6fd3ee7cb9 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 26 Jun 2013 12:55:32 -0700 Subject: [PATCH] mesa: Remove unused allow_large_textures driconf from classic drivers. This option hasn't been used since the introduction of DRI2. Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i915/intel_screen.c | 3 +-- src/mesa/drivers/dri/i965/intel_screen.c | 3 +-- src/mesa/drivers/dri/r200/r200_context.c | 7 ------- src/mesa/drivers/dri/radeon/radeon_context.c | 8 -------- src/mesa/drivers/dri/radeon/radeon_screen.c | 6 ++---- 5 files changed, 4 insertions(+), 23 deletions(-) diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c index 7bb2e4ea353..30a867e029e 100644 --- a/src/mesa/drivers/dri/i915/intel_screen.c +++ b/src/mesa/drivers/dri/i915/intel_screen.c @@ -61,7 +61,6 @@ PUBLIC const char __driConfigOptions[] = DRI_CONF_SECTION_END DRI_CONF_SECTION_QUALITY DRI_CONF_FORCE_S3TC_ENABLE("false") - DRI_CONF_ALLOW_LARGE_TEXTURES(2) DRI_CONF_SECTION_END DRI_CONF_SECTION_DEBUG DRI_CONF_NO_RAST("false") @@ -78,7 +77,7 @@ PUBLIC const char __driConfigOptions[] = DRI_CONF_SECTION_END DRI_CONF_END; -const GLuint __driNConfigOptions = 13; +const GLuint __driNConfigOptions = 12; #include "intel_batchbuffer.h" #include "intel_buffers.h" diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c index e207300dca3..ffcb6eccf7b 100644 --- a/src/mesa/drivers/dri/i965/intel_screen.c +++ b/src/mesa/drivers/dri/i965/intel_screen.c @@ -61,7 +61,6 @@ PUBLIC const char __driConfigOptions[] = DRI_CONF_SECTION_END DRI_CONF_SECTION_QUALITY DRI_CONF_FORCE_S3TC_ENABLE("false") - DRI_CONF_ALLOW_LARGE_TEXTURES(2) DRI_CONF_SECTION_END DRI_CONF_SECTION_DEBUG DRI_CONF_NO_RAST("false") @@ -78,7 +77,7 @@ PUBLIC const char __driConfigOptions[] = DRI_CONF_SECTION_END DRI_CONF_END; -const GLuint __driNConfigOptions = 13; +const GLuint __driNConfigOptions = 12; #include "intel_batchbuffer.h" #include "intel_buffers.h" diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c index 7730566c1f6..b2e1f36e187 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/src/mesa/drivers/dri/r200/r200_context.c @@ -298,11 +298,6 @@ GLboolean r200CreateContext( gl_api api, _swsetup_CreateContext( ctx ); _ae_create_context( ctx ); - /* Set the maximum texture size small enough that we can guarentee that - * all texture units can bind a maximal texture and have all of them in - * texturable memory at once. Depending on the allow_large_textures driconf - * setting allow larger textures. - */ ctx->Const.MaxTextureUnits = driQueryOptioni (&rmesa->radeon.optionCache, "texture_units"); ctx->Const.FragmentProgram.MaxTextureImageUnits = ctx->Const.MaxTextureUnits; @@ -312,8 +307,6 @@ GLboolean r200CreateContext( gl_api api, ctx->Const.StripTextureBorder = GL_TRUE; - i = driQueryOptioni( &rmesa->radeon.optionCache, "allow_large_textures"); - /* FIXME: When no memory manager is available we should set this * to some reasonable value based on texture memory pool size */ ctx->Const.MaxTextureLevels = 12; diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index d9f4841e3a6..60c39fa8532 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_context.c @@ -261,12 +261,6 @@ r100CreateContext( gl_api api, _swsetup_CreateContext( ctx ); _ae_create_context( ctx ); - /* Set the maximum texture size small enough that we can guarentee that - * all texture units can bind a maximal texture and have all of them in - * texturable memory at once. Depending on the allow_large_textures driconf - * setting allow larger textures. - */ - ctx->Const.MaxTextureUnits = driQueryOptioni (&rmesa->radeon.optionCache, "texture_units"); ctx->Const.FragmentProgram.MaxTextureImageUnits = ctx->Const.MaxTextureUnits; @@ -275,8 +269,6 @@ r100CreateContext( gl_api api, ctx->Const.StripTextureBorder = GL_TRUE; - i = driQueryOptioni( &rmesa->radeon.optionCache, "allow_large_textures"); - /* FIXME: When no memory manager is available we should set this * to some reasonable value based on texture memory pool size */ ctx->Const.MaxTextureLevels = 12; diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c index 04cb7afabba..e7a27cf6a6d 100644 --- a/src/mesa/drivers/dri/radeon/radeon_screen.c +++ b/src/mesa/drivers/dri/radeon/radeon_screen.c @@ -90,13 +90,12 @@ DRI_CONF_BEGIN DRI_CONF_COLOR_REDUCTION(DRI_CONF_COLOR_REDUCTION_DITHER) DRI_CONF_ROUND_MODE(DRI_CONF_ROUND_TRUNC) DRI_CONF_DITHER_MODE(DRI_CONF_DITHER_XERRORDIFF) - DRI_CONF_ALLOW_LARGE_TEXTURES(2) DRI_CONF_SECTION_END DRI_CONF_SECTION_DEBUG DRI_CONF_NO_RAST("false") DRI_CONF_SECTION_END DRI_CONF_END; -static const GLuint __driNConfigOptions = 15; +static const GLuint __driNConfigOptions = 14; #elif defined(RADEON_R200) @@ -118,14 +117,13 @@ DRI_CONF_BEGIN DRI_CONF_COLOR_REDUCTION(DRI_CONF_COLOR_REDUCTION_DITHER) DRI_CONF_ROUND_MODE(DRI_CONF_ROUND_TRUNC) DRI_CONF_DITHER_MODE(DRI_CONF_DITHER_XERRORDIFF) - DRI_CONF_ALLOW_LARGE_TEXTURES(2) DRI_CONF_TEXTURE_BLEND_QUALITY(1.0,"0.0:1.0") DRI_CONF_SECTION_END DRI_CONF_SECTION_DEBUG DRI_CONF_NO_RAST("false") DRI_CONF_SECTION_END DRI_CONF_END; -static const GLuint __driNConfigOptions = 16; +static const GLuint __driNConfigOptions = 15; #endif -- 2.30.2