diff options
| author | Adam Jackson <ajax@redhat.com> | 2017-10-24 14:28:32 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2017-10-30 13:16:30 -0400 |
| commit | 13409b91b1936330dbf19bacefa4b48d0b6843b8 (patch) | |
| tree | 295fbc6bdc7ca8f653ec27be9f0f3ab721981689 | |
| parent | 266d9868ca1cf77b7d315d607b515f081a9f45c3 (diff) | |
glamor: Unconditionalize GLAMOR_GRADIENT_SHADER
Effectively always true anyway.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
| -rw-r--r-- | glamor/glamor.c | 3 | ||||
| -rw-r--r-- | glamor/glamor_gradient.c | 4 | ||||
| -rw-r--r-- | glamor/glamor_priv.h | 1 | ||||
| -rw-r--r-- | glamor/glamor_render.c | 3 |
4 files changed, 1 insertions, 10 deletions
diff --git a/glamor/glamor.c b/glamor/glamor.c index d06934595..c55ba249e 100644 --- a/glamor/glamor.c +++ b/glamor/glamor.c @@ -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); diff --git a/glamor/glamor_gradient.c b/glamor/glamor_gradient.c index 0c97ce7cb..2f2a5cc9b 100644 --- a/glamor/glamor_gradient.c +++ b/glamor/glamor_gradient.c @@ -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 */ diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h index 7050df526..b828350cd 100644 --- a/glamor/glamor_priv.h +++ b/glamor/glamor_priv.h @@ -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. */ diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index 3e126f0f2..1a54aa9ec 100644 --- a/glamor/glamor_render.c +++ b/glamor/glamor_render.c @@ -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, |