diff --git a/glamor/glamor_priv.h b/glamor/glamor_priv.h
index f89632cc1..961af472e 100644
--- a/glamor/glamor_priv.h
+++ b/glamor/glamor_priv.h
@@ -185,7 +185,7 @@ struct glamor_saved_procs {
 #ifdef GLAMOR_GLES2
 #define CACHE_FORMAT_COUNT 3
 #else
-#define CACHE_FORMAT_COUNT 1
+#define CACHE_FORMAT_COUNT 2
 #endif
 
 #define CACHE_BUCKET_WCOUNT 4
diff --git a/glamor/glamor_utils.h b/glamor/glamor_utils.h
index 972918c08..da05143cf 100644
--- a/glamor/glamor_utils.h
+++ b/glamor/glamor_utils.h
@@ -257,10 +257,10 @@ static inline void
 gl_iformat_for_depth(int depth, GLenum * format)
 {
 	switch (depth) {
-#if 0
 	case 8:
 		*format = GL_ALPHA;
 		break;
+#if 0
 	case 24:
 		*format = GL_RGB;
 		break;
@@ -411,6 +411,8 @@ glamor_get_tex_format_type_from_pictformat(PictFormatShort format,
 inline static int cache_format(GLenum format)
 {
 	switch (format) {
+	case GL_ALPHA:
+		return 1;
 	case GL_RGBA:
 		return 0;
 	default: