From: Ian Romanick <ian.d.roman...@intel.com>
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.roman...@intel.com>
---
src/mesa/drivers/dri/i915/intel_clear.c | 2 +-
src/mesa/drivers/dri/i965/brw_clear.c | 7 +------
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/mesa/drivers/dri/i915/intel_clear.c
b/src/mesa/drivers/dri/i915/intel_clear.c
index 4306826..f8df2e0 100644
--- 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 45e93f4..1e434c9 100644
--- 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
--
2.9.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
