diff options
| author | Keith Packard <keithp@keithp.com> | 2014-10-29 22:50:53 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2015-03-24 12:32:46 -0700 |
| commit | af687396f1875de0a45683aad4fd5a9a2e00f10d (patch) | |
| tree | edfc30a8c59c4ff0a9a68a828f835557c60234a6 /glamor/glamor_xv.c | |
| parent | 1eb954c3830d46c27bf2a61f825b59f12092728c (diff) | |
glamor: Remove screen private and pixmap ptrs from pixmap private and fbo
There's no reason to waste memory storing redundant copies of the same
pointer all over the system; just pass in pointers as necessary to
each function.
Signed-off-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'glamor/glamor_xv.c')
| -rw-r--r-- | glamor/glamor_xv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/glamor/glamor_xv.c b/glamor/glamor_xv.c index 83e24adb2..74654f5e9 100644 --- a/glamor/glamor_xv.c +++ b/glamor/glamor_xv.c @@ -241,8 +241,8 @@ glamor_xv_render(glamor_port_private *port_priv) { ScreenPtr screen = port_priv->pPixmap->drawable.pScreen; glamor_screen_private *glamor_priv = glamor_get_screen_private(screen); - glamor_pixmap_private *pixmap_priv = - glamor_get_pixmap_private(port_priv->pPixmap); + PixmapPtr pixmap = port_priv->pPixmap; + glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap); glamor_pixmap_private *src_pixmap_priv[3]; float vertices[32], texcoords[8]; BoxPtr box = REGION_RECTS(&port_priv->clip); @@ -282,10 +282,10 @@ glamor_xv_render(glamor_port_private *port_priv) off[2] = Loff * yco + Coff * (uco[2] + vco[2]) + bright; gamma = 1.0; - pixmap_priv_get_dest_scale(pixmap_priv, &dst_xscale, &dst_yscale); + pixmap_priv_get_dest_scale(pixmap, pixmap_priv, &dst_xscale, &dst_yscale); glamor_get_drawable_deltas(port_priv->pDraw, port_priv->pPixmap, &dst_x_off, &dst_y_off); - glamor_set_destination_pixmap_priv_nc(pixmap_priv); + glamor_set_destination_pixmap_priv_nc(glamor_priv, pixmap, pixmap_priv); for (i = 0; i < 3; i++) { if (port_priv->src_pix[i]) { |