projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7820a11)
radeonsi: fix a warning caused by previous commit
authorMarek Olšák <marek.olsak@amd.com>
Mon, 23 Feb 2015 10:42:59 +0000 (11:42 +0100)
committerMarek Olšák <marek.olsak@amd.com>
Mon, 23 Feb 2015 10:45:00 +0000 (11:45 +0100)
Cc: 10.5 10.4 <mesa-stable@lists.freedesktop.org>
src/gallium/drivers/radeonsi/si_state_shaders.c patch | blob | history

diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 3827c7b662d6609282a59473e5c61f75c2c24b26..5b463365c967391ba5fcc04f3ed521f81a451a70 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -661,7 +661,7 @@ bcolor:
                        }
                }
 
-               if (j == vsinfo->num_outputs & !G_028644_PT_SPRITE_TEX(tmp)) {
+               if (j == vsinfo->num_outputs && !G_028644_PT_SPRITE_TEX(tmp)) {
                        /* No corresponding output found, load defaults into input.
                         * Don't set any other bits.
                         * (FLAT_SHADE=1 completely changes behavior) */