[PATCH 05/27] glamor: Do glyph private init at screeninit time, and other stuff at CSR.

[Michel Dänzer]

On Mit, 2014-03-12 at 17:37 -0700, Eric Anholt wrote:
> Markus Wick <markus at selfnet.de> writes:
> 
> > Am 2014-03-11 22:30, schrieb Eric Anholt:
> >> diff --git a/glamor/glamor.h b/glamor/glamor.h
> >> index e25dc73..9cda46d 100644
> >> --- a/glamor/glamor.h
> >> +++ b/glamor/glamor.h
> >> @@ -131,14 +131,6 @@ extern _X_EXPORT void
> >> glamor_set_screen_pixmap(PixmapPtr screen_pixmap,
> >> 
> >>  extern _X_EXPORT uint32_t glamor_get_pixmap_texture(PixmapPtr pixmap);
> >> 
> >> -/* @glamor_glyphs_init: Initialize glyphs internal data structures.
> >> - *
> >> - * @pScreen: Current screen pointer.
> >> - *
> >> - * This function must be called after the glamor_init and the texture
> >> - * can be allocated. An example is to call it when create the screen
> >> - * resources at DDX layer.
> >> - */
> >>  extern _X_EXPORT Bool glamor_glyphs_init(ScreenPtr pScreen);
> >
> > This function isn't (and shouldn't be?) used outside of glamor, so this 
> > should be moved to glamor_priv.h.
> 
> I noted that in the commit message -- we retain this as a public symbol
> so drivers keep working without needing changes due to this series
> landing.
> 
> Some day later, if we care, we can drop the compatibility, but for now
> I'd rather make their transition to using server glamor easy.

Speaking with my radeon driver developer hat on, I appreciate that, but
it's not hard to deal with glamor in xserver vs. standalone, e.g. by
checking for the GLAMOR_NO_DRI3 define or even checking for the presence
of the prototypes of these functions themselves. So feel free to drop
the no-op functions.


-- 
Earthling Michel Dänzer            |                  http://www.amd.com
Libre software enthusiast          |                Mesa and X developer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 173 bytes
Desc: This is a digitally signed message part
URL: <http://lists.x.org/archives/xorg-devel/attachments/20140313/ce14bde8/attachment.pgp>