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/dri/i915 | |
| 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/dri/i915')
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_pixel.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_pixel_copy.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_pixel.c b/src/mesa/drivers/dri/i915/intel_pixel.c index da2f783b8e2..6f139e19e11 100644 --- a/src/mesa/drivers/dri/i915/intel_pixel.c +++ b/src/mesa/drivers/dri/i915/intel_pixel.c @@ -77,7 +77,7 @@ intel_check_blit_fragment_ops(struct gl_context * ctx, bool src_alpha_is_one) return false; } - if (ctx->Texture._EnabledUnits) { + if (ctx->Texture._MaxEnabledTexImageUnit != -1) { DBG("fallback due to texturing\n"); return false; } diff --git a/src/mesa/drivers/dri/i915/intel_pixel_copy.c b/src/mesa/drivers/dri/i915/intel_pixel_copy.c index 6cfdc923b37..e7b53535177 100644 --- a/src/mesa/drivers/dri/i915/intel_pixel_copy.c +++ b/src/mesa/drivers/dri/i915/intel_pixel_copy.c @@ -117,7 +117,7 @@ do_blit_copypixels(struct gl_context * ctx, } if (ctx->Fog.Enabled || - ctx->Texture._EnabledUnits || + ctx->Texture._MaxEnabledTexImageUnit != -1 || ctx->FragmentProgram._Enabled) { perf_debug("glCopyPixels(): Unsupported fragment shader state\n"); return false; |