frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: Unconditionalize GLAMOR_GRADIENT_SHADER 

Effectively always true anyway.

Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Adam Jackson 2017-10-24 14:28:32 -04:00
parent 266d9868ca
commit 13409b91b1
4 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glamor/glamor.c
View File

@ -710,10 +710,7 @@ glamor_init(ScreenPtr screen, unsigned int flags)
ps->Glyphs = glamor_composite_glyphs; ps->Glyphs = glamor_composite_glyphs;
glamor_init_vbo(screen); glamor_init_vbo(screen);
#ifdef GLAMOR_GRADIENT_SHADER
glamor_init_gradient_shader(screen); glamor_init_gradient_shader(screen);
#endif
glamor_pixmap_init(screen); glamor_pixmap_init(screen);
glamor_sync_init(screen); glamor_sync_init(screen);

4
glamor/glamor_gradient.c
View File

@ -38,8 +38,6 @@
#define RADIAL_SMALL_STOPS (6 + 2) #define RADIAL_SMALL_STOPS (6 + 2)
#define RADIAL_LARGE_STOPS (16 + 2) #define RADIAL_LARGE_STOPS (16 + 2)
#ifdef GLAMOR_GRADIENT_SHADER
static const char * static const char *
_glamor_create_getcolor_fs_source(ScreenPtr screen, int stops_count, _glamor_create_getcolor_fs_source(ScreenPtr screen, int stops_count,
int use_array) int use_array)
@ -1451,5 +1449,3 @@ glamor_generate_linear_gradient_picture(ScreenPtr screen,
glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE); glDisableVertexAttribArray(GLAMOR_VERTEX_SOURCE);
return NULL; return NULL;
} }
#endif /* End of GLAMOR_GRADIENT_SHADER */

1
glamor/glamor_priv.h
View File

@ -918,7 +918,6 @@ void glamor_xv_render(glamor_port_private *port_priv);
* this will increase performance obviously. */ * this will increase performance obviously. */
#define GLAMOR_PIXMAP_DYNAMIC_UPLOAD #define GLAMOR_PIXMAP_DYNAMIC_UPLOAD
#define GLAMOR_GRADIENT_SHADER
#define GLAMOR_TEXTURED_LARGE_PIXMAP 1 #define GLAMOR_TEXTURED_LARGE_PIXMAP 1
#if 0 #if 0
#define MAX_FBO_SIZE 32 /* For test purpose only. */ #define MAX_FBO_SIZE 32 /* For test purpose only. */

3
glamor/glamor_render.c
View File

@ -1343,7 +1343,6 @@ glamor_convert_gradient_picture(ScreenPtr screen,
pFormat = PictureMatchFormat(screen, 32, format); pFormat = PictureMatchFormat(screen, 32, format);
} }
#ifdef GLAMOR_GRADIENT_SHADER
if (!source->pDrawable) { if (!source->pDrawable) {
if (source->pSourcePict->type == SourcePictTypeLinear) { if (source->pSourcePict->type == SourcePictTypeLinear) {
dst = glamor_generate_linear_gradient_picture(screen, dst = glamor_generate_linear_gradient_picture(screen,
@ -1362,7 +1361,7 @@ glamor_convert_gradient_picture(ScreenPtr screen,
return dst; return dst;
} }
} }
#endif
pixmap = glamor_create_pixmap(screen, pixmap = glamor_create_pixmap(screen,
width, width,
height, height,