Module: Mesa Branch: master Commit: 81c31e560f230eddb5c081b5526c43258c12a8ac URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=81c31e560f230eddb5c081b5526c43258c12a8ac
Author: Ville Syrjälä <ville.syrj...@linux.intel.com> Date: Tue Jul 8 16:13:58 2014 +0300 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.pa...@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 <e...@anholt.net> Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com> --- src/mesa/drivers/dri/i915/intel_clear.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i915/intel_clear.c b/src/mesa/drivers/dri/i915/intel_clear.c index 1762c1d..5374e19 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); _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit