From 020fcc582837b80b20843a09c1e28fa96096fe6b Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 29 Oct 2014 23:08:57 -0700 Subject: glamor: Eliminate separate 'large' pixmap private structure Just embed the large elements in the regular pixmap private and collapse the union to a single struct. Signed-off-by: Keith Packard Signed-off-by: Eric Anholt Reviewed-by: Eric Anholt --- glamor/glamor_dash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'glamor/glamor_dash.c') diff --git a/glamor/glamor_dash.c b/glamor/glamor_dash.c index e8f60fa10..49ad3b623 100644 --- a/glamor/glamor_dash.c +++ b/glamor/glamor_dash.c @@ -189,7 +189,7 @@ glamor_dash_setup(DrawablePtr drawable, GCPtr gc) /* Set the dash pattern as texture 1 */ glActiveTexture(GL_TEXTURE1); - glBindTexture(GL_TEXTURE_2D, dash_priv->base.fbo->tex); + glBindTexture(GL_TEXTURE_2D, dash_priv->fbo->tex); glUniform1i(prog->dash_uniform, 1); glUniform1f(prog->dash_length_uniform, dash_pixmap->drawable.width); -- cgit v1.2.3