diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2014-07-08 16:13:58 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2014-11-13 19:13:27 +0200 |
| commit | 81c31e560f230eddb5c081b5526c43258c12a8ac (patch) | |
| tree | 9d545791035c3b99606e84ade9b2a6fd48bffeed | |
| parent | 4747b2638c785337fccec2f17ef77fc870e68c2e (diff) | |
i915: Don't call _mesa_meta_glsl_Clear() on gen2
Gen2 doesn't have fragment shaders so we shouldn't be calling
_mesa_meta_glsl_Clear() on gen2. Restore the appropriate
ARB_fragment_shader check to the clear path which was lost in:
commit 94f22fbe787214580a1a13a774114d2650c166cb
Author: Tapani Pälli <tapani.palli@intel.com>
Date: Wed Aug 8 20:46:45 2012 +0300
intel: use _mesa_meta_Clear with OpenGL ES 1.1 v2
v2: Fix spelling in commit message
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_clear.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_clear.c b/src/mesa/drivers/dri/i915/intel_clear.c index 1762c1d5a0b..5374e19ba73 100644 --- a/src/mesa/drivers/dri/i915/intel_clear.c +++ b/src/mesa/drivers/dri/i915/intel_clear.c @@ -179,7 +179,7 @@ intelClear(struct gl_context *ctx, GLbitfield mask) if (tri_mask) { debug_mask("tri", tri_mask); - if (ctx->API == API_OPENGLES) + if (ctx->API == API_OPENGLES || !ctx->Extensions.ARB_fragment_shader) _mesa_meta_Clear(&intel->ctx, tri_mask); else _mesa_meta_glsl_Clear(&intel->ctx, tri_mask); |