diff options
author | Eric Anholt <[email protected]> | 2014-04-23 15:30:27 -0700 |
---|---|---|
committer | Eric Anholt <[email protected]> | 2014-04-30 14:33:17 -0700 |
commit | c703658b3965bf2e4f3593a0d54be03e8e8b1436 (patch) | |
tree | b5b6b201cbc4816dec9b6f51c0da3570b50585a3 /src/mesa/drivers/common | |
parent | 3dfe56c53bc7f37b65b72408fe3470ecfd218595 (diff) |
mesa: Drop _EnabledUnits.
The field wasn't really valid, since we've got more than 32 units now. It
turns out it was mostly just used for checking != 0, or checking for fixed
function coordinates, though.
v2: Fix mis-conversion in xm_line.c (caught by Ken).
Reviewed-by: Matt Turner <[email protected]> (v1)
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers/common')
-rw-r--r-- | src/mesa/drivers/common/meta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index ac27abba6af..0f0cfc752e1 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -2328,7 +2328,7 @@ _mesa_meta_Bitmap(struct gl_context *ctx, if (ctx->_ImageTransferState || ctx->FragmentProgram._Enabled || ctx->Fog.Enabled || - ctx->Texture._EnabledUnits || + ctx->Texture._MaxEnabledTexImageUnit != -1 || width > tex->MaxSize || height > tex->MaxSize) { _swrast_Bitmap(ctx, x, y, width, height, unpack, bitmap1); |