diff options
| author | Pauli Nieminen <suokkos@gmail.com> | 2010-02-07 03:06:27 +0200 |
|---|---|---|
| committer | Pauli Nieminen <suokkos@gmail.com> | 2010-02-07 13:13:23 +0200 |
| commit | 0943706d35e3955cacbc3b690cfb1e2dfb78d639 (patch) | |
| tree | 8428ef4aea41d9013e584976006aea96c4fbacbd /src/mesa/drivers/dri/r200 | |
| parent | 76a9831b2b20d59c49b5f25ba5275f17b4e2067b (diff) | |
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.
Diffstat (limited to 'src/mesa/drivers/dri/r200')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_context.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c index 31910253dd..8986191c39 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/src/mesa/drivers/dri/r200/r200_context.c @@ -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 |