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

st/nine: Immediately upload user provided textures

Browse source 
Fixes regression caused by
42d672fa6a
st/nine: Bind src not dst in nine_context_box_upload

Before that patch, for user provided textures,
when the texture was destroyed, the safety
check for pending uploads, which according to
the code "Following condition cannot happen currently",
was flushing the queue and thus triggering the upload.

After the patch, the texture destruction was delayed after
the upload. However the user frees the texture buffer,
as it thinks the texture released.

Instead of reverting the faulty patch,
this patch instead flushes the csmt queue right away
after queuing the upload for this type of textures.
This is more future-proof, as we may want to bind the
surface for other reasons in the future.

Signed-off-by: Axel Davy <davyaxel0@gmail.com>
Cc: 18.3 <mesa-stable@lists.freedesktop.org>
This commit is contained in:
Axel Davy 2019-01-22 20:14:43 +01:00
parent a7d629a590
commit d7433c22e6
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gallium/state_trackers/nine/surface9.c
View file

@ -668,6 +668,19 @@ NineSurface9_CopyMemToDefault( struct NineSurface9 *This,
From->data, From->stride,
0, /* depth = 1 */
&src_box);
if (From->texture == D3DRTYPE_TEXTURE) {
struct NineTexture9 *tex =
NineTexture9(From->base.base.container);
/* D3DPOOL_SYSTEMMEM with buffer content passed
* from the user: execute the upload right now.
* It is possible it is enough to delay upload
* until the surface refcount is 0, but the
* bind refcount may not be 0, and thus the dtor
* is not executed (and doesn't trigger the
* pending_uploads_counter check). */
if (!tex->managed_buffer)
nine_csmt_process(This->base.base.device);
}
if (This->data_conversion)
(void) util_format_translate(This->format_conversion,