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

st/dri: disallow recursion in dri_flush

Browse source 
ST_FLUSH_FRONT may call driThrottle, which is implemented with dri_flush.
This prevents double flush as well as fence leaks caused by a recursion
in the middle of throttling.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=58839

Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Tested-by: Michel Dänzer <michel.daenzer@amd.com>
This commit is contained in:
Marek Olšák 2013-01-21 16:19:41 +01:00
parent fffe3e0908
commit 4f0563a658
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gallium/state_trackers/dri/common/dri_drawable.c
View file

@ -423,7 +423,14 @@ dri_flush(__DRIcontext *cPriv,
return;
}
if (!drawable) {
if (drawable) {
/* prevent recursion */
if (drawable->flushing)
return;
drawable->flushing = TRUE;
}
else {
flags &= ~__DRI2_FLUSH_DRAWABLE;
}
@ -478,6 +485,10 @@ dri_flush(__DRIcontext *cPriv,
else if (flags & (__DRI2_FLUSH_DRAWABLE | __DRI2_FLUSH_CONTEXT)) {
ctx->st->flush(ctx->st, flush_flags, NULL);
}
if (drawable) {
drawable->flushing = FALSE;
}
}
/**

1
src/gallium/state_trackers/dri/common/dri_drawable.h
View file

@ -65,6 +65,7 @@ struct dri_drawable
unsigned int head;
unsigned int tail;
unsigned int desired_fences;
boolean flushing; /* prevents recursion in dri_flush */
/* used only by DRISW */
struct pipe_surface *drisw_surface;