fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-01 03:10:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

panfrost: Set initialized in more cases

Browse source 
Indirect linear writes were not being marked as initialized, causing the
back blit to be dropped, breaking the listed tests.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
This commit is contained in:
Alyssa Rosenzweig 2019-07-19 16:11:27 -07:00
parent 9e3dc703ff
commit f1dcaa0df6
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/drivers/panfrost/ci/expected-failures.txt
View file

@ -237,8 +237,3 @@ dEQP-GLES2.functional.shaders.preprocessor.predefined_macros.line_2_fragment
dEQP-GLES2.functional.shaders.preprocessor.predefined_macros.line_2_vertex
dEQP-GLES2.functional.shaders.scoping.valid.local_variable_hides_function_parameter_fragment
dEQP-GLES2.functional.shaders.scoping.valid.local_variable_hides_function_parameter_vertex
dEQP-GLES2.functional.texture.specification.basic_copytexsubimage2d.cube_alpha
dEQP-GLES2.functional.texture.specification.basic_copytexsubimage2d.cube_luminance
dEQP-GLES2.functional.texture.specification.basic_copytexsubimage2d.cube_luminance_alpha
dEQP-GLES2.functional.texture.specification.basic_copytexsubimage2d.cube_rgb
dEQP-GLES2.functional.texture.specification.basic_copytexsubimage2d.cube_rgba

14
src/gallium/drivers/panfrost/pan_resource.c
View file

@ -592,23 +592,24 @@ panfrost_transfer_unmap(struct pipe_context *pctx,
struct panfrost_gtransfer *trans = pan_transfer(transfer);
struct panfrost_resource *prsrc = (struct panfrost_resource *) transfer->resource;
/* Mark whatever we wrote as written */
if (transfer->usage & PIPE_TRANSFER_WRITE)
prsrc->slices[transfer->level].initialized = true;
if (trans->map) {
struct panfrost_bo *bo = prsrc->bo;
if (transfer->usage & PIPE_TRANSFER_WRITE) {
unsigned level = transfer->level;
prsrc->slices[level].initialized = true;
if (prsrc->layout == PAN_AFBC) {
DBG("Unimplemented: writes to AFBC\n");
} else if (prsrc->layout == PAN_TILED) {
assert(transfer->box.depth == 1);
panfrost_store_tiled_image(
bo->cpu + prsrc->slices[level].offset,
bo->cpu + prsrc->slices[transfer->level].offset,
trans->map,
&transfer->box,
prsrc->slices[level].stride,
prsrc->slices[transfer->level].stride,
transfer->stride,
util_format_get_blocksize(prsrc->base.format));
}
@ -638,6 +639,9 @@ panfrost_transfer_flush_region(struct pipe_context *pctx,
util_range_add(&rsc->valid_buffer_range,
transfer->box.x + box->x,
transfer->box.x + box->x + box->width);
} else {
unsigned level = transfer->level;
rsc->slices[level].initialized = true;
}
}