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

glamor: Add bounding box to one-fbo pixmaps 

This lets code treat the one-fbo pixmaps more symmetrically with the
tiled pixmaps.

Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Keith Packard 2014-03-13 23:11:40 -07:00 committed by Eric Anholt
parent 82f91433e2
commit 209d004469
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glamor/glamor.c
View File

@ -76,6 +76,10 @@ glamor_set_pixmap_type(PixmapPtr pixmap, glamor_pixmap_type_t type)
pixmap_priv->base.glamor_priv = glamor_priv; pixmap_priv->base.glamor_priv = glamor_priv;
} }
pixmap_priv->type = type; pixmap_priv->type = type;
pixmap_priv->base.box.x1 = 0;
pixmap_priv->base.box.x2 = pixmap->drawable.width;
pixmap_priv->base.box.y1 = 0;
pixmap_priv->base.box.y2 = pixmap->drawable.height;
} }
_X_EXPORT void _X_EXPORT void
@ -182,6 +186,10 @@ glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
glamor_check_fbo_size(glamor_priv, w, h)) glamor_check_fbo_size(glamor_priv, w, h))
{ {
pixmap_priv->type = type; pixmap_priv->type = type;
pixmap_priv->base.box.x1 = 0;
pixmap_priv->base.box.y1 = 0;
pixmap_priv->base.box.x2 = w;
pixmap_priv->base.box.y2 = h;
fbo = glamor_create_fbo(glamor_priv, w, h, format, usage); fbo = glamor_create_fbo(glamor_priv, w, h, format, usage);
} }
else { else {

1
glamor/glamor_priv.h
View File

@ -415,6 +415,7 @@ typedef struct glamor_pixmap_private_base {
unsigned char gl_tex:1; unsigned char gl_tex:1;
glamor_pixmap_fbo *fbo; glamor_pixmap_fbo *fbo;
PixmapPtr pixmap; PixmapPtr pixmap;
BoxRec box;
int drm_stride; int drm_stride;
glamor_screen_private *glamor_priv; glamor_screen_private *glamor_priv;
PicturePtr picture; PicturePtr picture;