OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium: Do not assume that buffers are freed in the same order they are fenced.

Browse Source 
Also free buffers as soon as possible.

This short term fix corrects the fenced list behavior but it will impact on performance.
The long term fix is probably replace the linked list (legacy from the bufpool code) by
a binary tree.
This commit is contained in:
José Fonseca
2008-04-01 10:41:43 +09:00
parent 14452aee73
commit 686a6c7468
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
View File

@@ -29,8 +29,8 @@
* \file * \file
* Implementation of fenced buffers. * Implementation of fenced buffers.
* *
* \author Jos<EFBFBD> Fonseca <jrfonseca-at-tungstengraphics-dot-com> * \author José Fonseca <jrfonseca-at-tungstengraphics-dot-com>
* \author Thomas Hellstr<EFBFBD>m <thomas-at-tungstengraphics-dot-com> * \author Thomas Hellström <thomas-at-tungstengraphics-dot-com>
*/ */
@@ -44,7 +44,7 @@
#include "pb_buffer.h" #include "pb_buffer.h"
#include "pb_buffer_fenced.h" #include "pb_buffer_fenced.h"
#ifndef __MSC__ #ifndef WIN32
#include <unistd.h> #include <unistd.h>
#endif #endif
@@ -93,8 +93,6 @@ fenced_buffer(struct pb_buffer *buf)
} }
static void static void
_fenced_buffer_list_check_free(struct fenced_buffer_list *fenced_list, _fenced_buffer_list_check_free(struct fenced_buffer_list *fenced_list,
int wait) int wait)
@@ -105,15 +103,6 @@ _fenced_buffer_list_check_free(struct fenced_buffer_list *fenced_list,
int signaled = -1; int signaled = -1;
list = fenced_list->delayed.next; list = fenced_list->delayed.next;
if (fenced_list->numDelayed > 3) {
unsigned i;
for (i = 0; i < fenced_list->numDelayed; i += 3) {
list = list->next;
}
}
prev = list->prev; prev = list->prev;
for (; list != &fenced_list->delayed; list = prev, prev = list->prev) { for (; list != &fenced_list->delayed; list = prev, prev = list->prev) {
@@ -128,11 +117,17 @@ _fenced_buffer_list_check_free(struct fenced_buffer_list *fenced_list,
} }
} }
if (signaled != 0) if (signaled != 0) {
#if 0
/* XXX: we are assuming that buffers are freed in the same order they /* XXX: we are assuming that buffers are freed in the same order they
* are fenced which may not always be true... * are fenced which may not always be true...
*/ */
break; break;
#else
signaled = -1;
continue;
#endif
}
winsys->fence_reference(winsys, &fenced_buf->fence, NULL); winsys->fence_reference(winsys, &fenced_buf->fence, NULL);
@@ -154,8 +149,16 @@ fenced_buffer_destroy(struct pb_buffer *buf)
struct fenced_buffer_list *fenced_list = fenced_buf->list; struct fenced_buffer_list *fenced_list = fenced_buf->list;
if (fenced_buf->fence) { if (fenced_buf->fence) {
LIST_ADDTAIL(&fenced_buf->head, &fenced_list->delayed); struct pipe_winsys *winsys = fenced_list->winsys;
fenced_list->numDelayed++; if(winsys->fence_finish(winsys, fenced_buf->fence, 0) != 0) {
LIST_ADDTAIL(&fenced_buf->head, &fenced_list->delayed);
fenced_list->numDelayed++;
}
else {
winsys->fence_reference(winsys, &fenced_buf->fence, NULL);
pb_reference(&fenced_buf->buffer, NULL);
FREE(fenced_buf);
}
} }
else { else {
pb_reference(&fenced_buf->buffer, NULL); pb_reference(&fenced_buf->buffer, NULL);
@@ -285,7 +288,7 @@ fenced_buffer_list_destroy(struct fenced_buffer_list *fenced_list)
/* Wait on outstanding fences */ /* Wait on outstanding fences */
while (fenced_list->numDelayed) { while (fenced_list->numDelayed) {
_glthread_UNLOCK_MUTEX(fenced_list->mutex); _glthread_UNLOCK_MUTEX(fenced_list->mutex);
#ifndef __MSC__ #ifndef WIN32
sched_yield(); sched_yield();
#endif #endif
_fenced_buffer_list_check_free(fenced_list, 1); _fenced_buffer_list_check_free(fenced_list, 1);