Commit 13409b91 authored by Adam Jackson's avatar Adam Jackson 🎧

glamor: Unconditionalize GLAMOR_GRADIENT_SHADER

Effectively always true anyway.
Signed-off-by: Adam Jackson's avatarAdam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt's avatarEric Anholt <eric@anholt.net>
parent 266d9868
......@@ -710,10 +710,7 @@ glamor_init(ScreenPtr screen, unsigned int flags)
ps->Glyphs = glamor_composite_glyphs;
glamor_init_vbo(screen);
#ifdef GLAMOR_GRADIENT_SHADER
glamor_init_gradient_shader(screen);
#endif
glamor_pixmap_init(screen);
glamor_sync_init(screen);
......
......@@ -38,8 +38,6 @@
#define RADIAL_SMALL_STOPS (6 + 2)
#define RADIAL_LARGE_STOPS (16 + 2)
#ifdef GLAMOR_GRADIENT_SHADER
static const char *
_glamor_create_getcolor_fs_source(ScreenPtr screen, int stops_count,
int use_array)
......@@ -1451,5 +1449,3 @@ glamor_generate_linear_gradient_picture(ScreenPtr screen,
glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
return NULL;
}
#endif /* End of GLAMOR_GRADIENT_SHADER */
......@@ -918,7 +918,6 @@ void glamor_xv_render(glamor_port_private *port_priv);
* this will increase performance obviously. */
#define GLAMOR_PIXMAP_DYNAMIC_UPLOAD
#define GLAMOR_GRADIENT_SHADER
#define GLAMOR_TEXTURED_LARGE_PIXMAP 1
#if 0
#define MAX_FBO_SIZE 32 /* For test purpose only. */
......
......@@ -1343,7 +1343,6 @@ glamor_convert_gradient_picture(ScreenPtr screen,
pFormat = PictureMatchFormat(screen, 32, format);
}
#ifdef GLAMOR_GRADIENT_SHADER
if (!source->pDrawable) {
if (source->pSourcePict->type == SourcePictTypeLinear) {
dst = glamor_generate_linear_gradient_picture(screen,
......@@ -1362,7 +1361,7 @@ glamor_convert_gradient_picture(ScreenPtr screen,
return dst;
}
}
#endif
pixmap = glamor_create_pixmap(screen,
width,
height,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment