frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: Don't abuse large_pixmap members for regular pixmaps 

glamor_compute_clipped_regions_ext wants to treat small and large
pixmaps uniformly and did that by writing into the large pixmap
union member in small pixmaps to construct something that looks like a
one texture large pixmap.

Instead of doing that, simply allocate the necessary elements locally
on the stack and use them from there.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Keith Packard 2014-08-19 12:41:45 -07:00
parent bab319763c
commit 6e78d7f5e6
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
glamor/glamor_largepixmap.c
View File

@ -162,9 +162,9 @@ glamor_compute_clipped_regions_ext(glamor_pixmap_private *pixmap_priv,
*result_regions; *result_regions;
int i, j, x, y, k, inner_n_regions; int i, j, x, y, k, inner_n_regions;
int width, height; int width, height;
glamor_pixmap_private_large_t *priv; BoxPtr box_array;
BoxRec small_box;
priv = &pixmap_priv->large; int block_w, block_h;
DEBUGF("ext called \n"); DEBUGF("ext called \n");
@ -178,14 +178,16 @@ glamor_compute_clipped_regions_ext(glamor_pixmap_private *pixmap_priv,
clipped_regions[0].block_idx = 0; clipped_regions[0].block_idx = 0;
RegionCopy(clipped_regions[0].region, region); RegionCopy(clipped_regions[0].region, region);
*n_region = 1; *n_region = 1;
priv->block_w = priv->base.pixmap->drawable.width; block_w = pixmap_priv->base.pixmap->drawable.width;
priv->block_h = priv->base.pixmap->drawable.height; block_h = pixmap_priv->base.pixmap->drawable.height;
priv->box_array = &priv->box; box_array = &small_box;
priv->box.x1 = priv->box.y1 = 0; small_box.x1 = small_box.y1 = 0;
priv->box.x2 = priv->block_w; small_box.x2 = block_w;
priv->box.y2 = priv->block_h; small_box.y2 = block_h;
} }
else { else {
glamor_pixmap_private_large_t *priv = __glamor_large(pixmap_priv);
clipped_regions = __glamor_compute_clipped_regions(priv->block_w, clipped_regions = __glamor_compute_clipped_regions(priv->block_w,
priv->block_h, priv->block_h,
priv->block_wcnt, priv->block_wcnt,
@ -201,20 +203,23 @@ glamor_compute_clipped_regions_ext(glamor_pixmap_private *pixmap_priv,
*n_region = 0; *n_region = 0;
return NULL; return NULL;
} }
block_w = priv->block_w;
block_h = priv->block_h;
box_array = priv->box_array;
} }
if (inner_block_w >= priv->block_w && inner_block_h >= priv->block_h) if (inner_block_w >= block_w && inner_block_h >= block_h)
return clipped_regions; return clipped_regions;
result_regions = calloc(*n_region result_regions = calloc(*n_region
* ((priv->block_w + inner_block_w - 1) / * ((block_w + inner_block_w - 1) /
inner_block_w) inner_block_w)
* ((priv->block_h + inner_block_h - 1) / * ((block_h + inner_block_h - 1) /
inner_block_h), sizeof(*result_regions)); inner_block_h), sizeof(*result_regions));
k = 0; k = 0;
for (i = 0; i < *n_region; i++) { for (i = 0; i < *n_region; i++) {
x = priv->box_array[clipped_regions[i].block_idx].x1; x = box_array[clipped_regions[i].block_idx].x1;
y = priv->box_array[clipped_regions[i].block_idx].y1; y = box_array[clipped_regions[i].block_idx].y1;
width = priv->box_array[clipped_regions[i].block_idx].x2 - x; width = box_array[clipped_regions[i].block_idx].x2 - x;
height = priv->box_array[clipped_regions[i].block_idx].y2 - y; height = box_array[clipped_regions[i].block_idx].y2 - y;
inner_regions = __glamor_compute_clipped_regions(inner_block_w, inner_regions = __glamor_compute_clipped_regions(inner_block_w,
inner_block_h, inner_block_h,
0, x, y, 0, x, y,