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.
This commit is contained in:
parent
76a9831b2b
commit
0943706d35
|
@ -350,6 +350,8 @@ GLboolean r200CreateContext( const __GLcontextModes *glVisual,
|
|||
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");
|
||||
|
||||
/* FIXME: When no memory manager is available we should set this
|
||||
|
|
|
@ -333,6 +333,10 @@ static void r300InitConstValues(GLcontext *ctx, radeonScreenPtr screen)
|
|||
driQueryOptioni(&r300->radeon.optionCache, "texture_coord_units");
|
||||
ctx->Const.MaxTextureUnits = MIN2(ctx->Const.MaxTextureImageUnits,
|
||||
ctx->Const.MaxTextureCoordUnits);
|
||||
ctx->Const.MaxCombinedTextureImageUnits =
|
||||
ctx->Const.MaxVertexTextureImageUnits +
|
||||
ctx->Const.MaxTextureImageUnits;
|
||||
|
||||
|
||||
ctx->Const.MaxTextureMaxAnisotropy = 16.0;
|
||||
ctx->Const.MaxTextureLodBias = 16.0;
|
||||
|
|
|
@ -249,6 +249,10 @@ static void r600InitConstValues(GLcontext *ctx, radeonScreenPtr screen)
|
|||
ctx->Const.MaxTextureUnits =
|
||||
MIN2(ctx->Const.MaxTextureImageUnits,
|
||||
ctx->Const.MaxTextureCoordUnits);
|
||||
ctx->Const.MaxCombinedTextureImageUnits =
|
||||
ctx->Const.MaxVertexTextureImageUnits +
|
||||
ctx->Const.MaxTextureImageUnits;
|
||||
|
||||
ctx->Const.MaxTextureMaxAnisotropy = 16.0;
|
||||
ctx->Const.MaxTextureLodBias = 16.0;
|
||||
|
||||
|
|
|
@ -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");
|
||||
|
||||
|
|
Loading…
Reference in New Issue