KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svga: eliminate unneeded gotos in svga_validate_surface_view() 

Reviewed-by: Charmaine Lee <charmainel@vmware.com>
This commit is contained in:
Brian Paul 2016-09-22 12:26:55 -06:00
parent 47f16f5e7f
commit 4d04696524
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gallium/drivers/svga/svga_surface.c
View File

@ -426,14 +426,12 @@ svga_validate_surface_view(struct svga_context *svga, struct svga_surface *s)
"same resource used in shaderResource and renderTarget 0x%x\n",
s->handle);
s = create_backed_surface_view(svga, s);
if (!s)
goto done;
/* s may be null here if the function failed */
break;
}
}
if (s->view_id == SVGA3D_INVALID_ID) {
if (s && s->view_id == SVGA3D_INVALID_ID) {
SVGA3dResourceType resType;
SVGA3dRenderTargetViewDesc desc;
@ -478,14 +476,13 @@ svga_validate_surface_view(struct svga_context *svga, struct svga_surface *s)
if (ret != PIPE_OK) {
util_bitmask_clear(svga->surface_view_id_bm, s->view_id);
s->view_id = SVGA3D_INVALID_ID;
goto done;
s = NULL;
}
}
done:
SVGA_STATS_TIME_POP(svga_sws(svga));
return &s->base;
return s ? &s->base : NULL;
}