diff --git a/src/gallium/drivers/r600/r600_buffer_common.c b/src/gallium/drivers/r600/r600_buffer_common.c
index ec08b4e77ea..849093eacad 100644
--- a/src/gallium/drivers/r600/r600_buffer_common.c
+++ b/src/gallium/drivers/r600/r600_buffer_common.c
@@ -570,7 +570,7 @@ struct pipe_resource *r600_buffer_create(struct pipe_screen *screen,
 	return &rbuffer->b.b;
 }
 
-struct pipe_resource *r600_aligned_buffer_create(struct pipe_screen *screen,
+struct r600_resource *r600_aligned_buffer_create(struct pipe_screen *screen,
 						 unsigned flags,
 						 unsigned usage,
 						 unsigned size,
@@ -588,7 +588,7 @@ struct pipe_resource *r600_aligned_buffer_create(struct pipe_screen *screen,
 	buffer.height0 = 1;
 	buffer.depth0 = 1;
 	buffer.array_size = 1;
-	return r600_buffer_create(screen, &buffer, alignment);
+	return r600_as_resource(r600_buffer_create(screen, &buffer, alignment));
 }
 
 struct pipe_resource *
diff --git a/src/gallium/drivers/r600/r600_pipe_common.h b/src/gallium/drivers/r600/r600_pipe_common.h
index ea06b0c3936..a17375ac8b3 100644
--- a/src/gallium/drivers/r600/r600_pipe_common.h
+++ b/src/gallium/drivers/r600/r600_pipe_common.h
@@ -704,7 +704,7 @@ void r600_buffer_flush_region(struct pipe_context *ctx,
 struct pipe_resource *r600_buffer_create(struct pipe_screen *screen,
 					 const struct pipe_resource *templ,
 					 unsigned alignment);
-struct pipe_resource * r600_aligned_buffer_create(struct pipe_screen *screen,
+struct r600_resource * r600_aligned_buffer_create(struct pipe_screen *screen,
 						  unsigned flags,
 						  unsigned usage,
 						  unsigned size,
diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
index e464f91700c..ef4c8d9b716 100644
--- a/src/gallium/drivers/r600/r600_state.c
+++ b/src/gallium/drivers/r600/r600_state.c
@@ -982,9 +982,9 @@ static void r600_init_color_surface(struct r600_context *rctx,
 
 			r600_resource_reference(&rctx->dummy_cmask, NULL);
 			rctx->dummy_cmask =
-				r600_as_resource(r600_aligned_buffer_create(&rscreen->b.b, 0,
-									 PIPE_USAGE_DEFAULT,
-									 cmask.size, cmask.alignment));
+				r600_aligned_buffer_create(&rscreen->b.b, 0,
+							   PIPE_USAGE_DEFAULT,
+							   cmask.size, cmask.alignment);
 
 			if (unlikely(!rctx->dummy_cmask)) {
 				return;
@@ -1003,9 +1003,9 @@ static void r600_init_color_surface(struct r600_context *rctx,
 		    (1 << rctx->dummy_fmask->buf->alignment_log2) % fmask.alignment != 0) {
 			r600_resource_reference(&rctx->dummy_fmask, NULL);
 			rctx->dummy_fmask =
-				r600_as_resource(r600_aligned_buffer_create(&rscreen->b.b, 0,
-									 PIPE_USAGE_DEFAULT,
-									 fmask.size, fmask.alignment));
+				r600_aligned_buffer_create(&rscreen->b.b, 0,
+							   PIPE_USAGE_DEFAULT,
+							   fmask.size, fmask.alignment);
 
 			if (unlikely(!rctx->dummy_fmask)) {
 				return;
diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index b178db051ec..19d27ffe641 100644
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -703,11 +703,11 @@ void r600_texture_alloc_cmask_separate(struct r600_common_screen *rscreen,
 	r600_texture_get_cmask_info(rscreen, rtex, &rtex->cmask);
 
 	rtex->cmask_buffer =
-		r600_as_resource(r600_aligned_buffer_create(&rscreen->b,
-							 R600_RESOURCE_FLAG_UNMAPPABLE,
-							 PIPE_USAGE_DEFAULT,
-							 rtex->cmask.size,
-							 rtex->cmask.alignment));
+		r600_aligned_buffer_create(&rscreen->b,
+					   R600_RESOURCE_FLAG_UNMAPPABLE,
+					   PIPE_USAGE_DEFAULT,
+					   rtex->cmask.size,
+					   rtex->cmask.alignment);
 	if (rtex->cmask_buffer == NULL) {
 		rtex->cmask.size = 0;
 		return;