From: Axel Davy Date: Sun, 13 Nov 2016 11:40:10 +0000 (+0100) Subject: st/nine: Simplify ColorFill X-Git-Tag: upstream/17.1.0~3740 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9bf1da05d9375f6faf4a3977c7674a1cda9ca0b0;p=platform%2Fupstream%2Fmesa.git st/nine: Simplify ColorFill For render targets, NineSurface9_GetSurface is not expected to fail. Signed-off-by: Axel Davy --- diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c index 271aa2b..28442eb 100644 --- a/src/gallium/state_trackers/nine/device9.c +++ b/src/gallium/state_trackers/nine/device9.c @@ -1757,7 +1757,6 @@ NineDevice9_ColorFill( struct NineDevice9 *This, struct pipe_surface *psurf; unsigned x, y, w, h; union pipe_color_union rgba; - boolean fallback; DBG("This=%p pSurface=%p pRect=%p color=%08x\n", This, pSurface, pRect, color); @@ -1793,15 +1792,8 @@ NineDevice9_ColorFill( struct NineDevice9 *This, } d3dcolor_to_pipe_color_union(&rgba, color); - fallback = !(surf->base.info.bind & PIPE_BIND_RENDER_TARGET); - - if (!fallback) { + if (surf->base.info.bind & PIPE_BIND_RENDER_TARGET) { psurf = NineSurface9_GetSurface(surf, 0); - if (!psurf) - fallback = TRUE; - } - - if (!fallback) { pipe->clear_render_target(pipe, psurf, &rgba, x, y, w, h, false); } else { D3DLOCKED_RECT lock;