From: Serge Martin <edb+mesa@sigluy.net>
Date: Sun, 6 Dec 2015 14:32:17 +0000 (+0100)
Subject: freedreno: little clean up in fd_create_surface
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2b930327e871bb3307c37c919a449f860f30ae50;p=mesa.git

freedreno: little clean up in fd_create_surface

in order to avoid returing invalid adress if CALLOC_STRUCT return NULL.

Signed-off-by: Rob Clark <robclark@freedesktop.org>
---

diff --git a/src/gallium/drivers/freedreno/freedreno_surface.c b/src/gallium/drivers/freedreno/freedreno_surface.c
index 70c44eb79c3..90433934345 100644
--- a/src/gallium/drivers/freedreno/freedreno_surface.c
+++ b/src/gallium/drivers/freedreno/freedreno_surface.c
@@ -41,27 +41,28 @@ fd_create_surface(struct pipe_context *pctx,
 //	struct fd_resource* tex = fd_resource(ptex);
 	struct fd_surface* surface = CALLOC_STRUCT(fd_surface);
 
+	if (!surface)
+		return NULL;
+
 	debug_assert(ptex->target != PIPE_BUFFER);
 	debug_assert(surf_tmpl->u.tex.first_layer == surf_tmpl->u.tex.last_layer);
 
-	if (surface) {
-		struct pipe_surface *psurf = &surface->base;
-		unsigned level = surf_tmpl->u.tex.level;
+	struct pipe_surface *psurf = &surface->base;
+	unsigned level = surf_tmpl->u.tex.level;
 
-		pipe_reference_init(&psurf->reference, 1);
-		pipe_resource_reference(&psurf->texture, ptex);
+	pipe_reference_init(&psurf->reference, 1);
+	pipe_resource_reference(&psurf->texture, ptex);
 
-		psurf->context = pctx;
-		psurf->format = surf_tmpl->format;
-		psurf->width = u_minify(ptex->width0, level);
-		psurf->height = u_minify(ptex->height0, level);
-		psurf->u.tex.level = level;
-		psurf->u.tex.first_layer = surf_tmpl->u.tex.first_layer;
-		psurf->u.tex.last_layer = surf_tmpl->u.tex.last_layer;
+	psurf->context = pctx;
+	psurf->format = surf_tmpl->format;
+	psurf->width = u_minify(ptex->width0, level);
+	psurf->height = u_minify(ptex->height0, level);
+	psurf->u.tex.level = level;
+	psurf->u.tex.first_layer = surf_tmpl->u.tex.first_layer;
+	psurf->u.tex.last_layer = surf_tmpl->u.tex.last_layer;
 
-		// TODO
-		DBG("TODO: %ux%u", psurf->width, psurf->height);
-	}
+	// TODO
+	DBG("TODO: %ux%u", psurf->width, psurf->height);
 
 	return &surface->base;
 }