diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2016-05-29 12:02:41 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2016-05-29 12:02:41 +0000 |
| commit | 4a991716ac65d28a68f9943d54c4b74ad0b58f65 (patch) | |
| tree | c037c3fe64bb15ea67dbf03a96783a8b04085371 /xserver/glamor/glamor_transform.h | |
| parent | 549cb8bcb6bdd3a7d44f3b9fdc003df777b2b0d2 (diff) | |
Update to xserver 1.18.3. Tested by shadchin@ and naddy@.
Note that indirect GLX is now disbled by default.
Diffstat (limited to 'xserver/glamor/glamor_transform.h')
| -rw-r--r-- | xserver/glamor/glamor_transform.h | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/xserver/glamor/glamor_transform.h b/xserver/glamor/glamor_transform.h index 36b789af8..5a520ebb0 100644 --- a/xserver/glamor/glamor_transform.h +++ b/xserver/glamor/glamor_transform.h @@ -25,8 +25,7 @@ void glamor_set_destination_drawable(DrawablePtr drawable, - int box_x, - int box_y, + int box_index, Bool do_drawable_translate, Bool center_offset, GLint matrix_uniform_location, @@ -34,13 +33,25 @@ glamor_set_destination_drawable(DrawablePtr drawable, int *p_off_y); void +glamor_set_color_depth(ScreenPtr pScreen, + int depth, + CARD32 pixel, + GLint uniform); + +static inline void glamor_set_color(PixmapPtr pixmap, CARD32 pixel, - GLint uniform); + GLint uniform) +{ + glamor_set_color_depth(pixmap->drawable.pScreen, + pixmap->drawable.depth, pixel, uniform); +} + +Bool +glamor_set_texture_pixmap(PixmapPtr texture); Bool -glamor_set_texture(PixmapPtr pixmap, - PixmapPtr texture, +glamor_set_texture(PixmapPtr texture, int off_x, int off_y, GLint offset_uniform, |