diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2017-06-02 16:33:35 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2017-06-26 15:20:09 -0700 |
| commit | b08981009d9bf127436be84aadb2e88b889e56c0 (patch) | |
| tree | eda37fca5dd10cb7116c23e91231da57384dc08a /src | |
| parent | 7719f52d5fa29f251b4ddce61238972b43be7035 (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/i915/intel_clear.c | 2 | ||||
| -rw-r--r-- | 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 4306826b876..f8df2e08d37 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 72453d16eb1..7fbaa3a47d4 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 |