diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index ad6873757..54bbdb1ab 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -714,6 +714,7 @@ glamor_poly_line(DrawablePtr pDrawable, GCPtr pGC, int mode, int npt,
 
 #define GLAMOR_PIXMAP_DYNAMIC_UPLOAD
 //#define GLAMOR_DELAYED_FILLING
+//#define GLAMOR_GRADIENT_SHADER
 
 
 
diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c
index 042fabe2d..00a6e1ec9 100644
--- a/glamor/glamor_render.c
+++ b/glamor/glamor_render.c
@@ -2743,7 +2743,7 @@ glamor_convert_gradient_picture(ScreenPtr screen,
 		format = PICT_a8r8g8b8;
 	else
 		format = source->format;
-
+#ifdef GLAMOR_GRADIENT_SHADER
 	if (!source->pDrawable) {
 		if (source->pSourcePict->type == SourcePictTypeLinear) {
 			dst = _glamor_generate_linear_gradient_picture(screen,
@@ -2762,7 +2762,7 @@ glamor_convert_gradient_picture(ScreenPtr screen,
 			return dst;
 		}
 	}
-
+#endif
 	pixmap = glamor_create_pixmap(screen,
 				      width,
 				      height,