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

i965: Simplify the no-reopening-the-winsys-buffer tests.

Browse source 
The formatting was weird, and the tests were duplicated, and it is
guaranteed that mt->region exists.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Eric Anholt 2014-03-21 15:25:49 -07:00
parent e07e7e9f89
commit 44e944c87c
1 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/mesa/drivers/dri/i965/brw_context.c
View file

@ -1264,17 +1264,14 @@ intel_process_dri2_buffer(struct brw_context *brw,
* use of a mapping of the buffer involves a bunch of page faulting which is
* moderately expensive.
*/
if (num_samples == 0) {
if (rb->mt &&
rb->mt->region &&
rb->mt->region->name == buffer->name)
return;
} else {
if (rb->singlesample_mt &&
rb->singlesample_mt->region &&
rb->singlesample_mt->region->name == buffer->name)
return;
}
struct intel_mipmap_tree *last_mt;
if (num_samples == 0)
last_mt = rb->mt;
else
last_mt = rb->singlesample_mt;
if (last_mt && last_mt->region->name == buffer->name)
return;
if (unlikely(INTEL_DEBUG & DEBUG_DRI)) {
fprintf(stderr,
@ -1349,17 +1346,14 @@ intel_update_image_buffer(struct brw_context *intel,
/* Check and see if we're already bound to the right
* buffer object
*/
if (num_samples == 0) {
if (rb->mt &&
rb->mt->region &&
rb->mt->region->bo == region->bo)
return;
} else {
if (rb->singlesample_mt &&
rb->singlesample_mt->region &&
rb->singlesample_mt->region->bo == region->bo)
return;
}
struct intel_mipmap_tree *last_mt;
if (num_samples == 0)
last_mt = rb->mt;
else
last_mt = rb->singlesample_mt;
if (last_mt && last_mt->region->bo == region->bo)
return;
intel_update_winsys_renderbuffer_miptree(intel, rb, region);