fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 06:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/dri: reuse depth-stencil and MSAA resources after DRI2 invalidate event

Browse source 
Page flipping generates an invalidate event every frame, causing reallocations
of all private resources (MSAA and depth-stencil).

Reusing the resources may improve performance (especially under memory
pressure).

Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák 2013-06-01 02:04:56 +02:00
parent 683b065320
commit 6c6cfc02c9
1 changed files with 78 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
src/gallium/state_trackers/dri/drm/dri2.c
View file

@ -179,7 +179,7 @@ dri2_drawable_process_buffers(struct dri_drawable *drawable,
struct pipe_resource templ; struct pipe_resource templ;
struct winsys_handle whandle; struct winsys_handle whandle;
boolean alloc_depthstencil = FALSE; boolean alloc_depthstencil = FALSE;
unsigned i, bind; unsigned i, j, bind;
if (drawable->old_num == buffer_count && if (drawable->old_num == buffer_count &&
drawable->old_w == dri_drawable->w && drawable->old_w == dri_drawable->w &&
@ -187,10 +187,41 @@ dri2_drawable_process_buffers(struct dri_drawable *drawable,
memcmp(drawable->old, buffers, sizeof(__DRIbuffer) * buffer_count) == 0) memcmp(drawable->old, buffers, sizeof(__DRIbuffer) * buffer_count) == 0)
return; return;
for (i = 0; i < ST_ATTACHMENT_COUNT; i++) /* See if we need a depth-stencil buffer. */
for (i = 0; i < att_count; i++) {
if (atts[i] == ST_ATTACHMENT_DEPTH_STENCIL) {
alloc_depthstencil = TRUE;
break;
}
}
/* Delete the resources we won't need. */
for (i = 0; i < ST_ATTACHMENT_COUNT; i++) {
/* Don't delete the depth-stencil buffer, we can reuse it. */
if (i == ST_ATTACHMENT_DEPTH_STENCIL && alloc_depthstencil)
continue;
pipe_resource_reference(&drawable->textures[i], NULL); pipe_resource_reference(&drawable->textures[i], NULL);
for (i = 0; i < ST_ATTACHMENT_COUNT; i++) }
if (drawable->stvis.samples > 1) {
for (i = 0; i < ST_ATTACHMENT_COUNT; i++) {
boolean del = TRUE;
/* Don't delete MSAA resources for the attachments which are enabled,
* we can reuse them. */
for (j = 0; j < att_count; j++) {
if (i == atts[j]) {
del = FALSE;
break;
}
}
if (del) {
pipe_resource_reference(&drawable->msaa_textures[i], NULL); pipe_resource_reference(&drawable->msaa_textures[i], NULL);
}
}
}
memset(&templ, 0, sizeof(templ)); memset(&templ, 0, sizeof(templ));
templ.target = screen->target; templ.target = screen->target;
@ -244,52 +275,73 @@ dri2_drawable_process_buffers(struct dri_drawable *drawable,
for (i = 0; i < att_count; i++) { for (i = 0; i < att_count; i++) {
enum st_attachment_type att = atts[i]; enum st_attachment_type att = atts[i];
if (att == ST_ATTACHMENT_DEPTH_STENCIL)
continue;
if (drawable->textures[att]) { if (drawable->textures[att]) {
templ.format = drawable->textures[att]->format; templ.format = drawable->textures[att]->format;
templ.bind = drawable->textures[att]->bind; templ.bind = drawable->textures[att]->bind;
templ.nr_samples = drawable->stvis.samples; templ.nr_samples = drawable->stvis.samples;
/* Try to reuse the resource.
* (the other resource parameters should be constant)
*/
if (!drawable->msaa_textures[att] ||
drawable->msaa_textures[att]->width0 != templ.width0 ||
drawable->msaa_textures[att]->height0 != templ.height0) {
/* Allocate a new one. */
pipe_resource_reference(&drawable->msaa_textures[att], NULL);
drawable->msaa_textures[att] = drawable->msaa_textures[att] =
screen->base.screen->resource_create(screen->base.screen, screen->base.screen->resource_create(screen->base.screen,
&templ); &templ);
assert(drawable->msaa_textures[att]); assert(drawable->msaa_textures[att]);
} }
} }
else {
pipe_resource_reference(&drawable->msaa_textures[att], NULL);
} }
/* See if we need a depth-stencil buffer. */
for (i = 0; i < att_count; i++) {
if (atts[i] == ST_ATTACHMENT_DEPTH_STENCIL) {
alloc_depthstencil = TRUE;
break;
} }
} }
/* Allocate a private depth-stencil buffer. */ /* Allocate a private depth-stencil buffer. */
if (alloc_depthstencil) { if (alloc_depthstencil) {
enum st_attachment_type att = ST_ATTACHMENT_DEPTH_STENCIL;
struct pipe_resource **zsbuf;
enum pipe_format format; enum pipe_format format;
unsigned bind; unsigned bind;
dri_drawable_get_format(drawable, ST_ATTACHMENT_DEPTH_STENCIL, dri_drawable_get_format(drawable, att, &format, &bind);
&format, &bind);
if (format) { if (format) {
templ.format = format; templ.format = format;
templ.bind = bind; templ.bind = bind;
if (drawable->stvis.samples > 1) { if (drawable->stvis.samples > 1) {
templ.nr_samples = drawable->stvis.samples; templ.nr_samples = drawable->stvis.samples;
drawable->msaa_textures[ST_ATTACHMENT_DEPTH_STENCIL] = zsbuf = &drawable->msaa_textures[att];
screen->base.screen->resource_create(screen->base.screen,
&templ);
assert(drawable->msaa_textures[ST_ATTACHMENT_DEPTH_STENCIL]);
} }
else { else {
templ.nr_samples = 0; templ.nr_samples = 0;
drawable->textures[ST_ATTACHMENT_DEPTH_STENCIL] = zsbuf = &drawable->textures[att];
screen->base.screen->resource_create(screen->base.screen,
&templ);
assert(drawable->textures[ST_ATTACHMENT_DEPTH_STENCIL]);
} }
/* Try to reuse the resource.
* (the other resource parameters should be constant)
*/
if (!*zsbuf ||
(*zsbuf)->width0 != templ.width0 ||
(*zsbuf)->height0 != templ.height0) {
/* Allocate a new one. */
pipe_resource_reference(zsbuf, NULL);
*zsbuf = screen->base.screen->resource_create(screen->base.screen,
&templ);
assert(*zsbuf);
}
}
else {
pipe_resource_reference(&drawable->msaa_textures[att], NULL);
pipe_resource_reference(&drawable->textures[att], NULL);
} }
} }