fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 15:48:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

gallium/u_transfer_helper: fix assert in RGTC case

Browse source 
Previously we'd hit the unreachable() for uploading RGTC.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Rob Clark 2019-07-22 14:23:52 -07:00 • committed by Rob Clark
parent 53730ab32c
commit b4f4768672
1 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/gallium/auxiliary/util/u_transfer_helper.c
View file

@ -300,32 +300,33 @@ u_transfer_helper_transfer_map(struct pipe_context *pctx,
unreachable("Unexpected format");
}
}
} else if (needs_pack(usage) &&
util_format_description(prsc->format)->layout == UTIL_FORMAT_LAYOUT_RGTC) {
switch (prsc->format) {
case PIPE_FORMAT_RGTC1_UNORM:
case PIPE_FORMAT_RGTC1_SNORM:
case PIPE_FORMAT_LATC1_UNORM:
case PIPE_FORMAT_LATC1_SNORM:
util_format_rgtc1_unorm_pack_rgba_8unorm(trans->staging,
ptrans->stride,
trans->ptr,
trans->trans->stride,
width, height);
break;
case PIPE_FORMAT_RGTC2_UNORM:
case PIPE_FORMAT_RGTC2_SNORM:
case PIPE_FORMAT_LATC2_UNORM:
case PIPE_FORMAT_LATC2_SNORM:
util_format_rgtc2_unorm_pack_rgba_8unorm(trans->staging,
ptrans->stride,
trans->ptr,
trans->trans->stride,
width, height);
break;
default:
assert(!"Unexpected format");
break;
} else if (util_format_description(prsc->format)->layout == UTIL_FORMAT_LAYOUT_RGTC) {
if (needs_pack(usage)) {
switch (prsc->format) {
case PIPE_FORMAT_RGTC1_UNORM:
case PIPE_FORMAT_RGTC1_SNORM:
case PIPE_FORMAT_LATC1_UNORM:
case PIPE_FORMAT_LATC1_SNORM:
util_format_rgtc1_unorm_pack_rgba_8unorm(trans->staging,
ptrans->stride,
trans->ptr,
trans->trans->stride,
width, height);
break;
case PIPE_FORMAT_RGTC2_UNORM:
case PIPE_FORMAT_RGTC2_SNORM:
case PIPE_FORMAT_LATC2_UNORM:
case PIPE_FORMAT_LATC2_SNORM:
util_format_rgtc2_unorm_pack_rgba_8unorm(trans->staging,
ptrans->stride,
trans->ptr,
trans->trans->stride,
width, height);
break;
default:
assert(!"Unexpected format");
break;
}
}
} else {
unreachable("bleh");