Mesa (master): radeonsi: fix a warning caused by previous commit
Marek Olšák
mareko at kemper.freedesktop.org
Mon Feb 23 10:49:12 UTC 2015
Module: Mesa
Branch: master
Commit: 050bf75c8bbaa7cad537aabaf8612129edfee3a4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=050bf75c8bbaa7cad537aabaf8612129edfee3a4
Author: Marek Olšák <marek.olsak at amd.com>
Date: Mon Feb 23 11:42:59 2015 +0100
radeonsi: fix a warning caused by previous commit
Cc: 10.5 10.4 <mesa-stable at lists.freedesktop.org>
---
src/gallium/drivers/radeonsi/si_state_shaders.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c b/src/gallium/drivers/radeonsi/si_state_shaders.c
index 3827c7b..5b46336 100644
--- 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) */
More information about the mesa-commit
mailing list