diff --git a/glamor/glamor_fbo.c b/glamor/glamor_fbo.c
index e5675d81c..ec1a5b067 100644
--- a/glamor/glamor_fbo.c
+++ b/glamor/glamor_fbo.c
@@ -341,6 +341,7 @@ glamor_create_fbo(glamor_screen_private *glamor_priv,
 	    || !glamor_check_fbo_depth(depth))
 		return NULL;
 
+	gl_iformat_for_depth(depth, &format);
 	if (flag == GLAMOR_CREATE_FBO_NO_FBO)
 		goto new_fbo;
 
@@ -349,7 +350,6 @@ glamor_create_fbo(glamor_screen_private *glamor_priv,
 	else
 		cache_flag = 0;
 
-	gl_iformat_for_depth(depth, &format);
 	fbo = glamor_pixmap_fbo_cache_get(glamor_priv, w, h,
 					  format, cache_flag);
 	if (fbo)