i915,i965: Don't condition use of GLSL clear on the current API

Meta always sets the API to API_OPENGL_COMPAT, so the current API
setting is irrelevant.

   text	   data	    bss	    dec	    hex	filename
7154994	 256860	  37332	7449186	 71aa62	32-bit i965_dri.so before
7154978	 256860	  37332	7449170	 71aa52	32-bit i965_dri.so after
6788451	 328056	  50704	7167211	 6d5ceb	64-bit i965_dri.so before
6788419	 328056	  50704	7167179	 6d5ccb	64-bit i965_dri.so after

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

diff --git a/src/mesa/drivers/dri/i915/intel_clear.c b/src/mesa/drivers/dri/i915/intel_clear.c
index 4306826b876ea4a349a9d98e0551b263e0d99c3d..f8df2e08d37a5a6a0d486032f40c59d88fd2384c 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_clear.c
+++ b/src/mesa/drivers/dri/i915/intel_clear.c
@@ -181,7 +181,7 @@ intelClear(struct gl_context *ctx, GLbitfield mask)
 
    if (tri_mask) {
       debug_mask("tri", tri_mask);
-      if (ctx->API == API_OPENGLES || !ctx->Extensions.ARB_fragment_shader)
+      if (!ctx->Extensions.ARB_fragment_shader)
         _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 72453d16eb12459a7277c3c3d20305c2c7c1177d..7fbaa3a47d471fa28cf1768e7fc9515a82257849 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_clear.c
+++ b/src/mesa/drivers/dri/i965/brw_clear.c
@@ -246,12 +246,7 @@ brw_clear(struct gl_context *ctx, GLbitfield mask)
    if (tri_mask) {
       debug_mask("tri", tri_mask);
       mask &= ~tri_mask;
-
-      if (ctx->API == API_OPENGLES) {
-         _mesa_meta_Clear(&brw->ctx, tri_mask);
-      } else {
-         _mesa_meta_glsl_Clear(&brw->ctx, tri_mask);
-      }
+      _mesa_meta_glsl_Clear(&brw->ctx, tri_mask);
    }
 
    /* Any strange buffers get passed off to swrast.  The only thing that