From 0943706d35e3955cacbc3b690cfb1e2dfb78d639 Mon Sep 17 00:00:00 2001 From: Pauli Nieminen Date: Sun, 7 Feb 2010 03:06:27 +0200 Subject: r100/r200/r300/r600: Set MaxCombinedTextureImageunits. Fixes glActiveTexture to set GL_INVALID_ENUM when trying to activate texture unit that is not available. piglit test case general/texunit passes now. --- src/mesa/drivers/dri/radeon/radeon_context.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/mesa/drivers/dri/radeon') diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index 86c91f19bb..475e93bc05 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_context.c @@ -279,6 +279,7 @@ r100CreateContext( const __GLcontextModes *glVisual, "texture_units"); ctx->Const.MaxTextureImageUnits = ctx->Const.MaxTextureUnits; ctx->Const.MaxTextureCoordUnits = ctx->Const.MaxTextureUnits; + ctx->Const.MaxCombinedTextureImageUnits = ctx->Const.MaxTextureUnits; i = driQueryOptioni( &rmesa->radeon.optionCache, "allow_large_textures"); -- cgit v1.2.3