From 950be3fa3c22d67f3b80e7ed5d274d957f0bff93 Mon Sep 17 00:00:00 2001
From: Marek Olšák <maraeo@gmail.com>
Date: Wed, 9 Jun 2010 20:16:00 +0200
Subject: r300g: return NULL texture early if buffer_create fails

---
 src/gallium/drivers/r300/r300_texture.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/gallium/drivers/r300')

diff --git a/src/gallium/drivers/r300/r300_texture.c b/src/gallium/drivers/r300/r300_texture.c
index 5a013e2a25..c95a3f79af 100644
--- a/src/gallium/drivers/r300/r300_texture.c
+++ b/src/gallium/drivers/r300/r300_texture.c
@@ -979,16 +979,16 @@ struct pipe_resource* r300_texture_create(struct pipe_screen* screen,
     tex->buffer = rws->buffer_create(rws, 2048, base->bind, tex->domain,
                                      tex->size);
 
+    if (!tex->buffer) {
+	FREE(tex);
+	return NULL;
+    }
+
     rws->buffer_set_tiling(rws, tex->buffer,
             tex->pitch[0] * util_format_get_blocksize(tex->b.b.format),
             tex->microtile,
             tex->macrotile);
 
-    if (!tex->buffer) {
-        FREE(tex);
-        return NULL;
-    }
-
     return (struct pipe_resource*)tex;
 }
 
-- 
cgit v1.2.3