broadcom/vc5: Stop trying to swizzle around RGBA4 clear color.

We always want A in the A slot in the tile buffer, and any other swapping
should happen elsewhere.

Fixes RGBA4-using cases in fbo-clear-formats and
GTF-GLES3.gtf.GL3Tests.color_buffer_float.color_buffer_float_clamp_fixed.
This commit is contained in:
Eric Anholt 2018-03-27 21:52:35 -07:00
parent 2f4c4e10c2
commit 123ee37627
1 changed files with 2 additions and 12 deletions

View File

@ -627,18 +627,8 @@ vc5_clear(struct pipe_context *pctx, unsigned buffers,
switch (surf->internal_type) {
case V3D_INTERNAL_TYPE_8:
if (surf->format == PIPE_FORMAT_B4G4R4A4_UNORM ||
surf->format == PIPE_FORMAT_B4G4R4A4_UNORM) {
/* Our actual hardware layout is ABGR4444, but
* we apply a swizzle when texturing to flip
* things back around.
*/
util_pack_color(color->f, PIPE_FORMAT_A8R8G8B8_UNORM,
&uc);
} else {
util_pack_color(color->f, PIPE_FORMAT_R8G8B8A8_UNORM,
&uc);
}
util_pack_color(color->f, PIPE_FORMAT_R8G8B8A8_UNORM,
&uc);
memcpy(job->clear_color[i], uc.ui, internal_size);
break;
case V3D_INTERNAL_TYPE_8I: