summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/drivers/dri/i915/intel_clear.c6
-rw-r--r--src/mesa/drivers/dri/i965/brw_clear.c7
2 files changed, 9 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i915/intel_clear.c b/src/mesa/drivers/dri/i915/intel_clear.c
index 96d9c8fe682..ebac0f57cde 100644
--- a/src/mesa/drivers/dri/i915/intel_clear.c
+++ b/src/mesa/drivers/dri/i915/intel_clear.c
@@ -179,10 +179,10 @@ intelClear(struct gl_context *ctx, GLbitfield mask)
if (tri_mask) {
debug_mask("tri", tri_mask);
- if (ctx->Extensions.ARB_fragment_shader)
- _mesa_meta_glsl_Clear(&intel->ctx, tri_mask);
- else
+ if (ctx->API == API_OPENGLES)
_mesa_meta_Clear(&intel->ctx, tri_mask);
+ else
+ _mesa_meta_glsl_Clear(&intel->ctx, tri_mask);
}
}
diff --git a/src/mesa/drivers/dri/i965/brw_clear.c b/src/mesa/drivers/dri/i965/brw_clear.c
index 31c2e45bd0c..05dd68b650e 100644
--- a/src/mesa/drivers/dri/i965/brw_clear.c
+++ b/src/mesa/drivers/dri/i965/brw_clear.c
@@ -226,7 +226,12 @@ brw_clear(struct gl_context *ctx, GLbitfield mask)
if (tri_mask) {
debug_mask("tri", tri_mask);
mask &= ~tri_mask;
- _mesa_meta_glsl_Clear(&intel->ctx, tri_mask);
+
+ if (ctx->API == API_OPENGLES) {
+ _mesa_meta_Clear(&intel->ctx, tri_mask);
+ } else {
+ _mesa_meta_glsl_Clear(&intel->ctx, tri_mask);
+ }
}
/* Any strange buffers get passed off to swrast */