OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Ian Romanick
2017-06-02 16:33:35 -07:00
parent 7719f52d5f
commit b08981009d
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/drivers/dri/i915/intel_clear.c
View File

@@ -181,7 +181,7 @@ intelClear(struct gl_context *ctx, GLbitfield mask)
if (tri_mask) { if (tri_mask) {
debug_mask("tri", 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); _mesa_meta_Clear(&intel->ctx, tri_mask);
else else
_mesa_meta_glsl_Clear(&intel->ctx, tri_mask); _mesa_meta_glsl_Clear(&intel->ctx, tri_mask);

5
src/mesa/drivers/dri/i965/brw_clear.c
View File

@@ -246,13 +246,8 @@ brw_clear(struct gl_context *ctx, GLbitfield mask)
if (tri_mask) { if (tri_mask) {
debug_mask("tri", tri_mask); debug_mask("tri", tri_mask);
mask &= ~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 /* Any strange buffers get passed off to swrast. The only thing that
* should be left at this point is the accumulation buffer. * should be left at this point is the accumulation buffer.