Module: Mesa
Branch: master
Commit: 5fb31a1734b7f52846090b9cfadf5fac4822f500
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5fb31a1734b7f52846090b9cfadf5fac4822f500

Author: Marek Olšák <marek.ol...@amd.com>
Date:   Tue Mar 27 21:57:26 2018 -0400

radeonsi: merge 2 identical if statements in si_clear

and other cleanups

Reviewed-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
Tested-by: Dieter Nützel <die...@nuetzel-hh.de>

---

 src/gallium/drivers/radeonsi/si_clear.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_clear.c 
b/src/gallium/drivers/radeonsi/si_clear.c
index 5be78ca3e6..f8136d2b2c 100644
--- a/src/gallium/drivers/radeonsi/si_clear.c
+++ b/src/gallium/drivers/radeonsi/si_clear.c
@@ -528,20 +528,13 @@ static void si_clear(struct pipe_context *ctx, unsigned 
buffers,
                si_do_fast_color_clear(sctx, &buffers, color);
                if (!buffers)
                        return; /* all buffers have been fast cleared */
-       }
-
-       if (buffers & PIPE_CLEAR_COLOR) {
-               int i;
 
                /* These buffers cannot use fast clear, make sure to disable 
expansion. */
-               for (i = 0; i < fb->nr_cbufs; i++) {
+               for (unsigned i = 0; i < fb->nr_cbufs; i++) {
                        struct r600_texture *tex;
 
                        /* If not clearing this buffer, skip. */
-                       if (!(buffers & (PIPE_CLEAR_COLOR0 << i)))
-                               continue;
-
-                       if (!fb->cbufs[i])
+                       if (!(buffers & (PIPE_CLEAR_COLOR0 << i)) || 
!fb->cbufs[i])
                                continue;
 
                        tex = (struct r600_texture *)fb->cbufs[i]->texture;

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to