diff options
| author | Dave Airlie <airliedfreedesktop.org> | 2005-02-26 05:24:04 +0000 |
|---|---|---|
| committer | Dave Airlie <airliedfreedesktop.org> | 2005-02-26 05:24:04 +0000 |
| commit | 4932ba28adc2694161ec3fa7964cd76e3742182a (patch) | |
| tree | 4d70710c4952a66ed323a478cf38ba76397358ae /src/mesa/drivers/dri/r200 | |
| parent | 8ca515097f4ea661fd7c2def5b608e2591cccf28 (diff) | |
Add a dri config option to enable the max texture level hack
make ycbcr depend on a CHIPSET define .. needs to be filled in though
Diffstat (limited to 'src/mesa/drivers/dri/r200')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_context.c | 13 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_screen.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_screen.h | 1 |
3 files changed, 13 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c index 25f9d2cb96..bc50f3de68 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/src/mesa/drivers/dri/r200/r200_context.c @@ -365,6 +365,13 @@ GLboolean r200CreateContext( const __GLcontextModes *glVisual, 12, GL_FALSE ); + /* adjust max texture size a bit. Hack, but I really want to use larger textures + which will work just fine in 99.999999% of all cases, especially with texture compression... */ + if (driQueryOptionb( &rmesa->optionCache, "texture_level_hack" )) + { + if (ctx->Const.MaxTextureLevels < 12) ctx->Const.MaxTextureLevels += 1; + } + ctx->Const.MaxTextureMaxAnisotropy = 16.0; /* No wide points. @@ -415,9 +422,9 @@ GLboolean r200CreateContext( const __GLcontextModes *glVisual, _math_matrix_set_identity( &rmesa->tmpmat ); driInitExtensions( ctx, card_extensions, GL_TRUE ); - if (rmesa->r200Screen->chipset & R200_CHIPSET_REAL_R200) { - /* yuv textures only work with r200 chips for unknown reasons, the - others get the bit ordering right but don't actually do YUV-RGB conversion */ + if (!rmesa->r200Screen->chipset & R200_CHIPSET_YCBCR_BROKEN) { + /* yuv textures don't work with some chips - R200 / rv280 okay so far + others get the bit ordering right but don't actually do YUV-RGB conversion */ _mesa_enable_extension( ctx, "GL_MESA_ycbcr_texture" ); } if (rmesa->glCtx->Mesa_DXTn) { diff --git a/src/mesa/drivers/dri/r200/r200_screen.c b/src/mesa/drivers/dri/r200/r200_screen.c index 76d7016092..103d5d3384 100644 --- a/src/mesa/drivers/dri/r200/r200_screen.c +++ b/src/mesa/drivers/dri/r200/r200_screen.c @@ -73,6 +73,7 @@ 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_TEXTURE_LEVEL_HACK(false) DRI_CONF_SECTION_END DRI_CONF_SECTION_DEBUG DRI_CONF_NO_RAST(false) @@ -82,7 +83,7 @@ DRI_CONF_BEGIN DRI_CONF_NV_VERTEX_PROGRAM(false) DRI_CONF_SECTION_END DRI_CONF_END; -static const GLuint __driNConfigOptions = 15; +static const GLuint __driNConfigOptions = 16; #if 1 /* Including xf86PciInfo.h introduces a bunch of errors... diff --git a/src/mesa/drivers/dri/r200/r200_screen.h b/src/mesa/drivers/dri/r200/r200_screen.h index fa8c33faad..fdfb21a6c5 100644 --- a/src/mesa/drivers/dri/r200/r200_screen.h +++ b/src/mesa/drivers/dri/r200/r200_screen.h @@ -52,6 +52,7 @@ typedef struct { /* chipset features */ #define R200_CHIPSET_TCL (1 << 0) #define R200_CHIPSET_REAL_R200 (1 << 1) +#define R200_CHIPSET_YCBCR_BROKEN (1 << 2) #define R200_NR_TEX_HEAPS 2 |