Revert "radv: use 32-bit predication for skipping FCE on GFX10.3+"
This is actually wrong because we still assume 64-bit in a bunch
of places.
This reverts commit b24b3026cc
.
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8214>
This commit is contained in:
parent
7da33b68b0
commit
9c176a7e63
|
@ -1252,15 +1252,11 @@ static void
|
||||||
radv_image_alloc_values(const struct radv_device *device, struct radv_image *image)
|
radv_image_alloc_values(const struct radv_device *device, struct radv_image *image)
|
||||||
{
|
{
|
||||||
if (radv_image_has_dcc(image)) {
|
if (radv_image_has_dcc(image)) {
|
||||||
unsigned pred_size = 8;
|
|
||||||
if (device->physical_device->rad_info.has_32bit_predication)
|
|
||||||
pred_size = 4;
|
|
||||||
|
|
||||||
image->fce_pred_offset = image->size;
|
image->fce_pred_offset = image->size;
|
||||||
image->size += pred_size * image->info.levels;
|
image->size += 8 * image->info.levels;
|
||||||
|
|
||||||
image->dcc_pred_offset = image->size;
|
image->dcc_pred_offset = image->size;
|
||||||
image->size += pred_size * image->info.levels;
|
image->size += 8 * image->info.levels;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (radv_image_has_dcc(image) || radv_image_has_cmask(image) ||
|
if (radv_image_has_dcc(image) || radv_image_has_cmask(image) ||
|
||||||
|
|
|
@ -565,18 +565,14 @@ radv_emit_set_predication_state_from_image(struct radv_cmd_buffer *cmd_buffer,
|
||||||
struct radv_image *image,
|
struct radv_image *image,
|
||||||
uint64_t pred_offset, bool value)
|
uint64_t pred_offset, bool value)
|
||||||
{
|
{
|
||||||
unsigned pred_op = PREDICATION_OP_BOOL64;
|
|
||||||
uint64_t va = 0;
|
uint64_t va = 0;
|
||||||
|
|
||||||
if (cmd_buffer->device->physical_device->rad_info.has_32bit_predication)
|
|
||||||
pred_op = PREDICATION_OP_BOOL32;
|
|
||||||
|
|
||||||
if (value) {
|
if (value) {
|
||||||
va = radv_buffer_get_va(image->bo) + image->offset;
|
va = radv_buffer_get_va(image->bo) + image->offset;
|
||||||
va += pred_offset;
|
va += pred_offset;
|
||||||
}
|
}
|
||||||
|
|
||||||
si_emit_set_predication_state(cmd_buffer, true, pred_op, va);
|
si_emit_set_predication_state(cmd_buffer, true, PREDICATION_OP_BOOL64, va);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
Loading…
Reference in New Issue